From: Guenter Roeck Date: Mon, 16 Mar 2020 15:52:24 +0000 (+0000) Subject: aspeed/smc: Fix number of dummy cycles for FAST_READ_4 command X-Git-Tag: v5.0.0-rc0~31^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7faf6f1790dddf9f3acf6ddd95f7bbc1b4a755d0;p=thirdparty%2Fqemu.git aspeed/smc: Fix number of dummy cycles for FAST_READ_4 command The Linux kernel recently started using FAST_READ_4 commands. This results in flash read failures. At the same time, the m25p80 emulation is seen to read 8 more bytes than expected. Adjusting the expected number of dummy cycles to match FAST_READ fixes the problem. Fixes: f95c4bffdc4c ("aspeed/smc: snoop SPI transfers to fake dummy cycles") Reviewed-by: Cédric Le Goater Signed-off-by: Guenter Roeck Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell --- diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 32be2a02b0e..9d5c696d5a1 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -788,11 +788,11 @@ static int aspeed_smc_num_dummies(uint8_t command) case FAST_READ: case DOR: case QOR: + case FAST_READ_4: case DOR_4: case QOR_4: return 1; case DIOR: - case FAST_READ_4: case DIOR_4: return 2; case QIOR: