2 files changed, 7 insertions, 4 deletions

diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c
index 788495d35cf9..30b993399ed7 100644
--- a/arch/arm/mach-vexpress/dcscb.c
+++ b/arch/arm/mach-vexpress/dcscb.c
@@ -51,12 +51,14 @@ static int dcscb_allcpus_mask[2];
 static int dcscb_power_up(unsigned int cpu, unsigned int cluster)
 {
         unsigned int rst_hold, cpumask = (1 << cpu);
-        unsigned int all_mask = dcscb_allcpus_mask[cluster];
+        unsigned int all_mask;
 
         pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
         if (cpu >= 4 || cluster >= 2)
                 return -EINVAL;
 
+        all_mask = dcscb_allcpus_mask[cluster];
+
         /*
          * Since this is called with IRQs enabled, and no arch_spin_lock_irq
          * variant exists, we need to disable IRQs manually here.
@@ -101,11 +103,12 @@ static void dcscb_power_down(void)
         cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
         cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
         cpumask = (1 << cpu);
-        all_mask = dcscb_allcpus_mask[cluster];
 
         pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
         BUG_ON(cpu >= 4 || cluster >= 2);
 
+        all_mask = dcscb_allcpus_mask[cluster];
+
         __mcpm_cpu_going_down(cpu, cluster);
 
         arch_spin_lock(&dcscb_lock);
diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c
index c26ef5b92ca7..2c2754e79cb3 100644
--- a/arch/arm/mach-vexpress/spc.c
+++ b/arch/arm/mach-vexpress/spc.c
@@ -392,7 +392,7 @@ static irqreturn_t ve_spc_irq_handler(int irq, void *data)
  *  +--------------------------+
  *  | 31      20 | 19        0 |
  *  +--------------------------+
- *  |   u_volt   |  freq(kHz)  |
+ *  |   m_volt   |  freq(kHz)  |
  *  +--------------------------+
  */
 #define MULT_FACTOR     20
@@ -414,7 +414,7 @@ static int ve_spc_populate_opps(uint32_t cluster)
                 ret = ve_spc_read_sys_cfg(SYSCFG_SCC, off, &data);
                 if (!ret) {
                         opps->freq = (data & FREQ_MASK) * MULT_FACTOR;
-                        opps->u_volt = data >> VOLT_SHIFT;
+                        opps->u_volt = (data >> VOLT_SHIFT) * 1000;
                 } else {
                         break;
                 }