1 files changed, 29 insertions, 5 deletions

diff --git a/litmus/lockdown.c b/litmus/lockdown.c
index 8e10bc66b86..a718ffc9c9b 100644
--- a/litmus/lockdown.c
+++ b/litmus/lockdown.c
@@ -79,6 +79,7 @@ void litmus_setup_lockdown(void __iomem *base, u32 id)
 extern void v7_flush_kern_dcache_area(void *, size_t);
 
 static void __iomem *cache_base;
+
 static void __iomem *lockreg_d;
 static void __iomem *lockreg_i;
 static raw_spinlock_t prefetch_lock;
@@ -115,7 +116,11 @@ u32 color_read_in_mem(u32 lock_val, u32 unlock_val, void *start, void *end)
         : [addr] "+r" (start),
           [val] "+r" (v)
         : [end] "r" (end),
+#ifdef CONFIG_CACHE_PL310
+          [cachereg] "r" (ld_d_reg(raw_smp_processor_id())),
+#else
           [cachereg] "r" (lockreg_d),
+#endif
           [lockval] "r" (lock_val)
         : "cc");
 
@@ -139,7 +144,10 @@ u32 color_read_in_mem_lock(u32 lock_val, u32 unlock_val, void *start, void *end)
         unsigned long flags;
         u32 v = 0;
 
+#ifndef CONFIG_CACHE_PL310
         raw_spin_lock_irqsave(&prefetch_lock, flags);
+#endif
+
         __asm__ __volatile__ (
 "       .align 5\n"
 "       str     %[lockval], [%[cachereg]]\n"
@@ -150,11 +158,18 @@ u32 color_read_in_mem_lock(u32 lock_val, u32 unlock_val, void *start, void *end)
         : [addr] "+r" (start),
           [val] "+r" (v)
         : [end] "r" (end),
+#ifdef CONFIG_CACHE_PL310
+          [cachereg] "r" (ld_d_reg(raw_smp_processor_id())),
+#else
           [cachereg] "r" (lockreg_d),
+#endif
           [lockval] "r" (lock_val),
           [unlockval] "r" (unlock_val)
         : "cc");
+
+#ifndef CONFIG_CACHE_PL310
         raw_spin_unlock_irqrestore(&prefetch_lock, flags);
+#endif
 
         return v;
 }
@@ -334,9 +349,16 @@ int litmus_lockdown_proc_handler(struct ctl_table *table, int write,
 
 #define TRIALS 1000
 
+static void sleep_ns(int ns)
+{
+        int i;
+        lt_t start = litmus_clock();
+        for (i = 0; litmus_clock() - start < ns;i++);
+}
+
 static int test_get_cycles_overhead(void)
 {
-        u64 sum = 0, min = (u64)-1, max = 0;
+        u64 avg = 0, min = (u64)-1, max = 0;
         unsigned long flags;
         cycles_t a, b;
         int i;
@@ -346,6 +368,7 @@ static int test_get_cycles_overhead(void)
                 local_irq_save(flags);
                 preempt_disable();
                 a = litmus_get_cycles();
+                sleep_ns(15000);
                 b = litmus_get_cycles();
                 preempt_enable();
                 local_irq_restore(flags);
@@ -354,10 +377,11 @@ static int test_get_cycles_overhead(void)
                         max = diff;
                 if (diff < min)
                         min = diff;
-                sum += diff;
+                avg += div64_u64(diff, TRIALS);
         }
-        printk("cycle test: avg: %llu  min: %llu  max: %llu\n",
-                        div64_u64(sum, TRIALS), min, max);
+        printk("cycle test 15us: avg: %llu  min: %llu  max: %llu\n",
+               avg, min, max);
+
         return 0;
 }
 
@@ -665,7 +689,7 @@ int litmus_test_prefetch_proc_handler(struct ctl_table *table, int write,
 
         free_page((unsigned long)vaddr);
 
-        //test_get_cycles_overhead();
+        test_get_cycles_overhead();
         test_read_in();
 
         return 0;