On 6/30/26 15:57, Bin Meng wrote:
m25p80 now consumes fast-read dummy phases as byte counts. The
ASPEED SMC direct-read path still treated the CEx dummy field as
raw cycles and emitted field * 8 SSI transfers. Convert the
ASPEED dummy field to SSI byte transfers using the selected
direct-read data width.
Fixes: ac2810defa9d ("aspeed/smc: handle dummy bytes when doing fast reads in
command mode")
Signed-off-by: Bin Meng <[email protected]>
---
hw/ssi/aspeed_smc.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index d87fbd798c..f5abc9fcc9 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -449,19 +449,28 @@ static uint32_t aspeed_smc_check_segment_addr(const
AspeedSMCFlash *fl,
return addr;
}
-static int aspeed_smc_flash_dummies(const AspeedSMCFlash *fl)
+static int aspeed_smc_flash_dummy_bytes(const AspeedSMCFlash *fl)
{
const AspeedSMCState *s = fl->controller;
uint32_t r_ctrl0 = s->regs[s->r_ctrl0 + fl->cs];
uint32_t dummy_high = (r_ctrl0 >> CTRL_DUMMY_HIGH_SHIFT) & 0x1;
uint32_t dummy_low = (r_ctrl0 >> CTRL_DUMMY_LOW_SHIFT) & 0x3;
- uint32_t dummies = ((dummy_high << 2) | dummy_low) * 8;
+ uint32_t dummy_byte = (dummy_high << 2) | dummy_low;
- if (r_ctrl0 & CTRL_IO_DUAL_ADDR_DATA) {
- dummies /= 2;
+ /*
+ * Scale the controller dummy field to SSI byte transfers using the
+ * direct-read dummy/address bus width.
+ */
+ if ((r_ctrl0 & CTRL_IO_QPI) ||
+ ((r_ctrl0 & CTRL_IO_QUAD_DATA) &&
+ (r_ctrl0 & CTRL_IO_QUAD_ADDR_DATA))) {
+ dummy_byte *= 4;
+ } else if ((r_ctrl0 & CTRL_IO_DUAL_DATA) &&
+ (r_ctrl0 & CTRL_IO_DUAL_ADDR_DATA)) {
+ dummy_byte *= 2;
}
- return dummies;
+ return dummy_byte;
}
static void aspeed_smc_flash_setup(AspeedSMCFlash *fl, uint32_t addr)
@@ -487,7 +496,7 @@ static void aspeed_smc_flash_setup(AspeedSMCFlash *fl,
uint32_t addr)
* settings, let's check for fast read mode.
*/
if (aspeed_smc_flash_mode(fl) == CTRL_FREADMODE) {
- for (i = 0; i < aspeed_smc_flash_dummies(fl); i++) {
+ for (i = 0; i < aspeed_smc_flash_dummy_bytes(fl); i++) {
ssi_transfer(fl->controller->spi, s->regs[R_DUMMY_DATA] & 0xff);
}
}
Reviewed-by: Cédric Le Goater <[email protected]>
Thanks,
C.
