diff options
Diffstat (limited to 'drivers/gator/gator_events_armv7.c')
-rw-r--r-- | drivers/gator/gator_events_armv7.c | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/drivers/gator/gator_events_armv7.c b/drivers/gator/gator_events_armv7.c index bd8a9ba24e99..09c94220114c 100644 --- a/drivers/gator/gator_events_armv7.c +++ b/drivers/gator/gator_events_armv7.c @@ -15,16 +15,16 @@ #include "gator.h" -// gator_events_perf_pmu.c is used if perf is supported +/* gator_events_perf_pmu.c is used if perf is supported */ #if GATOR_NO_PERF_SUPPORT -// Per-CPU PMNC: config reg +/* Per-CPU PMNC: config reg */ #define PMNC_E (1 << 0) /* Enable all counters */ #define PMNC_P (1 << 1) /* Reset all counters */ #define PMNC_C (1 << 2) /* Cycle counter reset */ #define PMNC_MASK 0x3f /* Mask for writable bits */ -// ccnt reg +/* ccnt reg */ #define CCNT_REG (1 << 31) #define CCNT 0 @@ -49,6 +49,7 @@ inline void armv7_pmnc_write(u32 val) inline u32 armv7_pmnc_read(void) { u32 val; + asm volatile("mrc p15, 0, %0, c9, c12, 0" : "=r" (val)); return val; } @@ -61,10 +62,10 @@ inline u32 armv7_ccnt_read(u32 reset_value) u32 val; local_irq_save(flags); - asm volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (den)); // disable - asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (val)); // read - asm volatile("mcr p15, 0, %0, c9, c13, 0" : : "r" (newval)); // new value - asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (den)); // enable + asm volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (den)); /* disable */ + asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (val)); /* read */ + asm volatile("mcr p15, 0, %0, c9, c13, 0" : : "r" (newval)); /* new value */ + asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (den)); /* enable */ local_irq_restore(flags); return val; @@ -79,11 +80,11 @@ inline u32 armv7_cntn_read(unsigned int cnt, u32 reset_value) u32 oldval; local_irq_save(flags); - asm volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (den)); // disable - asm volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (sel)); // select - asm volatile("mrc p15, 0, %0, c9, c13, 2" : "=r" (oldval)); // read - asm volatile("mcr p15, 0, %0, c9, c13, 2" : : "r" (newval)); // new value - asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (den)); // enable + asm volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (den)); /* disable */ + asm volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (sel)); /* select */ + asm volatile("mrc p15, 0, %0, c9, c13, 2" : "=r" (oldval)); /* read */ + asm volatile("mcr p15, 0, %0, c9, c13, 2" : : "r" (newval)); /* new value */ + asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (den)); /* enable */ local_irq_restore(flags); return oldval; @@ -92,13 +93,15 @@ inline u32 armv7_cntn_read(unsigned int cnt, u32 reset_value) static inline void armv7_pmnc_disable_interrupt(unsigned int cnt) { u32 val = cnt ? (1 << (cnt - CNT0)) : (1 << 31); + asm volatile("mcr p15, 0, %0, c9, c14, 2" : : "r" (val)); } inline u32 armv7_pmnc_reset_interrupt(void) { - // Get and reset overflow status flags + /* Get and reset overflow status flags */ u32 flags; + asm volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (flags)); flags &= 0x8000003f; asm volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (flags)); @@ -108,6 +111,7 @@ inline u32 armv7_pmnc_reset_interrupt(void) static inline u32 armv7_pmnc_enable_counter(unsigned int cnt) { u32 val = cnt ? (1 << (cnt - CNT0)) : CCNT_REG; + asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (val)); return cnt; } @@ -115,6 +119,7 @@ static inline u32 armv7_pmnc_enable_counter(unsigned int cnt) static inline u32 armv7_pmnc_disable_counter(unsigned int cnt) { u32 val = cnt ? (1 << (cnt - CNT0)) : CCNT_REG; + asm volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (val)); return cnt; } @@ -122,15 +127,15 @@ static inline u32 armv7_pmnc_disable_counter(unsigned int cnt) static inline int armv7_pmnc_select_counter(unsigned int cnt) { u32 val = (cnt - CNT0); + asm volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (val)); return cnt; } static inline void armv7_pmnc_write_evtsel(unsigned int cnt, u32 val) { - if (armv7_pmnc_select_counter(cnt) == cnt) { + if (armv7_pmnc_select_counter(cnt) == cnt) asm volatile("mcr p15, 0, %0, c9, c13, 1" : : "r" (val)); - } } static int gator_events_armv7_create_files(struct super_block *sb, struct dentry *root) @@ -140,20 +145,18 @@ static int gator_events_armv7_create_files(struct super_block *sb, struct dentry for (i = 0; i < pmnc_counters; i++) { char buf[40]; - if (i == 0) { - snprintf(buf, sizeof buf, "%s_ccnt", pmnc_name); - } else { - snprintf(buf, sizeof buf, "%s_cnt%d", pmnc_name, i - 1); - } + + if (i == 0) + snprintf(buf, sizeof(buf), "%s_ccnt", pmnc_name); + else + snprintf(buf, sizeof(buf), "%s_cnt%d", pmnc_name, i - 1); dir = gatorfs_mkdir(sb, root, buf); - if (!dir) { + if (!dir) return -1; - } gatorfs_create_ulong(sb, dir, "enabled", &pmnc_enabled[i]); gatorfs_create_ro_ulong(sb, dir, "key", &pmnc_key[i]); - if (i > 0) { + if (i > 0) gatorfs_create_ulong(sb, dir, "event", &pmnc_event[i]); - } } return 0; @@ -163,14 +166,13 @@ static int gator_events_armv7_online(int **buffer, bool migrate) { unsigned int cnt, len = 0, cpu = smp_processor_id(); - if (armv7_pmnc_read() & PMNC_E) { + if (armv7_pmnc_read() & PMNC_E) armv7_pmnc_write(armv7_pmnc_read() & ~PMNC_E); - } - // Initialize & Reset PMNC: C bit and P bit + /* Initialize & Reset PMNC: C bit and P bit */ armv7_pmnc_write(PMNC_P | PMNC_C); - // Reset overflow flags + /* Reset overflow flags */ armv7_pmnc_reset_interrupt(); for (cnt = CCNT; cnt < CNTMAX; cnt++) { @@ -179,28 +181,28 @@ static int gator_events_armv7_online(int **buffer, bool migrate) if (!pmnc_enabled[cnt]) continue; - // Disable counter + /* Disable counter */ armv7_pmnc_disable_counter(cnt); event = pmnc_event[cnt] & 255; - // Set event (if destined for PMNx counters), we don't need to set the event if it's a cycle count + /* Set event (if destined for PMNx counters), we don't need to set the event if it's a cycle count */ if (cnt != CCNT) armv7_pmnc_write_evtsel(cnt, event); armv7_pmnc_disable_interrupt(cnt); - // Reset counter + /* Reset counter */ cnt ? armv7_cntn_read(cnt, 0) : armv7_ccnt_read(0); - // Enable counter + /* Enable counter */ armv7_pmnc_enable_counter(cnt); } - // enable + /* enable */ armv7_pmnc_write(armv7_pmnc_read() | PMNC_E); - // return zero values, no need to read as the counters were just reset + /* return zero values, no need to read as the counters were just reset */ for (cnt = 0; cnt < pmnc_counters; cnt++) { if (pmnc_enabled[cnt]) { per_cpu(perfCnt, cpu)[len++] = pmnc_key[cnt]; @@ -216,7 +218,7 @@ static int gator_events_armv7_online(int **buffer, bool migrate) static int gator_events_armv7_offline(int **buffer, bool migrate) { - // disable all counters, including PMCCNTR; overflow IRQs will not be signaled + /* disable all counters, including PMCCNTR; overflow IRQs will not be signaled */ armv7_pmnc_write(armv7_pmnc_read() & ~PMNC_E); return 0; @@ -232,24 +234,23 @@ static void gator_events_armv7_stop(void) } } -static int gator_events_armv7_read(int **buffer) +static int gator_events_armv7_read(int **buffer, bool sched_switch) { int cnt, len = 0; int cpu = smp_processor_id(); - // a context switch may occur before the online hotplug event, thus need to check that the pmu is enabled - if (!(armv7_pmnc_read() & PMNC_E)) { + /* a context switch may occur before the online hotplug event, thus need to check that the pmu is enabled */ + if (!(armv7_pmnc_read() & PMNC_E)) return 0; - } for (cnt = 0; cnt < pmnc_counters; cnt++) { if (pmnc_enabled[cnt]) { int value; - if (cnt == CCNT) { + + if (cnt == CCNT) value = armv7_ccnt_read(0); - } else { + else value = armv7_cntn_read(cnt, 0); - } per_cpu(perfCnt, cpu)[len++] = pmnc_key[cnt]; per_cpu(perfCnt, cpu)[len++] = value; } @@ -290,17 +291,16 @@ int gator_events_armv7_init(void) pmnc_name = "ARMv7_Cortex_A9"; pmnc_counters = 6; break; - // ARM Cortex A12 is not supported by version of Linux before 3.0 case CORTEX_A15: pmnc_name = "ARMv7_Cortex_A15"; pmnc_counters = 6; break; - // ARM Cortex A17 is not supported by version of Linux before 3.0 + /* ARM Cortex A17 is not supported by version of Linux before 3.0 */ default: return -1; } - pmnc_counters++; // CNT[n] + CCNT + pmnc_counters++; /* CNT[n] + CCNT */ for (cnt = CCNT; cnt < CNTMAX; cnt++) { pmnc_enabled[cnt] = 0; |