7 files changed, 21 insertions, 12 deletions

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 58470c395301..c3293f0a8573 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -855,7 +855,6 @@ fw_create_instance(struct firmware *firmware, const char *fw_name,
 
         fw_priv = kzalloc(sizeof(*fw_priv), GFP_KERNEL);
         if (!fw_priv) {
-                dev_err(device, "%s: kmalloc failed\n", __func__);
                 fw_priv = ERR_PTR(-ENOMEM);
                 goto exit;
         }
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index d626576a4f75..7fdd0172605a 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -81,10 +81,8 @@ static int __pm_clk_add(struct device *dev, const char *con_id,
                 return -EINVAL;
 
         ce = kzalloc(sizeof(*ce), GFP_KERNEL);
-        if (!ce) {
-                dev_err(dev, "Not enough memory for clock entry.\n");
+        if (!ce)
                 return -ENOMEM;
-        }
 
         if (con_id) {
                 ce->con_id = kstrdup(con_id, GFP_KERNEL);
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 15bf29974c31..677fb2843553 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -474,10 +474,8 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq,
 
         /* allocate new OPP node */
         new_opp = kzalloc(sizeof(*new_opp), GFP_KERNEL);
-        if (!new_opp) {
-                dev_warn(dev, "%s: Unable to create new OPP node\n", __func__);
+        if (!new_opp)
                 return -ENOMEM;
-        }
 
         /* Hold our list modification lock here */
         mutex_lock(&dev_opp_list_lock);
@@ -695,10 +693,8 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,
 
         /* keep the node allocated */
         new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL);
-        if (!new_opp) {
-                dev_warn(dev, "%s: Unable to create OPP\n", __func__);
+        if (!new_opp)
                 return -ENOMEM;
-        }
 
         mutex_lock(&dev_opp_list_lock);
 
diff --git a/drivers/cpufreq/speedstep-lib.c b/drivers/cpufreq/speedstep-lib.c
index 7047821a7f8a..4ab7a2156672 100644
--- a/drivers/cpufreq/speedstep-lib.c
+++ b/drivers/cpufreq/speedstep-lib.c
@@ -400,6 +400,7 @@ unsigned int speedstep_get_freqs(enum speedstep_processor processor,
 
         pr_debug("previous speed is %u\n", prev_speed);
 
+        preempt_disable();
         local_irq_save(flags);
 
         /* switch to low state */
@@ -464,6 +465,8 @@ unsigned int speedstep_get_freqs(enum speedstep_processor processor,
 
 out:
         local_irq_restore(flags);
+        preempt_enable();
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(speedstep_get_freqs);
diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c
index 5fc96d5d656b..819229e824fb 100644
--- a/drivers/cpufreq/speedstep-smi.c
+++ b/drivers/cpufreq/speedstep-smi.c
@@ -156,6 +156,7 @@ static void speedstep_set_state(unsigned int state)
                 return;
 
         /* Disable IRQs */
+        preempt_disable();
         local_irq_save(flags);
 
         command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff);
@@ -166,9 +167,19 @@ static void speedstep_set_state(unsigned int state)
 
         do {
                 if (retry) {
+                        /*
+                         * We need to enable interrupts, otherwise the blockage
+                         * won't resolve.
+                         *
+                         * We disable preemption so that other processes don't
+                         * run. If other processes were running, they could
+                         * submit more DMA requests, making the blockage worse.
+                         */
                         pr_debug("retry %u, previous result %u, waiting...\n",
                                         retry, result);
+                        local_irq_enable();
                         mdelay(retry * 50);
+                        local_irq_disable();
                 }
                 retry++;
                 __asm__ __volatile__(
@@ -185,6 +196,7 @@ static void speedstep_set_state(unsigned int state)
 
         /* enable IRQs */
         local_irq_restore(flags);
+        preempt_enable();
 
         if (new_state == state)
                 pr_debug("change to %u MHz succeeded after %u tries "
diff --git a/drivers/devfreq/event/exynos-ppmu.c b/drivers/devfreq/event/exynos-ppmu.c
index 135be0aada9d..ad8347385f53 100644
--- a/drivers/devfreq/event/exynos-ppmu.c
+++ b/drivers/devfreq/event/exynos-ppmu.c
@@ -327,8 +327,8 @@ static int exynos_ppmu_probe(struct platform_device *pdev)
 
         for (i = 0; i < info->num_events; i++) {
                 edev[i] = devm_devfreq_event_add_edev(&pdev->dev, &desc[i]);
-                if (IS_ERR(edev)) {
-                        ret = PTR_ERR(edev);
+                if (IS_ERR(edev[i])) {
+                        ret = PTR_ERR(edev[i]);
                         dev_err(&pdev->dev,
                                 "failed to add devfreq-event device\n");
                         goto err;
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 9cceacb92f9d..1bc0c170f12a 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -727,6 +727,7 @@ static const struct x86_cpu_id intel_idle_ids[] = {
         ICPU(0x46, idle_cpu_hsw),
         ICPU(0x4d, idle_cpu_avn),
         ICPU(0x3d, idle_cpu_bdw),
+        ICPU(0x47, idle_cpu_bdw),
         ICPU(0x4f, idle_cpu_bdw),
         ICPU(0x56, idle_cpu_bdw),
         {}