| Message ID | 20190702001301.4768-2-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/block/pflash_cfi01: Add DeviceReset() handler | expand |
On Mon, Jul 1, 2019 at 5:13 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > The 'CFI02' NOR flash was introduced in commit 29133e9a0fff, with > timing modelled. One year later, the CFI01 model was introduced > (commit 05ee37ebf630) based on the CFI02 model. As noted in the > header, "It does not support timings". 12 years later, we never > had to model the device timings. Time to remove the unused timer, > we can still add it back if required. > > Suggested-by: Laszlo Ersek <lersek@redhat.com> > Reviewed-by: Wei Yang <richardw.yang@linux.intel.com> > Reviewed-by: Laszlo Ersek <lersek@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > v2: Fixed commit description (Laszlo) > --- > hw/block/pflash_cfi01.c | 15 --------------- > 1 file changed, 15 deletions(-) > > diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c > index 35080d915f..dcc9885bf0 100644 > --- a/hw/block/pflash_cfi01.c > +++ b/hw/block/pflash_cfi01.c > @@ -42,7 +42,6 @@ > #include "hw/block/flash.h" > #include "sysemu/block-backend.h" > #include "qapi/error.h" > -#include "qemu/timer.h" > #include "qemu/bitops.h" > #include "qemu/error-report.h" > #include "qemu/host-utils.h" > @@ -90,7 +89,6 @@ struct PFlashCFI01 { > uint8_t cfi_table[0x52]; > uint64_t counter; > unsigned int writeblock_size; > - QEMUTimer *timer; > MemoryRegion mem; > char *name; > void *storage; > @@ -114,18 +112,6 @@ static const VMStateDescription vmstate_pflash = { > } > }; > > -static void pflash_timer (void *opaque) > -{ > - PFlashCFI01 *pfl = opaque; > - > - trace_pflash_timer_expired(pfl->cmd); > - /* Reset flash */ > - pfl->status ^= 0x80; > - memory_region_rom_device_set_romd(&pfl->mem, true); > - pfl->wcycle = 0; > - pfl->cmd = 0; > -} > - > /* 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. > @@ -775,7 +761,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) > pfl->max_device_width = pfl->device_width; > } > > - pfl->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); > pfl->wcycle = 0; > pfl->cmd = 0; > pfl->status = 0; > -- > 2.20.1 >
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 35080d915f..dcc9885bf0 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -42,7 +42,6 @@ #include "hw/block/flash.h" #include "sysemu/block-backend.h" #include "qapi/error.h" -#include "qemu/timer.h" #include "qemu/bitops.h" #include "qemu/error-report.h" #include "qemu/host-utils.h" @@ -90,7 +89,6 @@ struct PFlashCFI01 { uint8_t cfi_table[0x52]; uint64_t counter; unsigned int writeblock_size; - QEMUTimer *timer; MemoryRegion mem; char *name; void *storage; @@ -114,18 +112,6 @@ static const VMStateDescription vmstate_pflash = { } }; -static void pflash_timer (void *opaque) -{ - PFlashCFI01 *pfl = opaque; - - trace_pflash_timer_expired(pfl->cmd); - /* Reset flash */ - pfl->status ^= 0x80; - memory_region_rom_device_set_romd(&pfl->mem, true); - pfl->wcycle = 0; - pfl->cmd = 0; -} - /* 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. @@ -775,7 +761,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) pfl->max_device_width = pfl->device_width; } - pfl->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); pfl->wcycle = 0; pfl->cmd = 0; pfl->status = 0;