ARM: 7573/1: idmap: use flush_cache_louis() and flush TLBs only when necessary

Flushing the cache is needed for the hardware to see the idmap table
and therefore can be done at init time.  On ARMv7 it is not necessary to
flush L2 so flush_cache_louis() is used here instead.

There is no point flushing the cache in setup_mm_for_reboot() as the
caller should, and already is, taking care of this.  If switching the
memory map requires a cache flush, then cpu_switch_mm() already includes
that operation.

What is not done by cpu_switch_mm() on ASID capable CPUs is TLB flushing
as the whole point of the ASID is to tag the TLBs and avoid flushing them
on a context switch.  Since we don't have a clean ASID for the identity
mapping, we need to flush the TLB explicitly in that case.  Otherwise
this is already performed by cpu_switch_mm().

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mm/idmap.c b/arch/arm/mm/idmap.c
index ab88ed4f8e08f0232b88f0138991ab96f5fc5544..99db769307ec30ccb0e182d6a97ff66a985a2fc7 100644 (file)
--- a/arch/arm/mm/idmap.c
+++ b/arch/arm/mm/idmap.c
@@ -92,6 +92,9 @@ static int __init init_static_idmap(void)
                (long long)idmap_start, (long long)idmap_end);
        identity_mapping_add(idmap_pgd, idmap_start, idmap_end);
 
+       /* Flush L1 for the hardware to see this page table content */
+       flush_cache_louis();
+
        return 0;
 }
 early_initcall(init_static_idmap);
@@ -103,12 +106,15 @@ early_initcall(init_static_idmap);
  */
 void setup_mm_for_reboot(void)
 {
-       /* Clean and invalidate L1. */
-       flush_cache_all();
-
        /* Switch to the identity mapping. */
        cpu_switch_mm(idmap_pgd, &init_mm);
 
-       /* Flush the TLB. */
+#ifdef CONFIG_CPU_HAS_ASID
+       /*
+        * We don't have a clean ASID for the identity mapping, which
+        * may clash with virtual addresses of the previous page tables
+        * and therefore potentially in the TLB.
+        */
        local_flush_tlb_all();
+#endif
 }