mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/block/pflash_cfi02: Rename register_memory(true) as mode_read_array

Browse Source 
The same pattern is used when setting the flash in READ_ARRAY mode:
- Set the state machine command to READ_ARRAY
- Reset the write_cycle counter
- Reset the memory region in ROMD

Refactor the current code by extracting this pattern.
It is used three times:

- When the timer expires and not in bypass mode

- On a read access (on invalid command).

- When the device is initialized. Here the ROMD mode is hidden
  by the memory_region_init_rom_device() call.

pflash_register_memory(rom_mode=true) already sets the ROM device
in "read array" mode (from I/O device to ROM one). Explicit that
by renaming the function as pflash_mode_read_array(), adding
a trace event and resetting wcycle.

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: David Edmondson <david.edmondson@oracle.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210310170528.1184868-7-philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-03-10 00:21:44 +01:00
parent cadf25cfaa
commit 7cb1096021
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/block/pflash_cfi02.c
View File

@ -184,10 +184,13 @@ static void pflash_setup_mappings(PFlashCFI02 *pfl)
pfl->rom_mode = true; pfl->rom_mode = true;
} }
static void pflash_register_memory(PFlashCFI02 *pfl, int rom_mode) static void pflash_mode_read_array(PFlashCFI02 *pfl)
{ {
memory_region_rom_device_set_romd(&pfl->orig_mem, rom_mode); trace_pflash_mode_read_array();
pfl->rom_mode = !!rom_mode; pfl->cmd = 0x00;
pfl->wcycle = 0;
pfl->rom_mode = true;
memory_region_rom_device_set_romd(&pfl->orig_mem, true);
} }
static size_t pflash_regions_count(PFlashCFI02 *pfl) static size_t pflash_regions_count(PFlashCFI02 *pfl)
@ -249,11 +252,10 @@ static void pflash_timer(void *opaque)
toggle_dq7(pfl); toggle_dq7(pfl);
if (pfl->bypass) { if (pfl->bypass) {
pfl->wcycle = 2; pfl->wcycle = 2;
} else {
pflash_register_memory(pfl, 1);
pfl->wcycle = 0;
}
pfl->cmd = 0; pfl->cmd = 0;
} else {
pflash_mode_read_array(pfl);
}
} }
/* /*
@ -315,7 +317,7 @@ static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int width)
/* Lazy reset to ROMD mode after a certain amount of read accesses */ /* Lazy reset to ROMD mode after a certain amount of read accesses */
if (!pfl->rom_mode && pfl->wcycle == 0 && if (!pfl->rom_mode && pfl->wcycle == 0 &&
++pfl->read_counter > PFLASH_LAZY_ROMD_THRESHOLD) { ++pfl->read_counter > PFLASH_LAZY_ROMD_THRESHOLD) {
pflash_register_memory(pfl, 1); pflash_mode_read_array(pfl);
} }
offset &= pfl->chip_len - 1; offset &= pfl->chip_len - 1;
boff = offset & 0xFF; boff = offset & 0xFF;
@ -933,8 +935,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem);
timer_init_ns(&pfl->timer, QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); timer_init_ns(&pfl->timer, QEMU_CLOCK_VIRTUAL, pflash_timer, pfl);
pfl->wcycle = 0;
pfl->cmd = 0;
pfl->status = 0; pfl->status = 0;
pflash_cfi02_fill_cfi_table(pfl, nb_regions); pflash_cfi02_fill_cfi_table(pfl, nb_regions);

1
hw/block/trace-events
View File

@ -7,6 +7,7 @@ fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x"
# pflash_cfi01.c # pflash_cfi01.c
# pflash_cfi02.c # pflash_cfi02.c
pflash_reset(void) "reset" pflash_reset(void) "reset"
pflash_mode_read_array(void) "mode: read array"
pflash_timer_expired(uint8_t cmd) "command 0x%02x done" pflash_timer_expired(uint8_t cmd) "command 0x%02x done"
pflash_io_read(uint64_t offset, unsigned size, uint32_t value, uint8_t cmd, uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x cmd:0x%02x wcycle:%u" pflash_io_read(uint64_t offset, unsigned size, uint32_t value, uint8_t cmd, uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x cmd:0x%02x wcycle:%u"
pflash_io_write(uint64_t offset, unsigned size, uint32_t value, uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x wcycle:%u" pflash_io_write(uint64_t offset, unsigned size, uint32_t value, uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x wcycle:%u"