[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] hw/block/m25p80: Fix Numonyx dummy cycle register behavior
From: |
Joe Komlodi |
Subject: |
[PATCH 1/2] hw/block/m25p80: Fix Numonyx dummy cycle register behavior |
Date: |
Tue, 29 Sep 2020 17:28:35 -0700 |
Numonyx chips determine the number of cycles to wait based on bits 7:4 in the
volatile configuration register.
However, if these bits are 0x0 or 0xF, the number of dummy cycles to wait is
10 on a QIOR or QIOR4 command, or 8 on any other currently supported
fast read command. [1]
[1] http://www.micron.com/-/media/client/global/documents/products/
data-sheet/nor-flash/serial-nor/n25q/n25q_512mb_1_8v_65nm.pdf
Page 22 note 2, and page 30 notes 5 and 10.
Signed-off-by: Joe Komlodi <komlodi@xilinx.com>
---
hw/block/m25p80.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 483925f..43830c9 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -820,6 +820,26 @@ static void reset_memory(Flash *s)
trace_m25p80_reset_done(s);
}
+static uint8_t numonyx_fast_read_num_dummies(Flash *s)
+{
+ uint8_t cycle_count;
+ uint8_t num_dummies;
+ assert(get_man(s) == MAN_NUMONYX);
+
+ cycle_count = extract32(s->volatile_cfg, 4, 4);
+ if (cycle_count == 0x0 || cycle_count == 0x0F) {
+ if (s->cmd_in_progress == QIOR || s->cmd_in_progress == QIOR4) {
+ num_dummies = 10;
+ } else {
+ num_dummies = 8;
+ }
+ } else {
+ num_dummies = cycle_count;
+ }
+
+ return num_dummies;
+}
+
static void decode_fast_read_cmd(Flash *s)
{
s->needed_bytes = get_addr_length(s);
@@ -829,7 +849,7 @@ static void decode_fast_read_cmd(Flash *s)
s->needed_bytes += 8;
break;
case MAN_NUMONYX:
- s->needed_bytes += extract32(s->volatile_cfg, 4, 4);
+ s->needed_bytes += numonyx_fast_read_num_dummies(s);
break;
case MAN_MACRONIX:
if (extract32(s->volatile_cfg, 6, 2) == 1) {
@@ -868,7 +888,7 @@ static void decode_dio_read_cmd(Flash *s)
);
break;
case MAN_NUMONYX:
- s->needed_bytes += extract32(s->volatile_cfg, 4, 4);
+ s->needed_bytes += numonyx_fast_read_num_dummies(s);
break;
case MAN_MACRONIX:
switch (extract32(s->volatile_cfg, 6, 2)) {
@@ -908,7 +928,7 @@ static void decode_qio_read_cmd(Flash *s)
);
break;
case MAN_NUMONYX:
- s->needed_bytes += extract32(s->volatile_cfg, 4, 4);
+ s->needed_bytes += numonyx_fast_read_num_dummies(s);
break;
case MAN_MACRONIX:
switch (extract32(s->volatile_cfg, 6, 2)) {
--
2.7.4