Merge branches 'pm-devfreq' and 'pm-cpufreq'

* pm-devfreq:
  PM / devfreq: fix double kfree
  PM / devfreq: Fix governor_store()

* pm-cpufreq:
  cpufreq: prevent lockup on reading scaling_available_frequencies
  cpufreq: acpi_cpufreq: prevent crash on reading freqdomain_cpus

1 files changed, 114 insertions, 63 deletions

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 66d0f49c5bec..8770e619185e 100644
--- 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
@@ -252,6 +253,119 @@ void __init fixrange_init(unsigned long start, unsigned long end,
 #endif
 }
 
+unsigned __weak platform_maar_init(unsigned num_pairs)
+{
+        struct maar_config cfg[BOOT_MEM_MAP_MAX];
+        unsigned i, num_configured, num_cfg = 0;
+        phys_addr_t skip;
+
+        for (i = 0; i < boot_mem_map.nr_map; i++) {
+                switch (boot_mem_map.map[i].type) {
+                case BOOT_MEM_RAM:
+                case BOOT_MEM_INIT_RAM:
+                        break;
+                default:
+                        continue;
+                }
+
+                skip = 0x10000 - (boot_mem_map.map[i].addr & 0xffff);
+
+                cfg[num_cfg].lower = boot_mem_map.map[i].addr;
+                cfg[num_cfg].lower += skip;
+
+                cfg[num_cfg].upper = cfg[num_cfg].lower;
+                cfg[num_cfg].upper += boot_mem_map.map[i].size - 1;
+                cfg[num_cfg].upper -= skip;
+
+                cfg[num_cfg].attrs = MIPS_MAAR_S;
+                num_cfg++;
+        }
+
+        num_configured = maar_config(cfg, num_cfg, num_pairs);
+        if (num_configured < num_cfg)
+                pr_warn("Not enough MAAR pairs (%u) for all bootmem regions (%u)\n",
+                        num_pairs, num_cfg);
+
+        return num_configured;
+}
+
+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;
+
+        /* Detect the number of MAARs */
+        write_c0_maari(~0);
+        back_to_back_c0_hazard();
+        num_maars = read_c0_maari() + 1;
+
+        /* MAARs should be in pairs */
+        WARN_ON(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++) {
+                write_c0_maari(i);
+                back_to_back_c0_hazard();
+                write_c0_maar(0);
+                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);
+                back_to_back_c0_hazard();
+                upper = read_c0_maar();
+
+                write_c0_maari(i + 1);
+                back_to_back_c0_hazard();
+                lower = read_c0_maar();
+
+                attr = lower & upper;
+                lower = (lower & MIPS_MAAR_ADDR) << 4;
+                upper = ((upper & MIPS_MAAR_ADDR) << 4) | 0xffff;
+
+                pr_info("  [%d]: ", i / 2);
+                if (!(attr & MIPS_MAAR_V)) {
+                        pr_cont("disabled\n");
+                        continue;
+                }
+
+                pr_cont("%pa-%pa", &lower, &upper);
+
+                if (attr & MIPS_MAAR_S)
+                        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++;
+                }
+        }
+}
+
 #ifndef CONFIG_NEED_MULTIPLE_NODES
 int page_is_ram(unsigned long pagenr)
 {
@@ -334,69 +448,6 @@ static inline void mem_init_free_highmem(void)
 #endif
 }
 
-unsigned __weak platform_maar_init(unsigned num_pairs)
-{
-        struct maar_config cfg[BOOT_MEM_MAP_MAX];
-        unsigned i, num_configured, num_cfg = 0;
-        phys_addr_t skip;
-
-        for (i = 0; i < boot_mem_map.nr_map; i++) {
-                switch (boot_mem_map.map[i].type) {
-                case BOOT_MEM_RAM:
-                case BOOT_MEM_INIT_RAM:
-                        break;
-                default:
-                        continue;
-                }
-
-                skip = 0x10000 - (boot_mem_map.map[i].addr & 0xffff);
-
-                cfg[num_cfg].lower = boot_mem_map.map[i].addr;
-                cfg[num_cfg].lower += skip;
-
-                cfg[num_cfg].upper = cfg[num_cfg].lower;
-                cfg[num_cfg].upper += boot_mem_map.map[i].size - 1;
-                cfg[num_cfg].upper -= skip;
-
-                cfg[num_cfg].attrs = MIPS_MAAR_S;
-                num_cfg++;
-        }
-
-        num_configured = maar_config(cfg, num_cfg, num_pairs);
-        if (num_configured < num_cfg)
-                pr_warn("Not enough MAAR pairs (%u) for all bootmem regions (%u)\n",
-                        num_pairs, num_cfg);
-
-        return num_configured;
-}
-
-static void maar_init(void)
-{
-        unsigned num_maars, used, i;
-
-        if (!cpu_has_maar)
-                return;
-
-        /* Detect the number of MAARs */
-        write_c0_maari(~0);
-        back_to_back_c0_hazard();
-        num_maars = read_c0_maari() + 1;
-
-        /* MAARs should be in pairs */
-        WARN_ON(num_maars % 2);
-
-        /* Configure the required MAARs */
-        used = platform_maar_init(num_maars / 2);
-
-        /* Disable any further MAARs */
-        for (i = (used * 2); i < num_maars; i++) {
-                write_c0_maari(i);
-                back_to_back_c0_hazard();
-                write_c0_maar(0);
-                back_to_back_c0_hazard();
-        }
-}
-
 void __init mem_init(void)
 {
 #ifdef CONFIG_HIGHMEM