7 files changed, 49 insertions, 202 deletions

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 5859c8bc727c..2ee8a17d2b01 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -169,6 +169,11 @@ void __init arm_dt_init_cpu_maps(void)
         }
 }
 
+bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
+{
+        return (phys_id & MPIDR_HWID_BITMASK) == cpu_logical_map(cpu);
+}
+
 /**
  * setup_machine_fdt - Machine setup when an dtb was passed to the kernel
  * @dt_phys: physical address of dt blob
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index c5a59546a256..85a87370f144 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -74,12 +74,8 @@ struct cpu_efficiency table_efficiency[] = {
         {NULL, },
 };
 
-struct cpu_capacity {
-        unsigned long hwid;
-        unsigned long capacity;
-};
-
-struct cpu_capacity *cpu_capacity;
+unsigned long *__cpu_capacity;
+#define cpu_capacity(cpu)       __cpu_capacity[cpu]
 
 unsigned long middle_capacity = 1;
 
@@ -100,15 +96,19 @@ static void __init parse_dt_topology(void)
         unsigned long capacity = 0;
         int alloc_size, cpu = 0;
 
-        alloc_size = nr_cpu_ids * sizeof(struct cpu_capacity);
-        cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT);
+        alloc_size = nr_cpu_ids * sizeof(*__cpu_capacity);
+        __cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT);
 
-        while ((cn = of_find_node_by_type(cn, "cpu"))) {
-                const u32 *rate, *reg;
+        for_each_possible_cpu(cpu) {
+                const u32 *rate;
                 int len;
 
-                if (cpu >= num_possible_cpus())
-                        break;
+                /* too early to use cpu->of_node */
+                cn = of_get_cpu_node(cpu, NULL);
+                if (!cn) {
+                        pr_err("missing device node for CPU %d\n", cpu);
+                        continue;
+                }
 
                 for (cpu_eff = table_efficiency; cpu_eff->compatible; cpu_eff++)
                         if (of_device_is_compatible(cn, cpu_eff->compatible))
@@ -124,12 +124,6 @@ static void __init parse_dt_topology(void)
                         continue;
                 }
 
-                reg = of_get_property(cn, "reg", &len);
-                if (!reg || len != 4) {
-                        pr_err("%s missing reg property\n", cn->full_name);
-                        continue;
-                }
-
                 capacity = ((be32_to_cpup(rate)) >> 20) * cpu_eff->efficiency;
 
                 /* Save min capacity of the system */
@@ -140,13 +134,9 @@ static void __init parse_dt_topology(void)
                 if (capacity > max_capacity)
                         max_capacity = capacity;
 
-                cpu_capacity[cpu].capacity = capacity;
-                cpu_capacity[cpu++].hwid = be32_to_cpup(reg);
+                cpu_capacity(cpu) = capacity;
         }
 
-        if (cpu < num_possible_cpus())
-                cpu_capacity[cpu].hwid = (unsigned long)(-1);
-
         /* If min and max capacities are equals, we bypass the update of the
          * cpu_scale because all CPUs have the same capacity. Otherwise, we
          * compute a middle_capacity factor that will ensure that the capacity
@@ -154,9 +144,7 @@ static void __init parse_dt_topology(void)
          * SCHED_POWER_SCALE, which is the default value, but with the
          * constraint explained near table_efficiency[].
          */
-        if (min_capacity == max_capacity)
-                cpu_capacity[0].hwid = (unsigned long)(-1);
-        else if (4*max_capacity < (3*(max_capacity + min_capacity)))
+        if (4*max_capacity < (3*(max_capacity + min_capacity)))
                 middle_capacity = (min_capacity + max_capacity)
                                 >> (SCHED_POWER_SHIFT+1);
         else
@@ -170,23 +158,12 @@ static void __init parse_dt_topology(void)
  * boot. The update of all CPUs is in O(n^2) for heteregeneous system but the
  * function returns directly for SMP system.
  */
-void update_cpu_power(unsigned int cpu, unsigned long hwid)
+void update_cpu_power(unsigned int cpu)
 {
-        unsigned int idx = 0;
-
-        /* look for the cpu's hwid in the cpu capacity table */
-        for (idx = 0; idx < num_possible_cpus(); idx++) {
-                if (cpu_capacity[idx].hwid == hwid)
-                        break;
-
-                if (cpu_capacity[idx].hwid == -1)
-                        return;
-        }
-
-        if (idx == num_possible_cpus())
+        if (!cpu_capacity(cpu))
                 return;
 
-        set_power_scale(cpu, cpu_capacity[idx].capacity / middle_capacity);
+        set_power_scale(cpu, cpu_capacity(cpu) / middle_capacity);
 
         printk(KERN_INFO "CPU%u: update cpu_power %lu\n",
                 cpu, arch_scale_freq_power(NULL, cpu));
@@ -194,7 +171,7 @@ void update_cpu_power(unsigned int cpu, unsigned long hwid)
 
 #else
 static inline void parse_dt_topology(void) {}
-static inline void update_cpu_power(unsigned int cpuid, unsigned int mpidr) {}
+static inline void update_cpu_power(unsigned int cpuid) {}
 #endif
 
  /*
@@ -281,7 +258,7 @@ void store_cpu_topology(unsigned int cpuid)
 
         update_siblings_masks(cpuid);
 
-        update_cpu_power(cpuid, mpidr & MPIDR_HWID_BITMASK);
+        update_cpu_power(cpuid);
 
         printk(KERN_INFO "CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n",
                 cpuid, cpu_topology[cpuid].thread_id,
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index 36aef3a7dedb..f1ac1c94ac0f 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -65,7 +65,7 @@ static struct cpuidle_driver davinci_idle_driver = {
         .states[1]              = {
                 .enter                  = davinci_enter_idle,
                 .exit_latency           = 10,
-                .target_residency       = 100000,
+                .target_residency       = 10000,
                 .flags                  = CPUIDLE_FLAG_TIME_VALID,
                 .name                   = "DDR SR",
                 .desc                   = "WFI and DDR Self Refresh",
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 7be13f8e69a0..a02f275a198d 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -254,13 +254,12 @@ static void __init imx6q_opp_init(struct device *cpu_dev)
 {
         struct device_node *np;
 
-        np = of_find_node_by_path("/cpus/cpu@0");
+        np = of_node_get(cpu_dev->of_node);
         if (!np) {
                 pr_warn("failed to find cpu0 node\n");
                 return;
         }
 
-        cpu_dev->of_node = np;
         if (of_init_opp_table(cpu_dev)) {
                 pr_warn("failed to init OPP table\n");
                 goto put_node;
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index ce81d3031405..594b63db4215 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -29,45 +29,40 @@
 #include "pmsu.h"
 #include "coherency.h"
 
+static struct clk *__init get_cpu_clk(int cpu)
+{
+        struct clk *cpu_clk;
+        struct device_node *np = of_get_cpu_node(cpu, NULL);
+
+        if (WARN(!np, "missing cpu node\n"))
+                return NULL;
+        cpu_clk = of_clk_get(np, 0);
+        if (WARN_ON(IS_ERR(cpu_clk)))
+                return NULL;
+        return cpu_clk;
+}
+
 void __init set_secondary_cpus_clock(void)
 {
-        int thiscpu;
+        int thiscpu, cpu;
         unsigned long rate;
-        struct clk *cpu_clk = NULL;
-        struct device_node *np = NULL;
+        struct clk *cpu_clk;
 
         thiscpu = smp_processor_id();
-        for_each_node_by_type(np, "cpu") {
-                int err;
-                int cpu;
-
-                err = of_property_read_u32(np, "reg", &cpu);
-                if (WARN_ON(err))
-                        return;
-
-                if (cpu == thiscpu) {
-                        cpu_clk = of_clk_get(np, 0);
-                        break;
-                }
-        }
-        if (WARN_ON(IS_ERR(cpu_clk)))
+        cpu_clk = get_cpu_clk(thiscpu);
+        if (!cpu_clk)
                 return;
         clk_prepare_enable(cpu_clk);
         rate = clk_get_rate(cpu_clk);
 
         /* set all the other CPU clk to the same rate than the boot CPU */
-        for_each_node_by_type(np, "cpu") {
-                int err;
-                int cpu;
-
-                err = of_property_read_u32(np, "reg", &cpu);
-                if (WARN_ON(err))
+        for_each_possible_cpu(cpu) {
+                if (cpu == thiscpu)
+                        continue;
+                cpu_clk = get_cpu_clk(cpu);
+                if (!cpu_clk)
                         return;
-
-                if (cpu != thiscpu) {
-                        cpu_clk = of_clk_get(np, 0);
-                        clk_set_rate(cpu_clk, rate);
-                }
+                clk_set_rate(cpu_clk, rate);
         }
 }
 
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index bf9b6be5b180..fe1f3e26b88b 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -4,7 +4,6 @@
 
 obj-y                           := cpu.o devices.o devices-common.o \
                                    id.o usb.o timer.o pm.o
-obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
 obj-$(CONFIG_CACHE_L2X0)        += cache-l2x0.o
 obj-$(CONFIG_UX500_SOC_DB8500)  += cpu-db8500.o devices-db8500.o
 obj-$(CONFIG_MACH_MOP500)       += board-mop500.o board-mop500-sdi.o \
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
deleted file mode 100644
index a45dd09daed9..000000000000
--- a/arch/arm/mach-ux500/cpuidle.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2012 Linaro : Daniel Lezcano <daniel.lezcano@linaro.org> (IBM)
- *
- * Based on the work of Rickard Andersson <rickard.andersson@stericsson.com>
- * and Jonas Aaberg <jonas.aberg@stericsson.com>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/cpuidle.h>
-#include <linux/spinlock.h>
-#include <linux/atomic.h>
-#include <linux/smp.h>
-#include <linux/mfd/dbx500-prcmu.h>
-#include <linux/platform_data/arm-ux500-pm.h>
-
-#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
-
-#include "db8500-regs.h"
-#include "id.h"
-
-static atomic_t master = ATOMIC_INIT(0);
-static DEFINE_SPINLOCK(master_lock);
-
-static inline int ux500_enter_idle(struct cpuidle_device *dev,
-                                   struct cpuidle_driver *drv, int index)
-{
-        int this_cpu = smp_processor_id();
-        bool recouple = false;
-
-        if (atomic_inc_return(&master) == num_online_cpus()) {
-
-                /* With this lock, we prevent the other cpu to exit and enter
-                 * this function again and become the master */
-                if (!spin_trylock(&master_lock))
-                        goto wfi;
-
-                /* decouple the gic from the A9 cores */
-                if (prcmu_gic_decouple()) {
-                        spin_unlock(&master_lock);
-                        goto out;
-                }
-
-                /* If an error occur, we will have to recouple the gic
-                 * manually */
-                recouple = true;
-
-                /* At this state, as the gic is decoupled, if the other
-                 * cpu is in WFI, we have the guarantee it won't be wake
-                 * up, so we can safely go to retention */
-                if (!prcmu_is_cpu_in_wfi(this_cpu ? 0 : 1))
-                        goto out;
-
-                /* The prcmu will be in charge of watching the interrupts
-                 * and wake up the cpus */
-                if (prcmu_copy_gic_settings())
-                        goto out;
-
-                /* Check in the meantime an interrupt did
-                 * not occur on the gic ... */
-                if (prcmu_gic_pending_irq())
-                        goto out;
-
-                /* ... and the prcmu */
-                if (prcmu_pending_irq())
-                        goto out;
-
-                /* Go to the retention state, the prcmu will wait for the
-                 * cpu to go WFI and this is what happens after exiting this
-                 * 'master' critical section */
-                if (prcmu_set_power_state(PRCMU_AP_IDLE, true, true))
-                        goto out;
-
-                /* When we switch to retention, the prcmu is in charge
-                 * of recoupling the gic automatically */
-                recouple = false;
-
-                spin_unlock(&master_lock);
-        }
-wfi:
-        cpu_do_idle();
-out:
-        atomic_dec(&master);
-
-        if (recouple) {
-                prcmu_gic_recouple();
-                spin_unlock(&master_lock);
-        }
-
-        return index;
-}
-
-static struct cpuidle_driver ux500_idle_driver = {
-        .name = "ux500_idle",
-        .owner = THIS_MODULE,
-        .states = {
-                ARM_CPUIDLE_WFI_STATE,
-                {
-                        .enter            = ux500_enter_idle,
-                        .exit_latency     = 70,
-                        .target_residency = 260,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID |
-                                            CPUIDLE_FLAG_TIMER_STOP,
-                        .name             = "ApIdle",
-                        .desc             = "ARM Retention",
-                },
-        },
-        .safe_state_index = 0,
-        .state_count = 2,
-};
-
-int __init ux500_idle_init(void)
-{
-        if (!(cpu_is_u8500_family() || cpu_is_ux540_family()))
-                return -ENODEV;
-
-        /* Configure wake up reasons */
-        prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
-                             PRCMU_WAKEUP(ABB));
-
-        return cpuidle_register(&ux500_idle_driver, NULL);
-}
-
-device_initcall(ux500_idle_init);