MIPS: Initialise MAARs on secondary CPUs

[linux-drm-fsl-dcu.git] / arch / mips / mm / init.c

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 023c164b9eb69f9b579cb71baae3a2d2646268ef..8770e619185eb034b317ce3de837c5185ba05511 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -44,6 +44,7 @@
 #include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/fixmap.h>
+#include <asm/maar.h>
 
 /*
  * We have up to 8 empty zeroed pages so we can map one of the right colour
@@ -288,10 +289,14 @@ unsigned __weak platform_maar_init(unsigned num_pairs)
        return num_configured;
 }
 
-static void maar_init(void)
+void maar_init(void)
 {
        unsigned num_maars, used, i;
        phys_addr_t lower, upper, attr;
+       static struct {
+               struct maar_config cfgs[3];
+               unsigned used;
+       } recorded = { { { 0 } }, 0 };
 
        if (!cpu_has_maar)
                return;
@@ -304,8 +309,14 @@ static void maar_init(void)
        /* MAARs should be in pairs */
        WARN_ON(num_maars % 2);
 
-       /* Configure the required MAARs */
-       used = platform_maar_init(num_maars / 2);
+       /* Set MAARs using values we recorded already */
+       if (recorded.used) {
+               used = maar_config(recorded.cfgs, recorded.used, num_maars / 2);
+               BUG_ON(used != recorded.used);
+       } else {
+               /* Configure the required MAARs */
+               used = platform_maar_init(num_maars / 2);
+       }
 
        /* Disable any further MAARs */
        for (i = (used * 2); i < num_maars; i++) {
@@ -315,6 +326,9 @@ static void maar_init(void)
                back_to_back_c0_hazard();
        }
 
+       if (recorded.used)
+               return;
+
        pr_info("MAAR configuration:\n");
        for (i = 0; i < num_maars; i += 2) {
                write_c0_maari(i);
@@ -341,6 +355,14 @@ static void maar_init(void)
                        pr_cont(" speculate");
 
                pr_cont("\n");
+
+               /* Record the setup for use on secondary CPUs */
+               if (used <= ARRAY_SIZE(recorded.cfgs)) {
+                       recorded.cfgs[recorded.used].lower = lower;
+                       recorded.cfgs[recorded.used].upper = upper;
+                       recorded.cfgs[recorded.used].attrs = attr;
+                       recorded.used++;
+               }
        }
 }