From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Stephen Checkoway" <stephen.checkoway@oberlin.edu>,
qemu-block@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
"David Edmondson" <david.edmondson@oracle.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 07/12] hw/block/pflash_cfi02: Factor out pflash_reset_state_machine()
Date: Wed, 10 Mar 2021 18:05:23 +0100 [thread overview]
Message-ID: <20210310170528.1184868-8-philmd@redhat.com> (raw)
In-Reply-To: <20210310170528.1184868-1-philmd@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é <philmd@redhat.com>
---
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 = true;
}
+static void pflash_reset_state_machine(PFlashCFI02 *pfl)
+{
+ trace_pflash_reset();
+ pfl->cmd = 0x00;
+ pfl->wcycle = 0;
+}
+
static void pflash_mode_read_array(PFlashCFI02 *pfl)
{
trace_pflash_mode_read_array();
- pfl->cmd = 0x00;
- pfl->wcycle = 0;
+ pflash_reset_state_machine(pfl);
pfl->rom_mode = 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 = 0;
- pfl->cmd = 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 = 0;
- pfl->cmd = 0;
+ pflash_reset_state_machine(pfl);
return;
}
/*
@@ -710,10 +714,8 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value,
/* Reset flash */
reset_flash:
- trace_pflash_reset();
pfl->bypass = 0;
- pfl->wcycle = 0;
- pfl->cmd = 0;
+ pflash_reset_state_machine(pfl);
return;
do_bypass:
--
2.26.2
next prev parent reply other threads:[~2021-03-10 17:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 17:05 [PATCH v2 00/12] hw/block/pflash: Refactors around setting the device in read-array mode Philippe Mathieu-Daudé
2021-03-10 17:05 ` [PATCH v2 01/12] hw/block/pflash_cfi: Fix code style for checkpatch.pl Philippe Mathieu-Daudé
2021-03-10 17:05 ` [PATCH v2 02/12] hw/block/pflash_cfi01: Extract pflash_cfi01_fill_cfi_table() Philippe Mathieu-Daudé
2021-03-10 17:05 ` [PATCH v2 03/12] hw/block/pflash_cfi02: Extract pflash_cfi02_fill_cfi_table() Philippe Mathieu-Daudé
2021-03-10 17:05 ` [PATCH v2 04/12] hw/block/pflash_cfi02: Set rom_mode to true in pflash_setup_mappings() Philippe Mathieu-Daudé
2021-03-10 17:30 ` David Edmondson
2021-03-10 17:05 ` [PATCH v2 05/12] hw/block/pflash_cfi02: Open-code pflash_register_memory(rom=false) Philippe Mathieu-Daudé
2021-03-10 17:31 ` David Edmondson
2021-03-10 17:05 ` [PATCH v2 06/12] hw/block/pflash_cfi02: Rename register_memory(true) as mode_read_array Philippe Mathieu-Daudé
2021-03-10 17:05 ` Philippe Mathieu-Daudé [this message]
2021-03-10 17:31 ` [PATCH v2 07/12] hw/block/pflash_cfi02: Factor out pflash_reset_state_machine() David Edmondson
2021-03-11 3:05 ` Bin Meng
2021-03-10 17:05 ` [PATCH v2 08/12] hw/block/pflash_cfi02: Add DeviceReset method Philippe Mathieu-Daudé
2021-03-10 17:31 ` David Edmondson
2021-03-11 3:05 ` Bin Meng
2021-03-10 17:05 ` [PATCH v2 09/12] hw/block/pflash_cfi01: Clarify trace events Philippe Mathieu-Daudé
2021-03-10 17:05 ` [PATCH v2 10/12] hw/block/pflash_cfi01: Extract pflash_mode_read_array() Philippe Mathieu-Daudé
2021-03-11 3:05 ` Bin Meng
2021-03-10 17:05 ` [PATCH v2 11/12] hw/block/pflash_cfi01: Correct the type of PFlashCFI01.ro Philippe Mathieu-Daudé
2021-03-11 3:05 ` Bin Meng
2021-03-10 17:05 ` [PATCH v2 12/12] hw/block/pflash_cfi: Replace DPRINTF with trace events Philippe Mathieu-Daudé
2021-03-11 3:05 ` Bin Meng
2021-03-15 23:24 ` [PATCH v2 00/12] hw/block/pflash: Refactors around setting the device in read-array mode Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210310170528.1184868-8-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=david.edmondson@oracle.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stephen.checkoway@oberlin.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).