Changeset 97718a5 in mainline

Timestamp:

2013-01-10T22:33:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b9f72b97

Parents:

7dc8bf1

Message:

arm32, fpu: Switch to new coprocessor macros.

Disable code accessing secure register.

File:

• kernel/arch/arm32/src/fpu_context.c (modified) (4 diffs)

kernel/arch/arm32/src/fpu_context.c

@@ -59 +59 @@
         FPEXC_EX_FLAG = (1 << 31),
         FPEXC_ENABLED_FLAG = (1 << 30),
-};
-
-/* See Architecture reference manual ch. B4.1.40 */
-enum {
-        CPACR_CP10_MASK = 0x3 << 20,
-        CPACR_CP11_MASK = 0x3 << 22,
-        CPACR_CP10_USER_ACCESS = CPACR_CP10_MASK,
-        CPACR_CP11_USER_ACCESS = CPACR_CP11_MASK,
-        NSACR_CP10_FLAG = 1 << 10,
-        NSACR_CP11_FLAG = 1 << 11,
 };
 
@@ -131 +121 @@
         return 1;
 #endif
-        uint32_t cpacr;
-        asm volatile ("MRC p15, 0, %0, c1, c0, 2" :"=r" (cpacr)::);
+        const uint32_t cpacr = CPACR_read();
         /* FPU needs access to coprocessor 10 and 11.
          * Moreover they need to have same access enabledd */
-        if (((cpacr & CPACR_CP10_MASK) == CPACR_CP10_USER_ACCESS) &&
-           ((cpacr & CPACR_CP11_MASK) == CPACR_CP11_USER_ACCESS))
+        if (((cpacr & CPACR_CP_MASK(10)) == CPACR_CP_FULL_ACCESS(10)) &&
+           ((cpacr & CPACR_CP_MASK(11)) == CPACR_CP_FULL_ACCESS(11)))
                 return 1;
         printf("No sccess to CP10 and CP11: %" PRIx32 "\n", cpacr);
@@ -161 +150 @@
         return;
 #endif
+#if 0
         uint32_t cpr;
         asm volatile("MRC p15, 0, %0, c1, c1, 0" : "=r" (cpr)::);
@@ -177 +167 @@
         asm volatile ("isb" ::: "memory" );
 #endif
-
+#endif
         /* Allow coprocessor access */
-        uint32_t cpacr;
-        asm volatile ("mrc p15, 0, %0, c1, c0, 2" :"=r" (cpacr)::);
+        uint32_t cpacr = CPACR_read();
         printf("CPACR before: %x\n", cpacr);
         /* FPU needs access to coprocessor 10 and 11.
          * Moreover, they need to have same access enabled */
-        cpacr |= CPACR_CP10_USER_ACCESS;
-        cpacr |= CPACR_CP11_USER_ACCESS;
-        asm volatile ("mcr p15, 0, %0, c1, c0, 2" :"=r" (cpacr)::);
+        cpacr &= ~(CPACR_CP_MASK(10) | CPACR_CP_MASK(11));
+        cpacr |= CPACR_CP_FULL_ACCESS(10) | CPACR_CP_FULL_ACCESS(11);
+        CPACR_write(cpacr);
         printf("CPACR after: %x\n", cpacr);
 
-#ifdef MACHINE_beagleboardxm
-        asm volatile ("isb" ::: "memory" );
-#endif
+        smc_coherence(0);
 }