Skip to content

Commit

Permalink
hw/block/pflash_cfi01: Removed an unused timer
Browse files Browse the repository at this point in the history
The 'CFI02' NOR flash was introduced in commit 29133e9, with
timing modelled. One year later, the CFI01 model was introduced
(commit 05ee37e) 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>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
[Laszlo Ersek: Regression tested EDK2 OVMF IA32X64, ArmVirtQemu Aarch64
https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg04373.html]
Message-Id: <20190716221555.11145-2-philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
  • Loading branch information
philmd committed May 22, 2020
1 parent d19f1ab commit d23048c
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions hw/block/pflash_cfi01.c
Expand Up @@ -42,7 +42,6 @@
#include "hw/qdev-properties.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"
Expand Down Expand Up @@ -91,7 +90,6 @@ struct PFlashCFI01 {
uint8_t cfi_table[0x52];
uint64_t counter;
unsigned int writeblock_size;
QEMUTimer *timer;
MemoryRegion mem;
char *name;
void *storage;
Expand All @@ -115,18 +113,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.
Expand Down Expand Up @@ -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 = 0x80; /* WSM ready */
Expand Down

0 comments on commit d23048c

Please sign in to comment.