hw/block: m25p80: Fix the mess of dummy bytes needed for fast read commands

[PATCH 7/9] Revert "aspeed/smc: Fix number of dummy cycles for FAST_READ_4 command"

Bin Meng posted 9 patches 5 years ago

Download mbox

Maintainers: Joel Stanley <joel@jms.id.au>, Kevin Wolf <kwolf@redhat.com>, Havard Skinnemoen <hskinnemoen@google.com>, Tyrone Ting <kfting@nuvoton.com>, "Cédric Le Goater" <clg@kaod.org>, Andrew Jeffery <andrew@aj.id.au>, Max Reitz <mreitz@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Alistair Francis <alistair@alistair23.me>

Expand all Fold all

[PATCH 7/9] Revert "aspeed/smc: Fix number of dummy cycles for FAST_READ_4 command"

Posted by Bin Meng 5 years ago

From: Bin Meng <bin.meng@windriver.com>

This reverts commit 7faf6f1790dddf9f3acf6ddd95f7bbc1b4a755d0.

The incorrect implementation of dummy cycles in m25p80 model is now
corrected. Revert this commit.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 hw/ssi/aspeed_smc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 16addee4dc..1e78b5232f 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -802,11 +802,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:
-- 
2.25.1