3 files changed, 46 insertions, 22 deletions

diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-mvebu-v7.c
index 38e68618513a..980151f34707 100644
--- a/drivers/cpuidle/cpuidle-mvebu-v7.c
+++ b/drivers/cpuidle/cpuidle-mvebu-v7.c
@@ -37,11 +37,11 @@ static int mvebu_v7_enter_idle(struct cpuidle_device *dev,
                 deepidle = true;
 
         ret = mvebu_v7_cpu_suspend(deepidle);
+        cpu_pm_exit();
+
         if (ret)
                 return ret;
 
-        cpu_pm_exit();
-
         return index;
 }
 
@@ -50,17 +50,17 @@ static struct cpuidle_driver armadaxp_idle_driver = {
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
         .states[1]              = {
                 .enter                  = mvebu_v7_enter_idle,
-                .exit_latency           = 10,
+                .exit_latency           = 100,
                 .power_usage            = 50,
-                .target_residency       = 100,
+                .target_residency       = 1000,
                 .name                   = "MV CPU IDLE",
                 .desc                   = "CPU power down",
         },
         .states[2]              = {
                 .enter                  = mvebu_v7_enter_idle,
-                .exit_latency           = 100,
+                .exit_latency           = 1000,
                 .power_usage            = 5,
-                .target_residency       = 1000,
+                .target_residency       = 10000,
                 .flags                  = MVEBU_V7_FLAG_DEEP_IDLE,
                 .name                   = "MV CPU DEEP IDLE",
                 .desc                   = "CPU and L2 Fabric power down",
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 97b5e4ee1ca4..63d4033eb683 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -73,7 +73,7 @@
 
 #define TIME_WINDOW_MAX_MSEC 40000
 #define TIME_WINDOW_MIN_MSEC 250
-
+#define ENERGY_UNIT_SCALE    1000 /* scale from driver unit to powercap unit */
 enum unit_type {
         ARBITRARY_UNIT, /* no translation */
         POWER_UNIT,
@@ -158,6 +158,7 @@ struct rapl_domain {
         struct rapl_power_limit rpl[NR_POWER_LIMITS];
         u64 attr_map; /* track capabilities */
         unsigned int state;
+        unsigned int domain_energy_unit;
         int package_id;
 };
 #define power_zone_to_rapl_domain(_zone) \
@@ -190,6 +191,7 @@ struct rapl_defaults {
         void (*set_floor_freq)(struct rapl_domain *rd, bool mode);
         u64 (*compute_time_window)(struct rapl_package *rp, u64 val,
                                 bool to_raw);
+        unsigned int dram_domain_energy_unit;
 };
 static struct rapl_defaults *rapl_defaults;
 
@@ -227,7 +229,8 @@ static int rapl_read_data_raw(struct rapl_domain *rd,
 static int rapl_write_data_raw(struct rapl_domain *rd,
                         enum rapl_primitives prim,
                         unsigned long long value);
-static u64 rapl_unit_xlate(int package, enum unit_type type, u64 value,
+static u64 rapl_unit_xlate(struct rapl_domain *rd, int package,
+                        enum unit_type type, u64 value,
                         int to_raw);
 static void package_power_limit_irq_save(int package_id);
 
@@ -305,7 +308,9 @@ static int get_energy_counter(struct powercap_zone *power_zone, u64 *energy_raw)
 
 static int get_max_energy_counter(struct powercap_zone *pcd_dev, u64 *energy)
 {
-        *energy = rapl_unit_xlate(0, ENERGY_UNIT, ENERGY_STATUS_MASK, 0);
+        struct rapl_domain *rd = power_zone_to_rapl_domain(pcd_dev);
+
+        *energy = rapl_unit_xlate(rd, 0, ENERGY_UNIT, ENERGY_STATUS_MASK, 0);
         return 0;
 }
 
@@ -639,6 +644,11 @@ static void rapl_init_domains(struct rapl_package *rp)
                         rd->msrs[4] = MSR_DRAM_POWER_INFO;
                         rd->rpl[0].prim_id = PL1_ENABLE;
                         rd->rpl[0].name = pl1_name;
+                        rd->domain_energy_unit =
+                                rapl_defaults->dram_domain_energy_unit;
+                        if (rd->domain_energy_unit)
+                                pr_info("DRAM domain energy unit %dpj\n",
+                                        rd->domain_energy_unit);
                         break;
                 }
                 if (mask) {
@@ -648,11 +658,13 @@ static void rapl_init_domains(struct rapl_package *rp)
         }
 }
 
-static u64 rapl_unit_xlate(int package, enum unit_type type, u64 value,
+static u64 rapl_unit_xlate(struct rapl_domain *rd, int package,
+                        enum unit_type type, u64 value,
                         int to_raw)
 {
         u64 units = 1;
         struct rapl_package *rp;
+        u64 scale = 1;
 
         rp = find_package_by_id(package);
         if (!rp)
@@ -663,7 +675,12 @@ static u64 rapl_unit_xlate(int package, enum unit_type type, u64 value,
                 units = rp->power_unit;
                 break;
         case ENERGY_UNIT:
-                units = rp->energy_unit;
+                scale = ENERGY_UNIT_SCALE;
+                /* per domain unit takes precedence */
+                if (rd && rd->domain_energy_unit)
+                        units = rd->domain_energy_unit;
+                else
+                        units = rp->energy_unit;
                 break;
         case TIME_UNIT:
                 return rapl_defaults->compute_time_window(rp, value, to_raw);
@@ -673,11 +690,11 @@ static u64 rapl_unit_xlate(int package, enum unit_type type, u64 value,
         };
 
         if (to_raw)
-                return div64_u64(value, units);
+                return div64_u64(value, units) * scale;
 
         value *= units;
 
-        return value;
+        return div64_u64(value, scale);
 }
 
 /* in the order of enum rapl_primitives */
@@ -773,7 +790,7 @@ static int rapl_read_data_raw(struct rapl_domain *rd,
         final = value & rp->mask;
         final = final >> rp->shift;
         if (xlate)
-                *data = rapl_unit_xlate(rd->package_id, rp->unit, final, 0);
+                *data = rapl_unit_xlate(rd, rd->package_id, rp->unit, final, 0);
         else
                 *data = final;
 
@@ -799,7 +816,7 @@ static int rapl_write_data_raw(struct rapl_domain *rd,
                         "failed to read msr 0x%x on cpu %d\n", msr, cpu);
                 return -EIO;
         }
-        value = rapl_unit_xlate(rd->package_id, rp->unit, value, 1);
+        value = rapl_unit_xlate(rd, rd->package_id, rp->unit, value, 1);
         msr_val &= ~rp->mask;
         msr_val |= value << rp->shift;
         if (wrmsrl_safe_on_cpu(cpu, msr, msr_val)) {
@@ -818,7 +835,7 @@ static int rapl_write_data_raw(struct rapl_domain *rd,
  * calculate units differ on different CPUs.
  * We convert the units to below format based on CPUs.
  * i.e.
- * energy unit: microJoules : Represented in microJoules by default
+ * energy unit: picoJoules  : Represented in picoJoules by default
  * power unit : microWatts  : Represented in milliWatts by default
  * time unit  : microseconds: Represented in seconds by default
  */
@@ -834,7 +851,7 @@ static int rapl_check_unit_core(struct rapl_package *rp, int cpu)
         }
 
         value = (msr_val & ENERGY_UNIT_MASK) >> ENERGY_UNIT_OFFSET;
-        rp->energy_unit = 1000000 / (1 << value);
+        rp->energy_unit = ENERGY_UNIT_SCALE * 1000000 / (1 << value);
 
         value = (msr_val & POWER_UNIT_MASK) >> POWER_UNIT_OFFSET;
         rp->power_unit = 1000000 / (1 << value);
@@ -842,7 +859,7 @@ static int rapl_check_unit_core(struct rapl_package *rp, int cpu)
         value = (msr_val & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET;
         rp->time_unit = 1000000 / (1 << value);
 
-        pr_debug("Core CPU package %d energy=%duJ, time=%dus, power=%duW\n",
+        pr_debug("Core CPU package %d energy=%dpJ, time=%dus, power=%duW\n",
                 rp->id, rp->energy_unit, rp->time_unit, rp->power_unit);
 
         return 0;
@@ -859,7 +876,7 @@ static int rapl_check_unit_atom(struct rapl_package *rp, int cpu)
                 return -ENODEV;
         }
         value = (msr_val & ENERGY_UNIT_MASK) >> ENERGY_UNIT_OFFSET;
-        rp->energy_unit = 1 << value;
+        rp->energy_unit = ENERGY_UNIT_SCALE * 1 << value;
 
         value = (msr_val & POWER_UNIT_MASK) >> POWER_UNIT_OFFSET;
         rp->power_unit = (1 << value) * 1000;
@@ -867,7 +884,7 @@ static int rapl_check_unit_atom(struct rapl_package *rp, int cpu)
         value = (msr_val & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET;
         rp->time_unit = 1000000 / (1 << value);
 
-        pr_debug("Atom package %d energy=%duJ, time=%dus, power=%duW\n",
+        pr_debug("Atom package %d energy=%dpJ, time=%dus, power=%duW\n",
                 rp->id, rp->energy_unit, rp->time_unit, rp->power_unit);
 
         return 0;
@@ -1017,6 +1034,13 @@ static const struct rapl_defaults rapl_defaults_core = {
         .compute_time_window = rapl_compute_time_window_core,
 };
 
+static const struct rapl_defaults rapl_defaults_hsw_server = {
+        .check_unit = rapl_check_unit_core,
+        .set_floor_freq = set_floor_freq_default,
+        .compute_time_window = rapl_compute_time_window_core,
+        .dram_domain_energy_unit = 15300,
+};
+
 static const struct rapl_defaults rapl_defaults_atom = {
         .check_unit = rapl_check_unit_atom,
         .set_floor_freq = set_floor_freq_atom,
@@ -1037,7 +1061,7 @@ static const struct x86_cpu_id rapl_ids[] = {
         RAPL_CPU(0x3a, rapl_defaults_core),/* Ivy Bridge */
         RAPL_CPU(0x3c, rapl_defaults_core),/* Haswell */
         RAPL_CPU(0x3d, rapl_defaults_core),/* Broadwell */
-        RAPL_CPU(0x3f, rapl_defaults_core),/* Haswell */
+        RAPL_CPU(0x3f, rapl_defaults_hsw_server),/* Haswell servers */
         RAPL_CPU(0x45, rapl_defaults_core),/* Haswell ULT */
         RAPL_CPU(0x4C, rapl_defaults_atom),/* Braswell */
         RAPL_CPU(0x4A, rapl_defaults_atom),/* Tangier */
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index b4f7744f6751..b283a1a573b3 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -324,7 +324,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)
 
                 ret = IRQ_HANDLED;
         }
-        spin_lock(&suspended_lock);
+        spin_unlock(&suspended_lock);
 
         return ret;
 }