From nobody Tue Nov 26 20:38:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1704718481; cv=none; d=zohomail.com; s=zohoarc; b=nI05LE/gnBUmi0z5AQqx9F8WyKaNtWJ1RBHnmqz6RXISutT02j4xTE1IY+YKXix2WCbb0+ovwNUB+ushUJlMRGyvLcMPLMQiSFLEK84+9cBGHOucCwEvOcIEVbk1R1ITkYFdOt7D0sa9Nl2u3LtaTx5gxkbCs9jEgqrktnPS00U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704718481; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ghVWFLUr6713RIktIzJDLwjlFUwvU8dITI3EJerUt6E=; b=HjvVpTGjV1ZegSF5OAOrswVF7c/Slt1JGLxtNx+Jm/HUDKj++8KlP6jiD8nqR823SISK9xYmtap2FtJgkk7a11PP5VaiVUteBaQ76aoyNgAMxkNBYBLQ1Yxm9Em6cFG2r69EPFpNehs83ovNVM1EtgqAB5t0Djvmc3OZX9/caXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1704718481469603.5786645172082; Mon, 8 Jan 2024 04:54:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMp8d-0002tw-Ca; Mon, 08 Jan 2024 07:53:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMp8c-0002tR-2J for qemu-devel@nongnu.org; Mon, 08 Jan 2024 07:53:54 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMp8a-0006H4-Ef for qemu-devel@nongnu.org; Mon, 08 Jan 2024 07:53:53 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40e43e48a16so13298135e9.2 for ; Mon, 08 Jan 2024 04:53:52 -0800 (PST) Received: from localhost.localdomain ([176.176.175.62]) by smtp.gmail.com with ESMTPSA id l42-20020a05600c1d2a00b004030e8ff964sm11004600wms.34.2024.01.08.04.53.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 08 Jan 2024 04:53:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704718431; x=1705323231; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ghVWFLUr6713RIktIzJDLwjlFUwvU8dITI3EJerUt6E=; b=cE7lqjDIiL85o7NwwIR0GAfIWwo31IejvK/kRERHRmSjrzksbF+toE2N+a4j370YKg Qdd+tOKyfFe7rcTYNXnk97z2S2oyX5nL+akdA+Z6Rw1AgyqBhBGeLc8//anhHjdhi+WY jW7v4R93E0Y+4ReyGen5N9gpnfF9LAJzPN6jhuvGtkxi3pS6F9dtKJwoshfvniEj31QX IXITi/byUXRWi8M5yDhNEuYQnJP4qSmmQPt2nGwgUo7wf6YkQU86n6ECnxylFZ459Q9a iEVChatIC3RuNKLpHYJNQ+BiPGzQ16BBdZP2uLhFNs+hLmDzhHnGkO2m8Kb2ntMFCbRF gGSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704718431; x=1705323231; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ghVWFLUr6713RIktIzJDLwjlFUwvU8dITI3EJerUt6E=; b=LjT4MZufjp0o4q7Kq2ZY/fxXW8be6ykS1POskv/ZA2f0dRSUQNFtnR3aerynp7Dcx0 9lLpGplrICnzDDZRRRFZs226fEgi1dUrdsLkN+GowLq0hMk3nvcQwtSq55neW6xS2EhE mUSk7KdMVhDy3GcSnBzY5uUQT4RoNHQfyWfMgtobBw93IVR7weRIUGMHYOiCEszrf4VW ic+phndbklzxlycM/8h30b7w4Kk1SzDsByxwdHO3Sc2TzjgmmehI1qPPzt1JM2SDLTQ6 yBL/mSrZ88cOXCgaAxwHYx8XuAy2kii4Lag+H3O6+QfENAan+0Pd5Y6xBV+1nBe2t+Yb egMg== X-Gm-Message-State: AOJu0YyNawnIQqx8Jbp2cyGtjzoY5Zy0c0IxgEpFHO6tYmd1nUH83dpv ySjZBMQpgImx8S6tWgJyxfwJBnwFPjGOsRfbJIikd9HjNFg= X-Google-Smtp-Source: AGHT+IHaHzN6CWAGOvlzsUccv6ipYmgp8G2SiNCXFYXTQTdg+y28wuhzI5lml/HNmDsY3RypKGEOgA== X-Received: by 2002:a7b:c4d1:0:b0:40e:4aed:ad27 with SMTP id g17-20020a7bc4d1000000b0040e4aedad27mr125789wmk.144.1704718430674; Mon, 08 Jan 2024 04:53:50 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Gerd Hoffmann , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/2] hw/block/pflash_cfi01: Use the LD/ST API in pflash_data_read/write Date: Mon, 8 Jan 2024 13:53:41 +0100 Message-ID: <20240108125342.48298-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108125342.48298-1-philmd@linaro.org> References: <20240108125342.48298-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1704718481993100003 Similarly to commit c3d25271b2 ("hw/block/pflash_cfi02: Use the ldst API in pflash_write") for CFI type 2, use the LD/ST API for CFI type 1. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi01.c | 63 ++++++----------------------------------- 1 file changed, 8 insertions(+), 55 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 3e2dc08bd7..ce63ba43b6 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -225,34 +225,10 @@ static uint32_t pflash_data_read(PFlashCFI01 *pfl, hw= addr offset, uint32_t ret; =20 p =3D pfl->storage; - switch (width) { - case 1: - ret =3D p[offset]; - break; - case 2: - if (be) { - ret =3D p[offset] << 8; - ret |=3D p[offset + 1]; - } else { - ret =3D p[offset]; - ret |=3D p[offset + 1] << 8; - } - break; - case 4: - if (be) { - ret =3D p[offset] << 24; - ret |=3D p[offset + 1] << 16; - ret |=3D p[offset + 2] << 8; - ret |=3D p[offset + 3]; - } else { - ret =3D p[offset]; - ret |=3D p[offset + 1] << 8; - ret |=3D p[offset + 2] << 16; - ret |=3D p[offset + 3] << 24; - } - break; - default: - abort(); + if (be) { + ret =3D ldn_be_p(p, width); + } else { + ret =3D ldn_le_p(p, width); } trace_pflash_data_read(pfl->name, offset, width, ret); return ret; @@ -406,34 +382,11 @@ static inline void pflash_data_write(PFlashCFI01 *pfl= , hwaddr offset, uint8_t *p =3D pfl->storage; =20 trace_pflash_data_write(pfl->name, offset, width, value, pfl->counter); - switch (width) { - case 1: - p[offset] =3D value; - break; - case 2: - if (be) { - p[offset] =3D value >> 8; - p[offset + 1] =3D value; - } else { - p[offset] =3D value; - p[offset + 1] =3D value >> 8; - } - break; - case 4: - if (be) { - p[offset] =3D value >> 24; - p[offset + 1] =3D value >> 16; - p[offset + 2] =3D value >> 8; - p[offset + 3] =3D value; - } else { - p[offset] =3D value; - p[offset + 1] =3D value >> 8; - p[offset + 2] =3D value >> 16; - p[offset + 3] =3D value >> 24; - } - break; + if (be) { + stn_be_p(p, width, value); + } else { + stn_le_p(p, width, value); } - } =20 static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, --=20 2.41.0 From nobody Tue Nov 26 20:38:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1704718464; cv=none; d=zohomail.com; s=zohoarc; b=lR37xNC9zDbu9yeVAaIrrKECvqwOIvLVIDShiAsqmoM53Wq8cyqC2vRmNxLtsKM0vUHWuB6MnuiblnJM3vj2NZV3X+HYI8i46YckICNrrXMOB9SrkS7G7EDnHt+xfoeQKvZMXMUF/1KDDN3FCgnZXs+lcGqlxeO8zOLXCc8xGv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704718464; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GmyBpmtz8oXX8KnZsDsq1mJ6m0zHjrv/X6q6YSk63xs=; b=j8g+jEC922T+VRo7tGmgZV54BRse5WExgSbOucJwrDjhKPxZAykh23rpXRrGDGsJk0dDE8toP0EBlpvwbweFxTkCmpM6+qL+2SRlr4KPXXzqb6gPKt8ksyaI/vUEksYs83ZEAB6eOLBVywMw/fDIKPjvHD1k9oJk9P54KkOnFmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17047184644511010.9582584149235; Mon, 8 Jan 2024 04:54:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMp8p-00031t-RC; Mon, 08 Jan 2024 07:54:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMp8j-00030e-B0 for qemu-devel@nongnu.org; Mon, 08 Jan 2024 07:54:01 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMp8f-0006It-O1 for qemu-devel@nongnu.org; Mon, 08 Jan 2024 07:54:00 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40d8902da73so16449555e9.2 for ; Mon, 08 Jan 2024 04:53:57 -0800 (PST) Received: from localhost.localdomain ([176.176.175.62]) by smtp.gmail.com with ESMTPSA id k7-20020a5d6d47000000b0033725783839sm7750457wri.110.2024.01.08.04.53.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 08 Jan 2024 04:53:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704718436; x=1705323236; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GmyBpmtz8oXX8KnZsDsq1mJ6m0zHjrv/X6q6YSk63xs=; b=GmcYILCjtScSciAIBMyJIbwhY9OCXElf2fYsgbaT61SOFV24m5rwd8WIUjVTfI6lKI pKjR8/bJ055ZfDz8HXSCnelkQkIRz6hA4+Vyscq1bULMxPMY4w7waDcxLDtJHaq6En7E aav1l6eMLpE5e06SnQIotKKttbdK1A8z/fFT0wjdxCz9/lnWbb3qWesGOR8Ng4H6GE4W 8SKLG5OCTcNHFSRfnrzsTxxifwECDDAb1Ts9YZaMvlrrVP7V+RkYrCCYMUPHQRhuD55Y Cb9F5Y1MreWb5fv+gJ0myGeNrPJrIHMoHLcnt7dMGAH4szsGz7FSiUOJXU1jVOGRScjo nC8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704718436; x=1705323236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GmyBpmtz8oXX8KnZsDsq1mJ6m0zHjrv/X6q6YSk63xs=; b=j0MPZRUlIbXrm7pL837XBpP1cjYJJg2xVePU1LminByaxDBLL9fc6fvH4oZQxfsCV5 ZElupYSOA8VGU8zE1eVCd1mHMPuNI6ZobgCwhbLDaL8gXoE6wEeHMDGye5jgd5tidQGc i3tu/knSsPI1WXSArXeUDOzprI82N8b63dJjsXZ/0ILMwQ3ahUuJ2yYDajMPmGzLbLu5 zhiChAHl89nuRl1okKi/sbRngWaGNAEdKfg88j3gXT3a+3x6pDKbJ5r90w8QQ2zS4V6C AqJsliZswzj8Z0yr8sAMeZXly3K02MDLZXhHjhHnjgvpPkOkFpBo4fkwu9W8XNn3uFoj GLVw== X-Gm-Message-State: AOJu0YwMW/C8V1z76Rl57qE8+rLzbUitmmmEY5HIY64xqoLWXPnWdcx3 YO7WgjSShOlXAB7+0H+wEh65xaVNjNXz8w== X-Google-Smtp-Source: AGHT+IGWKcStg5Woh+ajuCGVlKzkXp8d2x+A2cyMAOffD+IL5zbZUrdBCqYSR/Qy5wDkRF9OoASxWQ== X-Received: by 2002:a05:600c:5493:b0:40e:4aef:26bf with SMTP id iv19-20020a05600c549300b0040e4aef26bfmr123659wmb.30.1704718435880; Mon, 08 Jan 2024 04:53:55 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Gerd Hoffmann , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/2] hw/pflash: implement update buffer for block writes Date: Mon, 8 Jan 2024 13:53:42 +0100 Message-ID: <20240108125342.48298-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108125342.48298-1-philmd@linaro.org> References: <20240108125342.48298-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1704718465995100007 From: Gerd Hoffmann Add an update buffer where all block updates are staged. Flush or discard updates properly, so we should never see half-completed block writes in pflash storage. Drop a bunch of FIXME comments ;) Signed-off-by: Gerd Hoffmann Message-ID: <20240105135855.268064-3-kraxel@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi01.c | 106 ++++++++++++++++++++++++++++++---------- 1 file changed, 80 insertions(+), 26 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index ce63ba43b6..0120462648 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -80,16 +80,39 @@ struct PFlashCFI01 { uint16_t ident3; uint8_t cfi_table[0x52]; uint64_t counter; - unsigned int writeblock_size; + uint32_t writeblock_size; MemoryRegion mem; char *name; void *storage; VMChangeStateEntry *vmstate; bool old_multiple_chip_handling; + + /* block update buffer */ + unsigned char *blk_bytes; + uint32_t blk_offset; }; =20 static int pflash_post_load(void *opaque, int version_id); =20 +static bool pflash_blk_write_state_needed(void *opaque) +{ + PFlashCFI01 *pfl =3D opaque; + + return (pfl->blk_offset !=3D -1); +} + +static const VMStateDescription vmstate_pflash_blk_write =3D { + .name =3D "pflash_cfi01_blk_write", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D pflash_blk_write_state_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_VBUFFER_UINT32(blk_bytes, PFlashCFI01, 0, NULL, writeblock= _size), + VMSTATE_UINT32(blk_offset, PFlashCFI01), + VMSTATE_END_OF_LIST() + } +}; + static const VMStateDescription vmstate_pflash =3D { .name =3D "pflash_cfi01", .version_id =3D 1, @@ -101,6 +124,10 @@ static const VMStateDescription vmstate_pflash =3D { VMSTATE_UINT8(status, PFlashCFI01), VMSTATE_UINT64(counter, PFlashCFI01), VMSTATE_END_OF_LIST() + }, + .subsections =3D (const VMStateDescription * const []) { + &vmstate_pflash_blk_write, + NULL } }; =20 @@ -376,12 +403,51 @@ static void pflash_update(PFlashCFI01 *pfl, int offse= t, } } =20 +/* copy current flash content to block update buffer */ +static void pflash_blk_write_start(PFlashCFI01 *pfl, hwaddr offset) +{ + hwaddr mask =3D ~(pfl->writeblock_size - 1); + + pfl->blk_offset =3D offset & mask; + memcpy(pfl->blk_bytes, pfl->storage + pfl->blk_offset, + pfl->writeblock_size); +} + +/* commit block update buffer changes */ +static void pflash_blk_write_flush(PFlashCFI01 *pfl) +{ + g_assert(pfl->blk_offset !=3D -1); + memcpy(pfl->storage + pfl->blk_offset, pfl->blk_bytes, + pfl->writeblock_size); + pflash_update(pfl, pfl->blk_offset, pfl->writeblock_size); + pfl->blk_offset =3D -1; +} + +/* discard block update buffer changes */ +static void pflash_blk_write_abort(PFlashCFI01 *pfl) +{ + pfl->blk_offset =3D -1; +} + static inline void pflash_data_write(PFlashCFI01 *pfl, hwaddr offset, uint32_t value, int width, int be) { - uint8_t *p =3D pfl->storage; + uint8_t *p; + + if (pfl->blk_offset !=3D -1) { + /* block write: redirect writes to block update buffer */ + if ((offset < pfl->blk_offset) || + (offset + width > pfl->blk_offset + pfl->writeblock_size)) { + pfl->status |=3D 0x10; /* Programming error */ + return; + } + p =3D pfl->blk_bytes + (offset - pfl->blk_offset); + } else { + /* write directly to storage */ + trace_pflash_data_write(pfl->name, offset, width, value, pfl->coun= ter); + p =3D pfl->storage + offset; + } =20 - trace_pflash_data_write(pfl->name, offset, width, value, pfl->counter); if (be) { stn_be_p(p, width, value); } else { @@ -504,6 +570,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offse= t, trace_pflash_write_block(pfl->name, value); pfl->counter =3D value; pfl->wcycle++; + pflash_blk_write_start(pfl, offset); break; case 0x60: if (cmd =3D=3D 0xd0) { @@ -534,12 +601,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offs= et, switch (pfl->cmd) { case 0xe8: /* Block write */ /* FIXME check @offset, @width */ - if (!pfl->ro) { - /* - * FIXME writing straight to memory is *wrong*. We - * should write to a buffer, and flush it to memory - * only on confirm command (see below). - */ + if (!pfl->ro && (pfl->blk_offset !=3D -1)) { pflash_data_write(pfl, offset, value, width, be); } else { pfl->status |=3D 0x10; /* Programming error */ @@ -548,18 +610,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offs= et, pfl->status |=3D 0x80; =20 if (!pfl->counter) { - hwaddr mask =3D pfl->writeblock_size - 1; - mask =3D ~mask; - trace_pflash_write(pfl->name, "block write finished"); pfl->wcycle++; - if (!pfl->ro) { - /* Flush the entire write buffer onto backing storage.= */ - /* FIXME premature! */ - pflash_update(pfl, offset & mask, pfl->writeblock_size= ); - } else { - pfl->status |=3D 0x10; /* Programming error */ - } } =20 pfl->counter--; @@ -571,20 +623,17 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr off= set, case 3: /* Confirm mode */ switch (pfl->cmd) { case 0xe8: /* Block write */ - if (cmd =3D=3D 0xd0) { - /* FIXME this is where we should write out the buffer */ + if ((cmd =3D=3D 0xd0) && !(pfl->status & 0x10)) { + pflash_blk_write_flush(pfl); pfl->wcycle =3D 0; pfl->status |=3D 0x80; } else { - qemu_log_mask(LOG_UNIMP, - "%s: Aborting write to buffer not implemented," - " the data is already written to storage!\n" - "Flash device reset into READ mode.\n", - __func__); + pflash_blk_write_abort(pfl); goto mode_read_array; } break; default: + pflash_blk_write_abort(pfl); goto error_flash; } break; @@ -818,6 +867,9 @@ static void pflash_cfi01_realize(DeviceState *dev, Erro= r **errp) pfl->cmd =3D 0x00; pfl->status =3D 0x80; /* WSM ready */ pflash_cfi01_fill_cfi_table(pfl); + + pfl->blk_bytes =3D g_malloc(pfl->writeblock_size); + pfl->blk_offset =3D -1; } =20 static void pflash_cfi01_system_reset(DeviceState *dev) @@ -837,6 +889,8 @@ static void pflash_cfi01_system_reset(DeviceState *dev) * This model deliberately ignores this delay. */ pfl->status =3D 0x80; + + pfl->blk_offset =3D -1; } =20 static Property pflash_cfi01_properties[] =3D { --=20 2.41.0