From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2884EC7618B for ; Tue, 23 Jul 2019 11:48:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0064A21842 for ; Tue, 23 Jul 2019 11:47:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0064A21842 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hptGw-0003Qa-HU for qemu-devel@archiver.kernel.org; Tue, 23 Jul 2019 07:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58444) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hptGW-00023K-F9 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 07:47:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hptGV-0003sb-7R for qemu-devel@nongnu.org; Tue, 23 Jul 2019 07:47:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hptGS-0003q3-CX; Tue, 23 Jul 2019 07:47:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4B20AC04D946; Tue, 23 Jul 2019 11:47:27 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE4CD60852; Tue, 23 Jul 2019 11:47:17 +0000 (UTC) To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20190723093558.13700-1-philmd@redhat.com> <20190723093558.13700-2-philmd@redhat.com> From: Laszlo Ersek Message-ID: Date: Tue, 23 Jul 2019 13:47:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190723093558.13700-2-philmd@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 23 Jul 2019 11:47:27 +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: Re: [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 , Alistair Francis , John Snow , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 07/23/19 11:35, Philippe Mathieu-Daud=C3=A9 wrote: > To avoid incoherent states when the machine resets (see bug report > below), add the device reset callback. >=20 > A "system reset" sets the device state machine in READ_ARRAY mode > and, after some delay, set the SR.7 READY bit. >=20 > Since we do not model timings, we set the SR.7 bit directly. >=20 > 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] Nice, thanks! :) Laszlo > 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(+) >=20 > 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,= Error **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 gues= t, > @@ -909,6 +927,7 @@ static void pflash_cfi01_class_init(ObjectClass *kl= ass, 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