From nobody Sat May 18 04:30:14 2024 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=1563874596; cv=none; d=zoho.com; s=zohoarc; b=lFgDipgmMitv2/3XpHaGEhF4ammCku81tpdujbdHc6adSklRqEKeBnuKyyfAXXTVxc+5IrRZwMo23EmtiieC5hTSRRFz9va9lWeyzzBdTfCu937by5klSFF0g+tKlJ0ZTgq65lkATTnjNondRbv6QcUaHgI60+4qxkgI2tWPlYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563874596; 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=xxG9SI4/3rleSFcr+jEAOuc7dk+VZ8V7XqScAHumz+c=; b=TsAFGKvB0R1YL4iJQL4+tIuaJqjAXlmzclKCQ4IeItIeMS5dxO1gVy4JLQ9WY8t5CzvVKi0Oz78fTkB6H+nb2zJKWNWrTSzhR8aywQD03BSd1BzXaLKiPsIiKYDTTPQlAnNX2G2deTkQQa3rtmKY1NO6c94RG886gAik5s0PGFE= 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 1563874596541753.9524577406023; Tue, 23 Jul 2019 02:36:36 -0700 (PDT) Received: from localhost ([::1]:40614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hprDk-00024f-Ea for importer@patchew.org; Tue, 23 Jul 2019 05:36:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48357) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hprDS-0000xw-CK for qemu-devel@nongnu.org; Tue, 23 Jul 2019 05:36:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hprDR-0000ww-05 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 05:36:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38552) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hprDO-0000vG-DQ; Tue, 23 Jul 2019 05:36:10 -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 A996B44BD1; Tue, 23 Jul 2019 09:36:09 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-56.brq.redhat.com [10.40.204.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 25B7C1001B3B; Tue, 23 Jul 2019 09:36:04 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 23 Jul 2019 11:35:57 +0200 Message-Id: <20190723093558.13700-2-philmd@redhat.com> In-Reply-To: <20190723093558.13700-1-philmd@redhat.com> References: <20190723093558.13700-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.30]); Tue, 23 Jul 2019 09:36:09 +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] [PULL v2 1/2] hw/block/pflash_cfi01: Add missing DeviceReset() handler 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Max Reitz , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" To avoid incoherent states when the machine resets (see bug report below), add the device reset callback. A "system reset" sets the device state machine in READ_ARRAY mode and, after some delay, set the SR.7 READY bit. Since we do not model timings, we set the SR.7 bit directly. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1678713 Reported-by: Laszlo Ersek Reviewed-by: John Snow Reviewed-by: Alistair Francis Reviewed-by: Laszlo Ersek Tested-by: Laszlo Ersek [Laszlo Ersek: Regression tested EDK2 OVMF IA32X64, ArmVirtQemu Aarch64 https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg04373.html] Message-Id: <20190718104837.13905-2-philmd@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi01.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 435be1e35c..a1ec1faae5 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -865,6 +865,24 @@ static void pflash_cfi01_realize(DeviceState *dev, Err= or **errp) pfl->cfi_table[0x3f] =3D 0x01; /* Number of protection fields */ } =20 +static void pflash_cfi01_system_reset(DeviceState *dev) +{ + PFlashCFI01 *pfl =3D PFLASH_CFI01(dev); + + /* + * The command 0x00 is not assigned by the CFI open standard, + * but QEMU historically uses it for the READ_ARRAY command (0xff). + */ + pfl->cmd =3D 0x00; + pfl->wcycle =3D 0; + memory_region_rom_device_set_romd(&pfl->mem, true); + /* + * The WSM ready timer occurs at most 150ns after system reset. + * This model deliberately ignores this delay. + */ + pfl->status =3D 0x80; +} + static Property pflash_cfi01_properties[] =3D { DEFINE_PROP_DRIVE("drive", PFlashCFI01, blk), /* num-blocks is the number of blocks actually visible to the guest, @@ -909,6 +927,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass,= void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 + dc->reset =3D pflash_cfi01_system_reset; dc->realize =3D pflash_cfi01_realize; dc->props =3D pflash_cfi01_properties; dc->vmsd =3D &vmstate_pflash; --=20 2.20.1 From nobody Sat May 18 04:30:14 2024 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=1563874605; cv=none; d=zoho.com; s=zohoarc; b=iZR6kKQdmgwj7TU5QRrH00QO97u7cAAwR/Ac8GgcvMnY+cuPgwNsrBnqDDoXpol7wGKGAiCHYAflDXItCAq2Vh7eRpgzIWHtK9hV85Tc6e69b65TuT4Cz204SGTFbLW+jPxr5e4198tLXF2d13pcgLlHUfCym/cYzQUdMJxMlYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563874605; 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=83ksLKj7cmkeIb2AkO3qHICIkPgwOHyqOB3VjXrCOh4=; b=F3zWyyus6cFma4QvYPZbfrkPlXsh97MFh4bBPjgjrMb+nbXJyD8GrVMMOHcylH1WbBkITdawgNiCMQNTRuEiRUHLrTBYBHJptEQhIh3aagKnZKTxJtxC/0TL1jfiv/diXX+gAxwinIpKd6VGOhFAiiPwT6bOWgS2X+Ilw2aYQGk= 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 1563874605886769.4583960883383; Tue, 23 Jul 2019 02:36:45 -0700 (PDT) Received: from localhost ([::1]:40622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hprDw-00032P-Mq for importer@patchew.org; Tue, 23 Jul 2019 05:36:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48374) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hprDU-00015t-2X for qemu-devel@nongnu.org; Tue, 23 Jul 2019 05:36:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hprDT-0000yE-1f for qemu-devel@nongnu.org; Tue, 23 Jul 2019 05:36:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hprDQ-0000wP-Pl; Tue, 23 Jul 2019 05:36:12 -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 12FBB30821A0; Tue, 23 Jul 2019 09:36:12 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-56.brq.redhat.com [10.40.204.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 222161001DE0; Tue, 23 Jul 2019 09:36:09 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 23 Jul 2019 11:35:58 +0200 Message-Id: <20190723093558.13700-3-philmd@redhat.com> In-Reply-To: <20190723093558.13700-1-philmd@redhat.com> References: <20190723093558.13700-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.47]); Tue, 23 Jul 2019 09:36:12 +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] [PULL v2 2/2] hw/block/pflash_cfi02: Rewrite a fall through comment 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 , Peter Maydell , qemu-block@nongnu.org, Stefan Weil , 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" GCC9 is confused by this comment when building with CFLAG -Wimplicit-fallthrough=3D2: hw/block/pflash_cfi02.c: In function =E2=80=98pflash_write=E2=80=99: hw/block/pflash_cfi02.c:574:16: error: this statement may fall through [-= Werror=3Dimplicit-fallthrough=3D] 574 | if (boff =3D=3D 0x55 && cmd =3D=3D 0x98) { | ^ hw/block/pflash_cfi02.c:581:9: note: here 581 | default: | ^~~~~~~ cc1: all warnings being treated as errors Rewrite the comment using 'fall through' which is recognized by GCC and static analyzers. Reported-by: Stefan Weil Reviewed-by: Peter Maydell Message-Id: <20190719131425.10835-4-philmd@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi02.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index f68837a449..42886f6af5 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -577,7 +577,7 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, pfl->cmd =3D 0x98; return; } - /* No break here */ + /* fall through */ default: DPRINTF("%s: invalid write for command %02x\n", __func__, pfl->cmd); --=20 2.20.1