From nobody Mon Feb 9 11:33:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562342216; cv=none; d=zoho.com; s=zohoarc; b=MkSH9Ytua7B+avo7W3jnonsfLixDKX3CLIGiA0nn78k+7ixrBSgPxBS/6QwzieabKTOzezwhc0coveVFQa/gc0m/tb9+JbwfPougRmq7MtlMbXNQdktKYLcSlPfIgzeb7+qz5Nqy11aUzY/dyG0FjQvDVLh48ijo0m7HsIg5/r8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562342216; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tPg3ivLqWmSO/F3IAkvKGz2/sat6+4CpMz65SvprQNE=; b=TU/CztO5WKS9nmCGtSCEyGkLDH1sIouUxHEo0eneVPux/0ex4sBCQUDMt1wThGd3+7DqnF3vXCBqwWqlau33EU622bxaQawjo72OrHhEMwNtED9VMAOs4sOSIfPLUq8Nx+PDsmBicx30ZYY4IENjBdbJIrBVNV5k55Z5Whhr/sE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562342216047779.8037135174023; Fri, 5 Jul 2019 08:56:56 -0700 (PDT) Received: from localhost ([::1]:54360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjQZv-00052O-PP for importer@patchew.org; Fri, 05 Jul 2019 11:56:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36653) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjQQq-0003RJ-Bo for qemu-devel@nongnu.org; Fri, 05 Jul 2019 11:47:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjQQm-0007Hk-UW for qemu-devel@nongnu.org; Fri, 05 Jul 2019 11:47:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hjQQf-0006dA-Du; Fri, 05 Jul 2019 11:47:17 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B563B4E908; Fri, 5 Jul 2019 15:47:14 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-45.brq.redhat.com [10.40.204.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A26051001B30; Fri, 5 Jul 2019 15:47:12 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 17:46:36 +0200 Message-Id: <20190705154639.16591-7-philmd@redhat.com> In-Reply-To: <20190705154639.16591-1-philmd@redhat.com> References: <20190705154639.16591-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 05 Jul 2019 15:47:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 6/9] hw/block/pflash_cfi01: Simplify CFI_QUERY processing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, John Snow , Laszlo Ersek , Alistair Francis , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The current code does: if (write_cycle =3D=3D 0) if (command =3D=3D CFI_QUERY) break write_cycle +=3D 1 last_command =3D command if (write_cycle =3D=3D 1) if (last_command =3D=3D CFI_QUERY) if (command =3D=3D READ_ARRAY write_cycle =3D 0 last_command =3D READ_ARRAY Simplify by not increasing the write_cycle on CFI_QUERY, the next command are processed as normal wcycle=3D0. This matches the hardware datasheet (we do not enter the WRITE state machine, thus no write cycle involved). Reviewed-by: Alistair Francis Regression-tested-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index c32c67d01d..e097d9260d 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -491,7 +491,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offse= t, return; case 0x98: /* CFI query */ DPRINTF("%s: CFI query\n", __func__); - break; + pfl->cmd =3D cmd; + return; case 0xe8: /* Write to buffer */ DPRINTF("%s: Write to buffer\n", __func__); /* FIXME should save @offset, @width for case 1+ */ @@ -565,13 +566,6 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offs= et, goto mode_read_array; } break; - case 0x98: - if (cmd =3D=3D 0xff) { - goto mode_read_array; - } else { - DPRINTF("%s: leaving query mode\n", __func__); - } - break; default: goto error_flash; } --=20 2.20.1