aboutsummaryrefslogtreecommitdiff
path: root/hw/block/m25p80.c
diff options
context:
space:
mode:
authorMarcin Krzeminski <marcin.krzeminski@nokia.com>2016-03-30 17:27:23 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-03-30 17:27:23 +0100
commitaeb83edbf3d67b737b6cfd198b1b0cfcbb7327e8 (patch)
tree0fcb453d587c224e9d53e8ac234a61695addb9b4 /hw/block/m25p80.c
parentcb475951c0e109ba70ecebbf2853dfad5ff20cbb (diff)
downloadqemu-aeb83edbf3d67b737b6cfd198b1b0cfcbb7327e8.zip
qemu-aeb83edbf3d67b737b6cfd198b1b0cfcbb7327e8.tar.gz
qemu-aeb83edbf3d67b737b6cfd198b1b0cfcbb7327e8.tar.bz2
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>
Diffstat (limited to 'hw/block/m25p80.c')
-rw-r--r--hw/block/m25p80.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 3394f22..04e8730 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;