Changeset 69146b93 in mainline for kernel/arch/arm32/src/exception.c

Timestamp:

2012-11-26T19:02:45Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

04552324

Parents:

5d230a30 (diff), 7462674 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged mainline,1723.

File:

• kernel/arch/arm32/src/exception.c (modified) (3 diffs)

kernel/arch/arm32/src/exception.c

@@ -117 +117 @@
 
 #ifdef HIGH_EXCEPTION_VECTORS
-/** Activates use of high exception vectors addresses. */
+/** Activates use of high exception vectors addresses.
+ *
+ * "High vectors were introduced into some implementations of ARMv4 and are
+ * required in ARMv6 implementations. High vectors allow the exception vector
+ * locations to be moved from their normal address range 0x00000000-0x0000001C
+ * at the bottom of the 32-bit address space, to an alternative address range
+ * 0xFFFF0000-0xFFFF001C near the top of the address space. These alternative
+ * locations are known as the high vectors.
+ *
+ * Prior to ARMv6, it is IMPLEMENTATION DEFINED whether the high vectors are
+ * supported. When they are, a hardware configuration input selects whether
+ * the normal vectors or the high vectors are to be used from
+ * reset." ARM Architecture Reference Manual A2.6.11 (p. 64 in the PDF).
+ *
+ * ARM920T (gta02) TRM A2.3.5 (PDF p. 36) and ARM926EJ-S (icp) 2.3.2 (PDF p. 42)
+ * say that armv4 an armv5 chips that we support implement this.
+ */
 static void high_vectors(void)
 {
-        uint32_t control_reg;
-        
+        uint32_t control_reg = 0;
         asm volatile (
                 "mrc p15, 0, %[control_reg], c1, c0"
@@ -128 +143 @@
         
         /* switch on the high vectors bit */
-        control_reg |= CP15_R1_HIGH_VECTORS_BIT;
+        control_reg |= CP15_R1_HIGH_VECTORS_EN;
         
         asm volatile (
@@ -153 +168 @@
 void exception_init(void)
 {
+        // TODO check for availability of high vectors for <= armv5
 #ifdef HIGH_EXCEPTION_VECTORS
         high_vectors();