Changeset f65b8e0c in mainline

Timestamp:

2013-01-03T20:30:07Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2a8f38a

Parents:

2a77eaa2

Message:

arm32: Make cpu_sleep implementation depend on PROCESSOR macros.

Add note about voluntary CP15 implementation on older arms.
Enable coprocessor sleep on armv6.

File:

• kernel/arch/arm32/include/asm.h (modified) (1 diff)

kernel/arch/arm32/include/asm.h

@@ -50 +50 @@
  * ARM926EJ-S uses the same coprocessor instruction as ARM920T. See ARM926EJ-S
  * chapter 2.3.8 p.2-22 (52 in the PDF)
+ *
+ * @note Although mcr p15, 0, R0, c7, c0, 4 is defined in ARM Architecture
+ * reference manual for armv4/5 CP15 implementation is mandatory only for
+ * armv6+.
  */
 NO_TRACE static inline void cpu_sleep(void)
 {
 #ifdef PROCESSOR_ARCH_armv7_a
-        asm volatile ( "wfe" :: );
-#elif defined(MACHINE_gta02) | defined(MACHINE_integratorcp)
-        asm volatile ( "mcr p15,0,R0,c7,c0,4" :: );
+        asm volatile ( "wfe" );
+#elif defined(PROCESSOR_ARCH_armv6) | defined(PROCESSOR_arm926ej_s) | defined(PROCESSOR_arm920t)
+        asm volatile ( "mcr p15, 0, R0, c7, c0, 4" );
 #endif
 }