[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 4/7] aspeed_sdmc: Init status alwlays idle
From: |
Joel Stanley |
Subject: |
[Qemu-arm] [PATCH 4/7] aspeed_sdmc: Init status alwlays idle |
Date: |
Tue, 7 Aug 2018 17:27:54 +0930 |
The ast2500 SDRAM training routine busy waits on the 'init cycle busy
state' bit in DDR PHY Control/Status register #1 (MCR60).
This ensures the bit always reads zero, and allows training to
complete with upstream u-boot on the ast2500-evb.
Signed-off-by: Joel Stanley <address@hidden>
---
hw/misc/aspeed_sdmc.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c
index 9ece545c4ffa..522e01ef8c0d 100644
--- a/hw/misc/aspeed_sdmc.c
+++ b/hw/misc/aspeed_sdmc.c
@@ -23,6 +23,10 @@
/* Configuration Register */
#define R_CONF (0x04 / 4)
+/* Control/Status Register #1 (ast2500) */
+#define R_STATUS1 (0x60 / 4)
+#define PHY_BUSY_STATE BIT(0)
+
/*
* Configuration register Ox4 (for Aspeed AST2400 SOC)
*
@@ -137,6 +141,17 @@ static void aspeed_sdmc_write(void *opaque, hwaddr addr,
uint64_t data,
g_assert_not_reached();
}
}
+ if (s->silicon_rev == AST2500_A0_SILICON_REV ||
+ s->silicon_rev == AST2500_A1_SILICON_REV) {
+ switch (addr) {
+ case R_STATUS1:
+ /* Will never return 'busy' */
+ data &= ~PHY_BUSY_STATE;
+ break;
+ default:
+ break;
+ }
+ }
s->regs[addr] = data;
}
--
2.17.1
- [Qemu-arm] [PATCH 0/7] arm: aspeed: Extend SDRAM controller, Joel Stanley, 2018/08/07
- [Qemu-arm] [PATCH 1/7] aspeed_sdmc: Extend number of valid registers, Joel Stanley, 2018/08/07
- [Qemu-arm] [PATCH 2/7] aspeed_sdmc: Fix saved values, Joel Stanley, 2018/08/07
- [Qemu-arm] [PATCH 3/7] aspeed_sdmc: Set 'cache initial sequence' always true, Joel Stanley, 2018/08/07
- [Qemu-arm] [PATCH 4/7] aspeed_sdmc: Init status alwlays idle,
Joel Stanley <=
- [Qemu-arm] [PATCH 5/7] aspeed_sdmc: Handle ECC training, Joel Stanley, 2018/08/07
- [Qemu-arm] [PATCH 6/7] aspeed: add a max_ram_size property to the memory controller, Joel Stanley, 2018/08/07
- [Qemu-arm] [PATCH 7/7] aspeed: Link SCU to the watchdog, Joel Stanley, 2018/08/07