Skip to contentSkip to conversation

target-arm: fix mmu access protection emulation

PATCH In review Juha Riihimäki 2 participants 5 messages Dec 8, 2010 – Dec 27, 2010

lore
Share & tools
lore
#0 lore raw

cover target-arm: fix mmu access protection emulation

The ARM VMSAv6 emulation does not correctly ignore access protection checks for manager domain translation table descriptors. This causes ARM Linux kernel to hang during initialization for ARMv7 CPUs. However that has so far been hidden by another emulation bug where the cp15 c1 system control register has an invalid reset value for the emulated ARMv6 and ARMv7 processors indicating an earlier processor revision instead and thus making QEMU run the MMU emulation in ARMv5 mode.

This patch series fixes the access protection emulation in the ARM MMU emulation (1) and introduces correct cp15 c1 system control register values for the ARM1136, Cortex-A8 and Cortex-A9 cores (2,3).

Juha Riihimäki (2):
target-arm: fix vmsav6 access control
target-arm: correct cp15 c1_sys reset value for arm1136 and cortex-a9

Mattias Holm (1):
target-arm: correct cp15 c1_sys reset value for cortex-a8

 target-arm/helper.c |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)
Signature · 1 line
1.7.3.1
#1 lore raw

PATCH 1/3 target-arm: fix vmsav6 access control

Override access control checks (including execute) for mmu translation table descriptors assigned to manager domains.

---
 target-arm/helper.c |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)
target-arm/helper.c +19 -15
index 996d40d..5bcfcf7 100644
@@ -1078,22 +1078,26 @@ static int get_phys_addr_v6(CPUState *env, uint32_t address, int access_type,
         }
         code = 15;
     }
-    if (xn && access_type == 2)
-        goto do_fault;
+    if (domain == 3) {
+        *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
+    } else {
+        if (xn && access_type == 2)
+            goto do_fault;
 
-    /* The simplified model uses AP[0] as an access control bit.  */
-    if ((env->cp15.c1_sys & (1 << 29)) && (ap & 1) == 0) {
-        /* Access flag fault.  */
-        code = (code == 15) ? 6 : 3;
-        goto do_fault;
-    }
-    *prot = check_ap(env, ap, domain, access_type, is_user);
-    if (!*prot) {
-        /* Access permission fault.  */
-        goto do_fault;
-    }
-    if (!xn) {
-        *prot |= PAGE_EXEC;
+        /* The simplified model uses AP[0] as an access control bit.  */
+        if ((env->cp15.c1_sys & (1 << 29)) && (ap & 1) == 0) {
+            /* Access flag fault.  */
+            code = (code == 15) ? 6 : 3;
+            goto do_fault;
+        }
+        *prot = check_ap(env, ap, domain, access_type, is_user);
+        if (!*prot) {
+            /* Access permission fault.  */
+            goto do_fault;
+        }
+        if (!xn) {
+            *prot |= PAGE_EXEC;
+        }
     }
     *phys_ptr = phys_addr;
     return 0;
Signature · 1 line
1.7.3.1
#2 lore raw

PATCH 2/3 target-arm: correct cp15 c1_sys reset value for cortex-a8

In reply to Juha Riihimäki

From: Mattias Holm <[email protected]>

---
 target-arm/helper.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
target-arm/helper.c +1 -0
index 5bcfcf7..7cd6a4e 100644
@@ -109,6 +109,7 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
         env->cp15.c0_ccsid[0] = 0xe007e01a; /* 16k L1 dcache. */
         env->cp15.c0_ccsid[1] = 0x2007e01a; /* 16k L1 icache. */
         env->cp15.c0_ccsid[2] = 0xf0000000; /* No L2 icache. */
+        env->cp15.c1_sys = 0x00c50078;
         break;
     case ARM_CPUID_CORTEXA9:
         set_feature(env, ARM_FEATURE_V6);
Signature · 1 line
1.7.3.1
#3 lore raw

PATCH 3/3 target-arm: correct cp15 c1_sys reset value for arm1136 and cortex-a9

In reply to Juha Riihimäki
---
 target-arm/helper.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
target-arm/helper.c +2 -0
index 7cd6a4e..1522022 100644
@@ -76,6 +76,7 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
         memcpy(env->cp15.c0_c1, arm1136_cp15_c0_c1, 8 * sizeof(uint32_t));
         memcpy(env->cp15.c0_c2, arm1136_cp15_c0_c2, 8 * sizeof(uint32_t));
         env->cp15.c0_cachetype = 0x1dd20d2;
+        env->cp15.c1_sys = 0x00050078;
         break;
     case ARM_CPUID_ARM11MPCORE:
         set_feature(env, ARM_FEATURE_V6);
@@ -131,6 +132,7 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
         env->cp15.c0_clid = (1 << 27) | (1 << 24) | 3;
         env->cp15.c0_ccsid[0] = 0xe00fe015; /* 16k L1 dcache. */
         env->cp15.c0_ccsid[1] = 0x200fe015; /* 16k L1 icache. */
+        env->cp15.c1_sys = 0x00c50078;
         break;
     case ARM_CPUID_CORTEXM3:
         set_feature(env, ARM_FEATURE_V6);
Signature · 1 line
1.7.3.1
#4 lore raw
In reply to Juha Riihimäki
Quoted 17 lines · Juha Riihimäki

The ARM VMSAv6 emulation does not correctly ignore access protection checks for manager domain translation table descriptors. This causes ARM Linux kernel to hang during initialization for ARMv7 CPUs. However that has so far been hidden by another emulation bug where the cp15 c1 system control register has an invalid reset value for the emulated ARMv6 and ARMv7 processors indicating an earlier processor revision instead and thus making QEMU run the MMU emulation in ARMv5 mode.

This patch series fixes the access protection emulation in the ARM MMU emulation (1) and introduces correct cp15 c1 system control register values for the ARM1136, Cortex-A8 and Cortex-A9 cores (2,3).

Juha Riihimäki (2):
target-arm: fix vmsav6 access control
target-arm: correct cp15 c1_sys reset value for arm1136 and cortex-a9

Quoted 6 lines

Mattias Holm (1):
target-arm: correct cp15 c1_sys reset value for cortex-a8

 target-arm/helper.c |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

Thanks, all applied.

Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net