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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY 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 0701BC433E9 for ; Wed, 10 Mar 2021 17:59:10 +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 A4FE064D73 for ; Wed, 10 Mar 2021 17:59:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A4FE064D73 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK36y-0007qt-Lw for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 12:59:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK2gG-00076p-15; Wed, 10 Mar 2021 12:31:33 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:54397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK2gC-0006lt-78; Wed, 10 Mar 2021 12:31:30 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id CD3793148; Wed, 10 Mar 2021 12:31:25 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 10 Mar 2021 12:31:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=TghbB7aJpNrfYlH3Vr+G8g4Cm4ZnyNWM4SsT402BA Gc=; b=fY4py6GJDSinQ0jDPUoto18Dns/ZJDGjAWWvFAm88zAl3BOHGv4OLtscA QIBn0Qd2omgew7zqQX15MjXKsnWpMvHVxwLXyXUaR6eO6YGElDU06bOu25BSHWgu WEeEjsoiVhjWgwPnTjiM6hZ16o09r2ka7NmnqWlqC0wNt1VB1W6oeogbqlSSrOT2 WNfulIoC5bwFFkoiS5PzA1oh7wvS1B6Z9H1S7QJrFvGj5iVItL0z2wKJDfED95kF 5yGD1qnkLDXv1s2YU/5K8UaE8jhy90cs/dbDqOVP3FA8tDZMIJ7ljoGc2oP9ulA7 ISbqE9wnZ/XiZ5SNa3lwvq/XlR6cQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddukedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefvufgjfhfhfffkgggtgfesthhqredttddtjeenucfhrhhomhepffgrvhhi ugcugfgumhhonhgushhonhcuoegurghvihgurdgvughmohhnughsohhnsehorhgrtghlvg drtghomheqnecuggftrfgrthhtvghrnhepkeeivddtgfeutddtfffhiefhfeeftddtkeek tdeludehjefggefhudejleevudfhnecukfhppeekuddrudekjedrvdeirddvfeeknecuve hluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomhepuggrvhhiugdr vggumhhonhgushhonhesohhrrggtlhgvrdgtohhm X-ME-Proxy: Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net [81.187.26.238]) by mail.messagingengine.com (Postfix) with ESMTPA id 4ED13240054; Wed, 10 Mar 2021 12:31:24 -0500 (EST) Received: from localhost (disaster-area.hh.sledj.net [local]) by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 7024988c; Wed, 10 Mar 2021 17:31:23 +0000 (UTC) To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: Re: [PATCH v2 07/12] hw/block/pflash_cfi02: Factor out pflash_reset_state_machine() In-Reply-To: <20210310170528.1184868-8-philmd@redhat.com> References: <20210310170528.1184868-1-philmd@redhat.com> <20210310170528.1184868-8-philmd@redhat.com> X-HGTTG: heart-of-gold From: David Edmondson Date: Wed, 10 Mar 2021 17:31:23 +0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: softfail client-ip=64.147.123.25; envelope-from=david.edmondson@oracle.com; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_SOFTFAIL=0.665, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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 , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Alistair Francis , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wednesday, 2021-03-10 at 18:05:23 +01, Philippe Mathieu-Daud=C3=A9 wrote: > There is multiple places resetting the internal state machine. > Factor the code out in a new pflash_reset_state_machine() method. > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Edmondson > --- > hw/block/pflash_cfi02.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c > index 2ba77a0171b..aea47a99c61 100644 > --- a/hw/block/pflash_cfi02.c > +++ b/hw/block/pflash_cfi02.c > @@ -184,11 +184,17 @@ static void pflash_setup_mappings(PFlashCFI02 *pfl) > pfl->rom_mode =3D true; > } >=20=20 > +static void pflash_reset_state_machine(PFlashCFI02 *pfl) > +{ > + trace_pflash_reset(); > + pfl->cmd =3D 0x00; > + pfl->wcycle =3D 0; > +} > + > static void pflash_mode_read_array(PFlashCFI02 *pfl) > { > trace_pflash_mode_read_array(); > - pfl->cmd =3D 0x00; > - pfl->wcycle =3D 0; > + pflash_reset_state_machine(pfl); > pfl->rom_mode =3D true; > memory_region_rom_device_set_romd(&pfl->orig_mem, true); > } > @@ -330,8 +336,7 @@ static uint64_t pflash_read(void *opaque, hwaddr offs= et, unsigned int width) > default: > /* This should never happen : reset state & treat it as a read*/ > DPRINTF("%s: unknown command state: %x\n", __func__, pfl->cmd); > - pfl->wcycle =3D 0; > - pfl->cmd =3D 0; > + pflash_reset_state_machine(pfl); > /* fall through to the read code */ > case 0x80: /* Erase (unlock) */ > /* We accept reads during second unlock sequence... */ > @@ -669,8 +674,7 @@ static void pflash_write(void *opaque, hwaddr offset,= uint64_t value, > } > reset_dq3(pfl); > timer_del(&pfl->timer); > - pfl->wcycle =3D 0; > - pfl->cmd =3D 0; > + pflash_reset_state_machine(pfl); > return; > } > /* > @@ -710,10 +714,8 @@ static void pflash_write(void *opaque, hwaddr offset= , uint64_t value, >=20=20 > /* Reset flash */ > reset_flash: > - trace_pflash_reset(); > pfl->bypass =3D 0; > - pfl->wcycle =3D 0; > - pfl->cmd =3D 0; > + pflash_reset_state_machine(pfl); > return; >=20=20 > do_bypass: > --=20 > 2.26.2 dme. --=20 "Can I take you out to the pictures, Joan?"