[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 07/11] block: m25p80: Dummy cycles for N25Q256/51
From: |
marcin . krzeminski |
Subject: |
[Qemu-devel] [PATCH v5 07/11] block: m25p80: Dummy cycles for N25Q256/512 |
Date: |
Sun, 20 Mar 2016 19:28:09 +0100 |
From: Marcin Krzeminski <address@hidden>
Use the setting from the volatile cfg register to correctly
set the number of dummy cycles.
Signed-off-by: Marcin Krzeminski <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
---
hw/block/m25p80.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 6dc5b6f..c245531 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;
--
2.5.0
- [Qemu-devel] [PATCH v5 00/11] Support for N25Q256/512 and AT25128/256, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 02/11] block: m25p80: RESET_ENABLE and RESET_MEMORY commands, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 10/11] block: m25p80: n25q256a/n25q512a models, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 01/11] block: m25p80: Removed unused variable, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 09/11] block: m25p80: Implemented FSR register, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 11/11] block: m25p80: at25128a/at25256a models, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 06/11] block: m25p80: Add configuration registers, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 07/11] block: m25p80: Dummy cycles for N25Q256/512,
marcin . krzeminski <=
- [Qemu-devel] [PATCH v5 04/11] block: m25p80: Extend address mode, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 08/11] block: m25p80: Fast read and 4bytes commands, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 05/11] block: m25p80: 4byte address mode, marcin . krzeminski, 2016/03/20
- [Qemu-devel] [PATCH v5 03/11] block: m25p80: Widen flags variable, marcin . krzeminski, 2016/03/20
- Re: [Qemu-devel] [PATCH v5 00/11] Support for N25Q256/512 and AT25128/256, Peter Maydell, 2016/03/23