diff options
| author | Marcin Krzeminski | 2016-03-30 18:27:23 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-03-30 18:27:23 +0200 |
| commit | aeb83edbf3d67b737b6cfd198b1b0cfcbb7327e8 (patch) | |
| tree | 0fcb453d587c224e9d53e8ac234a61695addb9b4 | |
| parent | block: m25p80: Add configuration registers (diff) | |
| download | qemu-aeb83edbf3d67b737b6cfd198b1b0cfcbb7327e8.tar.gz qemu-aeb83edbf3d67b737b6cfd198b1b0cfcbb7327e8.tar.xz qemu-aeb83edbf3d67b737b6cfd198b1b0cfcbb7327e8.zip | |
block: m25p80: Dummy cycles for N25Q256/512
Use the setting from the volatile cfg register to correctly
set the number of dummy cycles.
Signed-off-by: Marcin Krzeminski <marcin.krzeminski@nokia.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 1458719789-29868-8-git-send-email-marcin.krzeminski@nokia.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/block/m25p80.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 3394f221d9..04e8730fa4 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -583,7 +583,11 @@ static void decode_new_cmd(Flash *s, uint32_t value) case FAST_READ: case DOR: case QOR: - s->needed_bytes = get_addr_length(s) + 1; + s->needed_bytes = get_addr_length(s); + if (((s->pi->jedec >> 16) & 0xFF) == JEDEC_NUMONYX) { + /* Dummy cycles modeled with bytes writes instead of bits */ + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + } s->pos = 0; s->len = 0; s->state = STATE_COLLECTING_DATA; @@ -596,7 +600,9 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->needed_bytes = 4; break; default: - s->needed_bytes = get_addr_length(s) + 2; + s->needed_bytes = get_addr_length(s); + /* Dummy cycles modeled with bytes writes instead of bits */ + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); } s->pos = 0; s->len = 0; @@ -610,7 +616,9 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->needed_bytes = 6; break; default: - s->needed_bytes = get_addr_length(s) + 4; + s->needed_bytes = get_addr_length(s); + /* Dummy cycles modeled with bytes writes instead of bits */ + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); } s->pos = 0; s->len = 0; |