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=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 09FCFC04AAD for ; Mon, 6 May 2019 14:53:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D472A2053B for ; Mon, 6 May 2019 14:53:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D472A2053B 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 ([127.0.0.1]:57725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNezK-0002ug-4W for qemu-devel@archiver.kernel.org; Mon, 06 May 2019 10:53:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNexz-00028R-7N for qemu-devel@nongnu.org; Mon, 06 May 2019 10:51:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNexy-0000eS-6k for qemu-devel@nongnu.org; Mon, 06 May 2019 10:51:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39750) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNexv-0000dS-Vt; Mon, 06 May 2019 10:51:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 453EC3086227; Mon, 6 May 2019 14:51:39 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-124-221.rdu2.redhat.com [10.10.124.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4BAF5DA9B; Mon, 6 May 2019 14:51:26 +0000 (UTC) To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org, qemu-stable@nongnu.org References: <20190505200602.12412-1-philmd@redhat.com> <20190505200602.12412-3-philmd@redhat.com> From: Laszlo Ersek Message-ID: <4b97b463-0ab3-4f84-44e8-5f351f14fd95@redhat.com> Date: Mon, 6 May 2019 16:51:25 +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: <20190505200602.12412-3-philmd@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 06 May 2019 14:51:39 +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] [PATCH 2/5] hw/block/pflash_cfi01: Extract the pflash_reset() code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , Stephen Checkoway , qemu-block@nongnu.org, "Michael S . Tsirkin" , Markus Armbruster , Max Reitz , Wei Yang , Paolo Bonzini , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 05/05/19 22:05, Philippe Mathieu-Daud=C3=A9 wrote: > The reset() code is used in various places, refactor it. >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > hw/block/pflash_cfi01.c | 21 ++++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) BTW: you didn't add an explicit "Cc: stable" tag here, so I almost missed it -- but, mainly, is this really suitable material for stable? We haven't really noticed (or at least pin-pointed) the lack of the reset handlers in 12 years, correct? Thanks Laszlo >=20 > diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c > index 6dc04f156a7..073cd14978f 100644 > --- a/hw/block/pflash_cfi01.c > +++ b/hw/block/pflash_cfi01.c > @@ -108,6 +108,15 @@ static const VMStateDescription vmstate_pflash =3D= { > } > }; > =20 > +static void pflash_reset(PFlashCFI01 *pfl) > +{ > + trace_pflash_reset(); > + pfl->wcycle =3D 0; > + pfl->cmd =3D 0; > + pfl->status =3D 0; > + memory_region_rom_device_set_romd(&pfl->mem, true); > +} > + > /* Perform a CFI query based on the bank width of the flash. > * If this code is called we know we have a device_width set for > * this flash. > @@ -275,8 +284,7 @@ static uint32_t pflash_read(PFlashCFI01 *pfl, hwadd= r offset, > 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(pfl); > /* fall through to read code */ > case 0x00: > /* Flash area read */ > @@ -639,10 +647,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr = offset, > "\n", __func__, offset, pfl->wcycle, pfl->cmd, value= ); > =20 > reset_flash: > - trace_pflash_reset(); > - memory_region_rom_device_set_romd(&pfl->mem, true); > - pfl->wcycle =3D 0; > - pfl->cmd =3D 0; > + pflash_reset(pfl); > } > =20 > =20 > @@ -757,9 +762,7 @@ static void pflash_cfi01_realize(DeviceState *dev, = Error **errp) > pfl->max_device_width =3D pfl->device_width; > } > =20 > - pfl->wcycle =3D 0; > - pfl->cmd =3D 0; > - pfl->status =3D 0; > + pflash_reset(pfl); > /* Hardcoded CFI table */ > /* Standard "QRY" string */ > pfl->cfi_table[0x10] =3D 'Q'; >=20