[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/34] aspeed: sdmc: Implement AST2600 locking behaviour
From: |
Peter Maydell |
Subject: |
[PULL 04/34] aspeed: sdmc: Implement AST2600 locking behaviour |
Date: |
Mon, 11 May 2020 14:33:35 +0100 |
From: Joel Stanley <address@hidden>
The AST2600 handles this differently with the extra 'hardlock' state, so
move the testing to the soc specific class' write callback.
Signed-off-by: Joel Stanley <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/misc/aspeed_sdmc.c | 55 +++++++++++++++++++++++++++++++++++--------
1 file changed, 45 insertions(+), 10 deletions(-)
diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c
index 7b466bf19a6..14db9cfc1f8 100644
--- a/hw/misc/aspeed_sdmc.c
+++ b/hw/misc/aspeed_sdmc.c
@@ -23,7 +23,12 @@
/* Protection Key Register */
#define R_PROT (0x00 / 4)
+#define PROT_UNLOCKED 0x01
+#define PROT_HARDLOCKED 0x10 /* AST2600 */
+#define PROT_SOFTLOCKED 0x00
+
#define PROT_KEY_UNLOCK 0xFC600309
+#define PROT_KEY_HARDLOCK 0xDEADDEAD /* AST2600 */
/* Configuration Register */
#define R_CONF (0x04 / 4)
@@ -130,16 +135,6 @@ static void aspeed_sdmc_write(void *opaque, hwaddr addr,
uint64_t data,
return;
}
- if (addr == R_PROT) {
- s->regs[addr] = (data == PROT_KEY_UNLOCK) ? 1 : 0;
- return;
- }
-
- if (!s->regs[R_PROT]) {
- qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked!\n", __func__);
- return;
- }
-
asc->write(s, addr, data);
}
@@ -320,6 +315,16 @@ static uint32_t
aspeed_2400_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data)
static void aspeed_2400_sdmc_write(AspeedSDMCState *s, uint32_t reg,
uint32_t data)
{
+ if (reg == R_PROT) {
+ s->regs[reg] = (data == PROT_KEY_UNLOCK) ? PROT_UNLOCKED :
PROT_SOFTLOCKED;
+ return;
+ }
+
+ if (!s->regs[R_PROT]) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked!\n", __func__);
+ return;
+ }
+
switch (reg) {
case R_CONF:
data = aspeed_2400_sdmc_compute_conf(s, data);
@@ -368,6 +373,16 @@ static uint32_t
aspeed_2500_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data)
static void aspeed_2500_sdmc_write(AspeedSDMCState *s, uint32_t reg,
uint32_t data)
{
+ if (reg == R_PROT) {
+ s->regs[reg] = (data == PROT_KEY_UNLOCK) ? PROT_UNLOCKED :
PROT_SOFTLOCKED;
+ return;
+ }
+
+ if (!s->regs[R_PROT]) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked!\n", __func__);
+ return;
+ }
+
switch (reg) {
case R_CONF:
data = aspeed_2500_sdmc_compute_conf(s, data);
@@ -424,7 +439,27 @@ static uint32_t
aspeed_2600_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data)
static void aspeed_2600_sdmc_write(AspeedSDMCState *s, uint32_t reg,
uint32_t data)
{
+ if (s->regs[R_PROT] == PROT_HARDLOCKED) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked until system
reset!\n",
+ __func__);
+ return;
+ }
+
+ if (reg != R_PROT && s->regs[R_PROT] == PROT_SOFTLOCKED) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked!\n", __func__);
+ return;
+ }
+
switch (reg) {
+ case R_PROT:
+ if (data == PROT_KEY_UNLOCK) {
+ data = PROT_UNLOCKED;
+ } else if (data == PROT_KEY_HARDLOCK) {
+ data = PROT_HARDLOCKED;
+ } else {
+ data = PROT_SOFTLOCKED;
+ }
+ break;
case R_CONF:
data = aspeed_2600_sdmc_compute_conf(s, data);
break;
--
2.20.1
- [PULL 00/34] target-arm queue, Peter Maydell, 2020/05/11
- [PULL 01/34] aspeed: Add boot stub for smp booting, Peter Maydell, 2020/05/11
- [PULL 02/34] target/arm: Drop access_el3_aa32ns_aa64any(), Peter Maydell, 2020/05/11
- [PULL 04/34] aspeed: sdmc: Implement AST2600 locking behaviour,
Peter Maydell <=
- [PULL 03/34] aspeed: Support AST2600A1 silicon revision, Peter Maydell, 2020/05/11
- [PULL 05/34] hw/arm/nrf51: Add NRF51_PERIPHERAL_SIZE definition, Peter Maydell, 2020/05/11
- [PULL 06/34] hw/timer/nrf51_timer: Display timer ID in trace events, Peter Maydell, 2020/05/11
- [PULL 08/34] exec: Add block comments for watchpoint routines, Peter Maydell, 2020/05/11
- [PULL 09/34] exec: Fix cpu_watchpoint_address_matches address length, Peter Maydell, 2020/05/11
- [PULL 10/34] accel/tcg: Add block comment for probe_access, Peter Maydell, 2020/05/11
- [PULL 11/34] accel/tcg: Adjust probe_access call to page_check_range, Peter Maydell, 2020/05/11
- [PULL 07/34] hw/timer/nrf51_timer: Add trace event of counter value update, Peter Maydell, 2020/05/11
- [PULL 13/34] accel/tcg: Add endian-specific cpu_{ld, st}* operations, Peter Maydell, 2020/05/11
- [PULL 15/34] target/arm: Drop manual handling of set/clear_helper_retaddr, Peter Maydell, 2020/05/11