From nobody Mon Nov 25 09:30:07 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1715762654; cv=none; d=zohomail.com; s=zohoarc; b=AbfrcVgAJMpi1TFCv+nk3e9m8XMWtsQ9LYqp8mFIBL9VJz4NomaH0+dnqJXyu696ByIiw+HFMhzAt7V+5uBxNGcLd3knqWWaWGDTT/Kdf0BRtfOz/ivTg6m4oE+bpZQzxr/E0o44xyidEacmMmLdz8Wx8kWyHnd5+xD1GatMBKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715762654; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IjqnWmenMOLb3dPc7wIwK4gerQb9xAsnPfKn9SQoq0o=; b=C/IdKpunWX43FQC4nhI9Rq9LcWiD262OZFg6kSiaGfj2jwTx4Vceg0DHuUhjWau/II3hfjA6iyzpZStgUaq+zlInPZMtkanDe7vedn58IBTUaHyg/BBwCRp12OZLs19eFiDSLXFFbL9Ab9O6DPO63yYxFCVPF3WFFGllP4rxhcw= 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 1715762654447213.90868941789495; Wed, 15 May 2024 01:44:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7AEw-0002YU-Qh; Wed, 15 May 2024 04:43:58 -0400 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 1s7AEu-0002W3-SJ for qemu-devel@nongnu.org; Wed, 15 May 2024 04:43:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s7AEt-0008N5-Iq for qemu-devel@nongnu.org; Wed, 15 May 2024 04:43:56 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-19-jhI2UF0QOp-XVe0P0Hy8mw-1; Wed, 15 May 2024 04:43:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D70293C0008E; Wed, 15 May 2024 08:43:41 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7AE6540C6EB7; Wed, 15 May 2024 08:43:41 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7F19E18009BA; Wed, 15 May 2024 10:43:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715762634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=IjqnWmenMOLb3dPc7wIwK4gerQb9xAsnPfKn9SQoq0o=; b=QVFMiaxc5Tret03ECIGy1zEdCnUG6YeWR9/ZyVrOaKylG4CIrhGrV9gMUbx5hM9am3hqcW bgmBGQGgygg4YLzDjTN4NAxBiXXHc1/NBKLJaQCClUJqZL7EeOUSD75WGiscVFWayYKXTi Ke8nfYdwDL0/ZSl8cGSWI7KCiYVSHBg= X-MC-Unique: jhI2UF0QOp-XVe0P0Hy8mw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, Gerd Hoffmann Subject: [PATCH v3] hw/pflash: fix block write start Date: Wed, 15 May 2024 10:43:40 +0200 Message-ID: <20240515084340.113670-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.974, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 @redhat.com) X-ZM-MESSAGEID: 1715762655256100001 Content-Type: text/plain; charset="utf-8" Move the pflash_blk_write_start() call. We need the offset of the first data write, not the offset for the setup (number-of-bytes) write. Without this fix u-boot can do block writes to the first flash block only. While being at it drop a leftover FIXME. Resolves: #2343 Fixes: fcc79f2e0955 ("hw/pflash: implement update buffer for block writes") Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi01.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 1bda8424b907..c8f1cf5a8722 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -518,10 +518,6 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offs= et, break; case 0xe8: /* Write to buffer */ trace_pflash_write(pfl->name, "write to buffer"); - /* FIXME should save @offset, @width for case 1+ */ - qemu_log_mask(LOG_UNIMP, - "%s: Write to buffer emulation is flawed\n", - __func__); pfl->status |=3D 0x80; /* Ready! */ break; case 0xf0: /* Probe for AMD flash */ @@ -574,7 +570,6 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offse= t, } pfl->counter =3D value; pfl->wcycle++; - pflash_blk_write_start(pfl, offset); break; case 0x60: if (cmd =3D=3D 0xd0) { @@ -605,6 +600,9 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offse= t, switch (pfl->cmd) { case 0xe8: /* Block write */ /* FIXME check @offset, @width */ + if (pfl->blk_offset =3D=3D -1 && pfl->counter) { + pflash_blk_write_start(pfl, offset); + } if (!pfl->ro && (pfl->blk_offset !=3D -1)) { pflash_data_write(pfl, offset, value, width, be); } else { --=20 2.45.0