| Message ID | 1604626378-152352-3-git-send-email-komlodi@xilinx.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/block/m25p80: Numonyx: Fix dummy cycles and check for SPI mode on cmds | expand |
Hi Joe, On Thu, Nov 05, 2020 at 05:32:57PM -0800, Joe Komlodi wrote: > Some Numonyx flash commands cannot be executed in DIO and QIO mode, such as > trying to do DPP or DOR when in QIO mode. > > Signed-off-by: Joe Komlodi <komlodi@xilinx.com> > --- > hw/block/m25p80.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 119 insertions(+), 13 deletions(-) > > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index 4255a6a..8a1b684 100644 > --- a/hw/block/m25p80.c > +++ b/hw/block/m25p80.c > @@ -413,6 +413,12 @@ typedef enum { > MAN_GENERIC, > } Manufacturer; > > +typedef enum { > + MODE_STD = 0, > + MODE_DIO = 1, > + MODE_QIO = 2 > +} SPIMode; > + > #define M25P80_INTERNAL_DATA_BUFFER_SZ 16 > > struct Flash { > @@ -820,6 +826,70 @@ static void reset_memory(Flash *s) > trace_m25p80_reset_done(s); > } > > +static uint8_t numonyx_get_mode(Flash *s) > +{ > + uint8_t mode; We need to swap the polarities in below if checks. If you would like to get rid of some lines you can also just return the enum directly instead (and remove the 'mode' variable). > + > + if (s->enh_volatile_cfg & EVCFG_QUAD_IO_ENABLED) { > + mode = MODE_QIO; > + } else if (s->enh_volatile_cfg & EVCFG_DUAL_IO_ENABLED) { > + mode = MODE_DIO; > + } else { > + mode = MODE_STD; > + } > + > + return mode; > +} > + > +static bool numonyx_check_cmd_mode(Flash *s) > +{ > + uint8_t mode; > + assert(get_man(s) == MAN_NUMONYX); > + > + mode = numonyx_get_mode(s); > + > + switch (mode) { > + case MODE_STD: > + return true; > + case MODE_DIO: > + switch (s->cmd_in_progress) { > + case QOR: > + case QOR4: > + case QIOR: > + case QIOR4: > + case QPP: > + case QPP_4: > + case PP4_4: > + case JEDEC_READ: > + case READ: > + case READ4: > + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x in " > + "DIO mode\n", s->cmd_in_progress); > + return false; > + default: > + return true; > + } > + case MODE_QIO: > + switch (s->cmd_in_progress) { > + case DOR: > + case DOR4: > + case DIOR: > + case DIOR4: > + case DPP: > + case JEDEC_READ: > + case READ: > + case READ4: > + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x in " > + "QIO mode\n", s->cmd_in_progress); > + return false; > + default: > + return true; > + } > + default: > + g_assert_not_reached(); > + } > +} > + > static void decode_fast_read_cmd(Flash *s) > { > s->needed_bytes = get_addr_length(s); > @@ -827,9 +897,13 @@ static void decode_fast_read_cmd(Flash *s) > /* Dummy cycles - modeled with bytes writes instead of bits */ > case MAN_WINBOND: > s->needed_bytes += 8; > + s->state = STATE_COLLECTING_DATA; > break; > case MAN_NUMONYX: > - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); > + if (numonyx_check_cmd_mode(s)) { > + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); > + s->state = STATE_COLLECTING_DATA; > + } > break; > case MAN_MACRONIX: > if (extract32(s->volatile_cfg, 6, 2) == 1) { > @@ -837,19 +911,21 @@ static void decode_fast_read_cmd(Flash *s) > } else { > s->needed_bytes += 8; > } > + s->state = STATE_COLLECTING_DATA; > break; > case MAN_SPANSION: > s->needed_bytes += extract32(s->spansion_cr2v, > SPANSION_DUMMY_CLK_POS, > SPANSION_DUMMY_CLK_LEN > ); > + s->state = STATE_COLLECTING_DATA; > break; > default: > + s->state = STATE_COLLECTING_DATA; > break; > } > s->pos = 0; > s->len = 0; > - s->state = STATE_COLLECTING_DATA; > } > > static void decode_dio_read_cmd(Flash *s) > @@ -859,6 +935,7 @@ static void decode_dio_read_cmd(Flash *s) > switch (get_man(s)) { > case MAN_WINBOND: > s->needed_bytes += WINBOND_CONTINUOUS_READ_MODE_CMD_LEN; > + s->state = STATE_COLLECTING_DATA; > break; > case MAN_SPANSION: > s->needed_bytes += SPANSION_CONTINUOUS_READ_MODE_CMD_LEN; > @@ -866,9 +943,13 @@ static void decode_dio_read_cmd(Flash *s) > SPANSION_DUMMY_CLK_POS, > SPANSION_DUMMY_CLK_LEN > ); > + s->state = STATE_COLLECTING_DATA; > break; > case MAN_NUMONYX: > - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); > + if (numonyx_check_cmd_mode(s)) { > + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); > + s->state = STATE_COLLECTING_DATA; > + } > break; > case MAN_MACRONIX: > switch (extract32(s->volatile_cfg, 6, 2)) { > @@ -882,13 +963,14 @@ static void decode_dio_read_cmd(Flash *s) > s->needed_bytes += 4; > break; > } > + s->state = STATE_COLLECTING_DATA; > break; > default: > + s->state = STATE_COLLECTING_DATA; > break; > } > s->pos = 0; > s->len = 0; > - s->state = STATE_COLLECTING_DATA; > } > > static void decode_qio_read_cmd(Flash *s) > @@ -899,6 +981,7 @@ static void decode_qio_read_cmd(Flash *s) > case MAN_WINBOND: > s->needed_bytes += WINBOND_CONTINUOUS_READ_MODE_CMD_LEN; > s->needed_bytes += 4; > + s->state = STATE_COLLECTING_DATA; > break; > case MAN_SPANSION: > s->needed_bytes += SPANSION_CONTINUOUS_READ_MODE_CMD_LEN; > @@ -906,9 +989,13 @@ static void decode_qio_read_cmd(Flash *s) > SPANSION_DUMMY_CLK_POS, > SPANSION_DUMMY_CLK_LEN > ); > + s->state = STATE_COLLECTING_DATA; > break; > case MAN_NUMONYX: > - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); > + if (numonyx_check_cmd_mode(s)) { Instead of creating the numonyx_check_cmd_mode function I think it is better to chop up the switch in decode_new_cmd further and entering the decode_qio/dio/fast_read_cmd functions already checked for correct mode (the commands are already switch into there). > + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); > + s->state = STATE_COLLECTING_DATA; > + } > break; > case MAN_MACRONIX: > switch (extract32(s->volatile_cfg, 6, 2)) { > @@ -922,13 +1009,14 @@ static void decode_qio_read_cmd(Flash *s) > s->needed_bytes += 6; > break; > } > + s->state = STATE_COLLECTING_DATA; > break; > default: > + s->state = STATE_COLLECTING_DATA; > break; > } > s->pos = 0; > s->len = 0; > - s->state = STATE_COLLECTING_DATA; > } > > static void decode_new_cmd(Flash *s, uint32_t value) > @@ -950,6 +1038,15 @@ static void decode_new_cmd(Flash *s, uint32_t value) > case ERASE4_32K: > case ERASE_SECTOR: > case ERASE4_SECTOR: > + case DIE_ERASE: > + case RDID_90: > + case RDID_AB: > + s->needed_bytes = get_addr_length(s); > + s->pos = 0; > + s->len = 0; > + s->state = STATE_COLLECTING_DATA; > + break; > + > case READ: > case READ4: > case DPP: > @@ -958,13 +1055,19 @@ static void decode_new_cmd(Flash *s, uint32_t value) > case PP: > case PP4: > case PP4_4: > - case DIE_ERASE: > - case RDID_90: > - case RDID_AB: Similar as above comment, instead of creating numonyx_check_cmd_mode I think it is better to do the mode check here (and switch out more cmds if needed). Something like: ... case QPP: case QPP_4: case PPP4_4: if (!get_man(s) == MAN_NUMONYX || numonyx_get_mode(s) != MODE_DIO) { s->needed_bytes = get_addr_length(s); s->pos = 0; s->len = 0; s->state = STATE_COLLECTING_DATA; } else { qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Attempting Quad PP while in DIO mode....!\n"); } break; > - s->needed_bytes = get_addr_length(s); > - s->pos = 0; > - s->len = 0; > - s->state = STATE_COLLECTING_DATA; > + if (get_man(s) == MAN_NUMONYX) { > + if (numonyx_check_cmd_mode(s)) { > + s->needed_bytes = get_addr_length(s); > + s->pos = 0; > + s->len = 0; > + s->state = STATE_COLLECTING_DATA; > + } > + } else { > + s->needed_bytes = get_addr_length(s); > + s->pos = 0; > + s->len = 0; > + s->state = STATE_COLLECTING_DATA; > + } > break; > > case FAST_READ: > @@ -1035,6 +1138,9 @@ static void decode_new_cmd(Flash *s, uint32_t value) > break; > > case JEDEC_READ: > + if (get_man(s) == MAN_NUMONYX && !numonyx_check_cmd_mode(s)) { A log message here could help out when debugging (and also check mode directly as above). Best regards, Francisco Iglesias > + break; > + } > trace_m25p80_populated_jedec(s); > for (i = 0; i < s->pi->id_len; i++) { > s->data[i] = s->pi->id[i]; > -- > 2.7.4 >
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 4255a6a..8a1b684 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -413,6 +413,12 @@ typedef enum { MAN_GENERIC, } Manufacturer; +typedef enum { + MODE_STD = 0, + MODE_DIO = 1, + MODE_QIO = 2 +} SPIMode; + #define M25P80_INTERNAL_DATA_BUFFER_SZ 16 struct Flash { @@ -820,6 +826,70 @@ static void reset_memory(Flash *s) trace_m25p80_reset_done(s); } +static uint8_t numonyx_get_mode(Flash *s) +{ + uint8_t mode; + + if (s->enh_volatile_cfg & EVCFG_QUAD_IO_ENABLED) { + mode = MODE_QIO; + } else if (s->enh_volatile_cfg & EVCFG_DUAL_IO_ENABLED) { + mode = MODE_DIO; + } else { + mode = MODE_STD; + } + + return mode; +} + +static bool numonyx_check_cmd_mode(Flash *s) +{ + uint8_t mode; + assert(get_man(s) == MAN_NUMONYX); + + mode = numonyx_get_mode(s); + + switch (mode) { + case MODE_STD: + return true; + case MODE_DIO: + switch (s->cmd_in_progress) { + case QOR: + case QOR4: + case QIOR: + case QIOR4: + case QPP: + case QPP_4: + case PP4_4: + case JEDEC_READ: + case READ: + case READ4: + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x in " + "DIO mode\n", s->cmd_in_progress); + return false; + default: + return true; + } + case MODE_QIO: + switch (s->cmd_in_progress) { + case DOR: + case DOR4: + case DIOR: + case DIOR4: + case DPP: + case JEDEC_READ: + case READ: + case READ4: + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x in " + "QIO mode\n", s->cmd_in_progress); + return false; + default: + return true; + } + default: + g_assert_not_reached(); + } +} + static void decode_fast_read_cmd(Flash *s) { s->needed_bytes = get_addr_length(s); @@ -827,9 +897,13 @@ static void decode_fast_read_cmd(Flash *s) /* Dummy cycles - modeled with bytes writes instead of bits */ case MAN_WINBOND: s->needed_bytes += 8; + s->state = STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + if (numonyx_check_cmd_mode(s)) { + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + s->state = STATE_COLLECTING_DATA; + } break; case MAN_MACRONIX: if (extract32(s->volatile_cfg, 6, 2) == 1) { @@ -837,19 +911,21 @@ static void decode_fast_read_cmd(Flash *s) } else { s->needed_bytes += 8; } + s->state = STATE_COLLECTING_DATA; break; case MAN_SPANSION: s->needed_bytes += extract32(s->spansion_cr2v, SPANSION_DUMMY_CLK_POS, SPANSION_DUMMY_CLK_LEN ); + s->state = STATE_COLLECTING_DATA; break; default: + s->state = STATE_COLLECTING_DATA; break; } s->pos = 0; s->len = 0; - s->state = STATE_COLLECTING_DATA; } static void decode_dio_read_cmd(Flash *s) @@ -859,6 +935,7 @@ static void decode_dio_read_cmd(Flash *s) switch (get_man(s)) { case MAN_WINBOND: s->needed_bytes += WINBOND_CONTINUOUS_READ_MODE_CMD_LEN; + s->state = STATE_COLLECTING_DATA; break; case MAN_SPANSION: s->needed_bytes += SPANSION_CONTINUOUS_READ_MODE_CMD_LEN; @@ -866,9 +943,13 @@ static void decode_dio_read_cmd(Flash *s) SPANSION_DUMMY_CLK_POS, SPANSION_DUMMY_CLK_LEN ); + s->state = STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + if (numonyx_check_cmd_mode(s)) { + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + s->state = STATE_COLLECTING_DATA; + } break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { @@ -882,13 +963,14 @@ static void decode_dio_read_cmd(Flash *s) s->needed_bytes += 4; break; } + s->state = STATE_COLLECTING_DATA; break; default: + s->state = STATE_COLLECTING_DATA; break; } s->pos = 0; s->len = 0; - s->state = STATE_COLLECTING_DATA; } static void decode_qio_read_cmd(Flash *s) @@ -899,6 +981,7 @@ static void decode_qio_read_cmd(Flash *s) case MAN_WINBOND: s->needed_bytes += WINBOND_CONTINUOUS_READ_MODE_CMD_LEN; s->needed_bytes += 4; + s->state = STATE_COLLECTING_DATA; break; case MAN_SPANSION: s->needed_bytes += SPANSION_CONTINUOUS_READ_MODE_CMD_LEN; @@ -906,9 +989,13 @@ static void decode_qio_read_cmd(Flash *s) SPANSION_DUMMY_CLK_POS, SPANSION_DUMMY_CLK_LEN ); + s->state = STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + if (numonyx_check_cmd_mode(s)) { + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + s->state = STATE_COLLECTING_DATA; + } break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { @@ -922,13 +1009,14 @@ static void decode_qio_read_cmd(Flash *s) s->needed_bytes += 6; break; } + s->state = STATE_COLLECTING_DATA; break; default: + s->state = STATE_COLLECTING_DATA; break; } s->pos = 0; s->len = 0; - s->state = STATE_COLLECTING_DATA; } static void decode_new_cmd(Flash *s, uint32_t value) @@ -950,6 +1038,15 @@ static void decode_new_cmd(Flash *s, uint32_t value) case ERASE4_32K: case ERASE_SECTOR: case ERASE4_SECTOR: + case DIE_ERASE: + case RDID_90: + case RDID_AB: + s->needed_bytes = get_addr_length(s); + s->pos = 0; + s->len = 0; + s->state = STATE_COLLECTING_DATA; + break; + case READ: case READ4: case DPP: @@ -958,13 +1055,19 @@ static void decode_new_cmd(Flash *s, uint32_t value) case PP: case PP4: case PP4_4: - case DIE_ERASE: - case RDID_90: - case RDID_AB: - s->needed_bytes = get_addr_length(s); - s->pos = 0; - s->len = 0; - s->state = STATE_COLLECTING_DATA; + if (get_man(s) == MAN_NUMONYX) { + if (numonyx_check_cmd_mode(s)) { + s->needed_bytes = get_addr_length(s); + s->pos = 0; + s->len = 0; + s->state = STATE_COLLECTING_DATA; + } + } else { + s->needed_bytes = get_addr_length(s); + s->pos = 0; + s->len = 0; + s->state = STATE_COLLECTING_DATA; + } break; case FAST_READ: @@ -1035,6 +1138,9 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case JEDEC_READ: + if (get_man(s) == MAN_NUMONYX && !numonyx_check_cmd_mode(s)) { + break; + } trace_m25p80_populated_jedec(s); for (i = 0; i < s->pi->id_len; i++) { s->data[i] = s->pi->id[i];
Some Numonyx flash commands cannot be executed in DIO and QIO mode, such as trying to do DPP or DOR when in QIO mode. Signed-off-by: Joe Komlodi <komlodi@xilinx.com> --- hw/block/m25p80.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 119 insertions(+), 13 deletions(-)