Changeset 2b95d13 in mainline for kernel/arch/arm32/include/arch/cycle.h

Timestamp:

2013-03-12T21:07:15Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (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:

Merge mainline changes.

File:

• kernel/arch/arm32/include/arch/cycle.h (moved) (moved from kernel/arch/arm32/include/cycle.h ) (2 diffs)

kernel/arch/arm32/include/arch/cycle.h

@@ -38 +38 @@
 
 #include <trace.h>
+#include <arch/cp15.h>
 
 /** Return count of CPU cycles.
@@ -48 +49 @@
 NO_TRACE static inline uint64_t get_cycle(void)
 {
+#ifdef PROCESSOR_ARCH_armv7_a
+        if ((ID_PFR1_read() & ID_PFR1_GEN_TIMER_EXT_MASK) ==
+            ID_PFR1_GEN_TIMER_EXT) {
+            uint32_t low = 0, high = 0;
+            asm volatile( "MRRC p15, 0, %[low], %[high], c14": [low]"=r"(low), [high]"=r"(high));
+           return ((uint64_t)high << 32) | low;
+        } else {
+                return (uint64_t)PMCCNTR_read() * 64;
+        }
+#endif
         return 0;
 }