From nobody Wed Nov 19 08:26:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615395973; cv=none; d=zohomail.com; s=zohoarc; b=Bdpysz7UwAMHETWSCxBBlu0UOAPtYunDIvgZLkhuzxGYMRQ9YkF8X1plnTEiqzCqkdFyhzOqysXq1TaXPZ/3abbtfnTOBfeXgg+6nTmUSAAcQ6MXIbpPSD+Z8+LSnT+r9h0fgxe/IbwHxIi9cAmkt1ggObOgu1+S6L9aFP5GJVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615395973; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=j4UkoIyPvyQtBOyx7RE8awlWIoogi5VQBygbejCvWQI=; b=IvhdfGyk2WKuQMTTk3ZpxWgLGhnSm3tS3xdpptHQh4PRkU/fawlnMqbor5Fkh8M4nkMedr7aPb2T1cvSZ1zKA6HUOzGnbg/gRtNQFnhVd4v5zU14KEN+z2xfUJBlrrQJDjl38s4UrsdpjQ+O4TSVExlghLFMm5P2mptgOSTBp50= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1615395973153488.60226387193404; Wed, 10 Mar 2021 09:06:13 -0800 (PST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-513-lXUNBVk-PmG7Q5Mp9I0BhA-1; Wed, 10 Mar 2021 12:06:09 -0500 Received: by mail-ed1-f70.google.com with SMTP id h2so8657918edw.10 for ; Wed, 10 Mar 2021 09:06:09 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id g11sm6774582edt.35.2021.03.10.09.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 09:06:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615395972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j4UkoIyPvyQtBOyx7RE8awlWIoogi5VQBygbejCvWQI=; b=HKGZFKqr2T5zk9e7GbmzzPfUyu1WV+JCWy4GJFxiJC3O/oz59+/BGNnVeWkwHC6lyH+bKt P2hqRP1GKoSVO4qMw/g3crsV+TqSYGByOmv+3n/E5jJo6KcfB+ggiOuQqmt2UxYq8vsMV/ ObmLbhD0hm8RJjyvkvv8y719RtOeMpM= X-MC-Unique: lXUNBVk-PmG7Q5Mp9I0BhA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j4UkoIyPvyQtBOyx7RE8awlWIoogi5VQBygbejCvWQI=; b=n0u7wBZM7QhwdPyAnYUg8Vgs635B5Iu1kyEAIbUD/plbAP/Lkiox4LEnxbwqK4eWRC lbdaGvwzX1feKyvQkAwlxMDNtRaoUKjWpLFS1UfoRySrEu3L8VEYbXlGVf4y7SIodXA3 V1OZEI1MgZ6bpeWlnM6N91ZfG8GZWQ2lGgXuk2UNW+lDA30eYULnGAdy5Cnz+NZwVC5C CjN12nsFUGSW7LBRlS4gpziaHONPTs4udYhxaojMaPkMGvbvv4FTxwIWgz0yc56gYgRy eFyozIRSN7imU6jWdAcQtS7WlnecajiUEavLQuSc88qUBfr6l7ATUEAhwii+ogXTEjtc keHQ== X-Gm-Message-State: AOAM532pBpvZAn9iAtcFzxWAMDna7JJomU9ugjcbhOBuoC6z7q8yIFzp bM4NbX63G0mKIyw5fQXy2HdKtNQ4MpfZ5HA6D3/rvzr5DGDs7yHIBEtLgHEQTCEioLuoq9Yl09d 4p/wgUpvLexGGRA== X-Received: by 2002:aa7:c496:: with SMTP id m22mr4386470edq.292.1615395968630; Wed, 10 Mar 2021 09:06:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzBMFp4IixcQQnl1T8fTttG0NATBcxqx5apjcFwGkQ4cWQaft/+OArUyp9e5D/N4ix337M64g== X-Received: by 2002:aa7:c496:: with SMTP id m22mr4386456edq.292.1615395968513; Wed, 10 Mar 2021 09:06:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alistair Francis , Max Reitz , David Edmondson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Stephen Checkoway , Kevin Wolf Subject: [PATCH v2 07/12] hw/block/pflash_cfi02: Factor out pflash_reset_state_machine() Date: Wed, 10 Mar 2021 18:05:23 +0100 Message-Id: <20210310170528.1184868-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210310170528.1184868-1-philmd@redhat.com> References: <20210310170528.1184868-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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: Bin Meng 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 +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 offset= , 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, u= int64_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 /* 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 do_bypass: --=20 2.26.2