From: Greg Kroah-Hartman Date: Tue, 20 Jan 2015 07:31:59 +0000 (+0800) Subject: 3.14-stable patches X-Git-Tag: v3.10.66~45 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ec066a71b540382b4716492ac0b932ae714445b;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: hp_accel-add-support-for-hp-zbook-15.patch rtlwifi-rtl8192ce-set-fw_ready-flag.patch tick-powerclamp-remove-tick_nohz_idle-abuse.patch --- diff --git a/queue-3.14/hp_accel-add-support-for-hp-zbook-15.patch b/queue-3.14/hp_accel-add-support-for-hp-zbook-15.patch new file mode 100644 index 00000000000..ef25a46f32e --- /dev/null +++ b/queue-3.14/hp_accel-add-support-for-hp-zbook-15.patch @@ -0,0 +1,31 @@ +From 6583659e0f92e38079a8dd081e0a1181a0f37747 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Thu, 13 Nov 2014 20:57:37 +0100 +Subject: hp_accel: Add support for HP ZBook 15 + +From: Dominique Leuenberger + +commit 6583659e0f92e38079a8dd081e0a1181a0f37747 upstream. + +HP ZBook 15 laptop needs a non-standard mapping (x_inverted). + +BugLink: http://bugzilla.opensuse.org/show_bug.cgi?id=905329 +Signed-off-by: Dominique Leuenberger +Signed-off-by: Takashi Iwai +Signed-off-by: Darren Hart +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/hp_accel.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/platform/x86/hp_accel.c ++++ b/drivers/platform/x86/hp_accel.c +@@ -237,6 +237,7 @@ static struct dmi_system_id lis3lv02d_dm + AXIS_DMI_MATCH("HPB64xx", "HP ProBook 64", xy_swap), + AXIS_DMI_MATCH("HPB64xx", "HP EliteBook 84", xy_swap), + AXIS_DMI_MATCH("HPB65xx", "HP ProBook 65", x_inverted), ++ AXIS_DMI_MATCH("HPZBook15", "HP ZBook 15", x_inverted), + { NULL, } + /* Laptop models without axis info (yet): + * "NC6910" "HP Compaq 6910" diff --git a/queue-3.14/rtlwifi-rtl8192ce-set-fw_ready-flag.patch b/queue-3.14/rtlwifi-rtl8192ce-set-fw_ready-flag.patch new file mode 100644 index 00000000000..3f127245733 --- /dev/null +++ b/queue-3.14/rtlwifi-rtl8192ce-set-fw_ready-flag.patch @@ -0,0 +1,37 @@ +From 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee Mon Sep 17 00:00:00 2001 +From: Larry Finger +Date: Wed, 10 Dec 2014 14:38:29 -0600 +Subject: rtlwifi: rtl8192ce: Set fw_ready flag + +From: Larry Finger + +commit 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee upstream. + +The setting of this flag was missed in previous modifications. + +Signed-off-by: Larry Finger +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c ++++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +@@ -951,6 +951,7 @@ int rtl92ce_hw_init(struct ieee80211_hw + local_save_flags(flags); + local_irq_enable(); + ++ rtlhal->fw_ready = false; + rtlpriv->intf_ops->disable_aspm(hw); + rtstatus = _rtl92ce_init_mac(hw); + if (!rtstatus) { +@@ -967,6 +968,7 @@ int rtl92ce_hw_init(struct ieee80211_hw + goto exit; + } + ++ rtlhal->fw_ready = true; + rtlhal->last_hmeboxnum = 0; + rtl92c_phy_mac_config(hw); + /* because last function modify RCR, so we update diff --git a/queue-3.14/series b/queue-3.14/series index e0669eb2785..6e29095891a 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -29,3 +29,6 @@ arc-switch-to-generic-entry-end-assembler-annotations.patch cfg80211-don-t-warn-about-two-consecutive-country-ie-hint.patch cfg80211-avoid-mem-leak-on-driver-hint-set.patch cfg80211-fix-160-mhz-channels-with-80-80-and-160-mhz-drivers.patch +rtlwifi-rtl8192ce-set-fw_ready-flag.patch +hp_accel-add-support-for-hp-zbook-15.patch +tick-powerclamp-remove-tick_nohz_idle-abuse.patch diff --git a/queue-3.14/tick-powerclamp-remove-tick_nohz_idle-abuse.patch b/queue-3.14/tick-powerclamp-remove-tick_nohz_idle-abuse.patch new file mode 100644 index 00000000000..0c41a652dff --- /dev/null +++ b/queue-3.14/tick-powerclamp-remove-tick_nohz_idle-abuse.patch @@ -0,0 +1,86 @@ +From a5fd9733a30d18d7ac23f17080e7e07bb3205b69 Mon Sep 17 00:00:00 2001 +From: Thomas Gleixner +Date: Thu, 18 Dec 2014 11:51:01 +0100 +Subject: tick/powerclamp: Remove tick_nohz_idle abuse + +From: Thomas Gleixner + +commit a5fd9733a30d18d7ac23f17080e7e07bb3205b69 upstream. + +commit 4dbd27711cd9 "tick: export nohz tick idle symbols for module +use" was merged via the thermal tree without an explicit ack from the +relevant maintainers. + +The exports are abused by the intel powerclamp driver which implements +a fake idle state from a sched FIFO task. This causes all kinds of +wreckage in the NOHZ core code which rightfully assumes that +tick_nohz_idle_enter/exit() are only called from the idle task itself. + +Recent changes in the NOHZ core lead to a failure of the powerclamp +driver and now people try to hack completely broken and backwards +workarounds into the NOHZ core code. This is completely unacceptable +and just papers over the real problem. There are way more subtle +issues lurking around the corner. + +The real solution is to fix the powerclamp driver by rewriting it with +a sane concept, but that's beyond the scope of this. + +So the only solution for now is to remove the calls into the core NOHZ +code from the powerclamp trainwreck along with the exports. + +Fixes: d6d71ee4a14a "PM: Introduce Intel PowerClamp Driver" +Signed-off-by: Thomas Gleixner +Cc: Preeti U Murthy +Cc: Viresh Kumar +Cc: Frederic Weisbecker +Cc: Fengguang Wu +Cc: Frederic Weisbecker +Cc: Pan Jacob jun +Cc: LKP +Cc: Peter Zijlstra +Cc: Zhang Rui +Link: http://lkml.kernel.org/r/alpine.DEB.2.11.1412181110110.17382@nanos +Signed-off-by: Thomas Gleixner +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/thermal/intel_powerclamp.c | 2 -- + kernel/time/tick-sched.c | 2 -- + 2 files changed, 4 deletions(-) + +--- a/drivers/thermal/intel_powerclamp.c ++++ b/drivers/thermal/intel_powerclamp.c +@@ -435,7 +435,6 @@ static int clamp_thread(void *arg) + * allowed. thus jiffies are updated properly. + */ + preempt_disable(); +- tick_nohz_idle_enter(); + /* mwait until target jiffies is reached */ + while (time_before(jiffies, target_jiffies)) { + unsigned long ecx = 1; +@@ -451,7 +450,6 @@ static int clamp_thread(void *arg) + start_critical_timings(); + atomic_inc(&idle_wakeup_counter); + } +- tick_nohz_idle_exit(); + preempt_enable(); + } + del_timer_sync(&wakeup_timer); +--- a/kernel/time/tick-sched.c ++++ b/kernel/time/tick-sched.c +@@ -807,7 +807,6 @@ void tick_nohz_idle_enter(void) + + local_irq_enable(); + } +-EXPORT_SYMBOL_GPL(tick_nohz_idle_enter); + + /** + * tick_nohz_irq_exit - update next tick event from interrupt exit +@@ -934,7 +933,6 @@ void tick_nohz_idle_exit(void) + + local_irq_enable(); + } +-EXPORT_SYMBOL_GPL(tick_nohz_idle_exit); + + static int tick_nohz_reprogram(struct tick_sched *ts, ktime_t now) + {