openrisc: Add full instruction cache invalidate functions

Add functions to invalidate all cache lines which we will use for
static_key patching.

On OpenRISC there is no instruction to invalidate an entire cache so we
loop and invalidate cache lines one by one.  This is not extremely
expensive on OpenRISC as we usually have only a few hundred cache lines.

I considered using the invalidate cache page or range functions.
However, tracking which ranges need invalidation would have been more
expensive than flushing all pages.

Cc: stable@vger.kernel.org
Signed-off-by: Stafford Horne <shorne@gmail.com>

diff --git a/arch/openrisc/include/asm/cacheflush.h b/arch/openrisc/include/asm/cacheflush.h
index cd8f971c0feccd05f9fee548fef25d118c7a4bdb..7b8c043a831df4976064a6d5328c8c9face7a938 100644 (file)
--- a/arch/openrisc/include/asm/cacheflush.h
+++ b/arch/openrisc/include/asm/cacheflush.h
@@ -26,6 +26,7 @@ extern void local_icache_page_inv(struct page *page);
 extern void local_dcache_range_flush(unsigned long start, unsigned long end);
 extern void local_dcache_range_inv(unsigned long start, unsigned long end);
 extern void local_icache_range_inv(unsigned long start, unsigned long end);
+extern void local_icache_all_inv(void);
 
 /*
  * Data cache flushing always happen on the local cpu. Instruction cache
@@ -35,10 +36,13 @@ extern void local_icache_range_inv(unsigned long start, unsigned long end);
 #ifndef CONFIG_SMP
 #define dcache_page_flush(page)      local_dcache_page_flush(page)
 #define icache_page_inv(page)        local_icache_page_inv(page)
+#define icache_all_inv()             local_icache_all_inv()
 #else  /* CONFIG_SMP */
 #define dcache_page_flush(page)      local_dcache_page_flush(page)
 #define icache_page_inv(page)        smp_icache_page_inv(page)
+#define icache_all_inv()             smp_icache_all_inv()
 extern void smp_icache_page_inv(struct page *page);
+extern void smp_icache_all_inv(void);
 #endif /* CONFIG_SMP */
 
 /*

diff --git a/arch/openrisc/kernel/smp.c b/arch/openrisc/kernel/smp.c
index 040ca201b69272ab4fa1d0e7987ba1a59e31ec71..65599252f3d41a73aaf103e006cc47955d2351fa 100644 (file)
--- a/arch/openrisc/kernel/smp.c
+++ b/arch/openrisc/kernel/smp.c
@@ -346,3 +346,24 @@ void smp_icache_page_inv(struct page *page)
        on_each_cpu(ipi_icache_page_inv, page, 1);
 }
 EXPORT_SYMBOL(smp_icache_page_inv);
+
+static void ipi_icache_all_inv(void *arg)
+{
+       local_icache_all_inv();
+}
+
+void smp_icache_all_inv(void)
+{
+       if (num_online_cpus() < 2) {
+               local_icache_all_inv();
+               return;
+       }
+
+       /*
+        * Ensure stores complete before we request remote icaches
+        * to invalidate.
+        */
+       mb();
+
+       on_each_cpu(ipi_icache_all_inv, NULL, 1);
+}

diff --git a/arch/openrisc/mm/cache.c b/arch/openrisc/mm/cache.c
index f33df46dae4e532f83f559c9fa58cd2e82c3fc5d..2667d90691b5964cf84cbb4b9a4ab97376d45d62 100644 (file)
--- a/arch/openrisc/mm/cache.c
+++ b/arch/openrisc/mm/cache.c
@@ -63,6 +63,22 @@ void local_icache_page_inv(struct page *page)
 }
 EXPORT_SYMBOL(local_icache_page_inv);
 
+void local_icache_all_inv(void)
+{
+       if (cpu_cache_is_present(SPR_UPR_ICP)) {
+               unsigned long iccfgr = mfspr(SPR_ICCFGR);
+               unsigned long sets = 1 << ((iccfgr & SPR_ICCFGR_NCS) >> 3);
+               unsigned long block_size = 16 << ((iccfgr & SPR_ICCFGR_CBS) >> 7);
+               unsigned long paddr = 0;
+               unsigned long end = sets * block_size;
+
+               while (paddr < end) {
+                       mtspr(SPR_ICBIR, paddr);
+                       paddr += block_size;
+               }
+       }
+}
+
 void local_dcache_range_flush(unsigned long start, unsigned long end)
 {
        cache_loop(start, end, SPR_DCBFR, SPR_UPR_DCP);