diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-08-01 08:34:36 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-08-01 08:34:40 -0400 |
| commit | b1910f005883d71d591cc65353467b027e2c5d95 (patch) | |
| tree | dc77d18454bfc337260b51af1ad3752d64219a8a | |
| parent | 60007af702b726bced8095649b80e4bf1c938200 (diff) | |
| download | kernel-b1910f005883d71d591cc65353467b027e2c5d95.tar.gz kernel-b1910f005883d71d591cc65353467b027e2c5d95.tar.xz kernel-b1910f005883d71d591cc65353467b027e2c5d95.zip | |
Fix firmware issues with iwl4965 and rfkill (rhbz 977053)
| -rw-r--r-- | iwl4965-reset-firmware-after-rfkill-off.patch | 56 | ||||
| -rw-r--r-- | kernel.spec | 7 |
2 files changed, 63 insertions, 0 deletions
diff --git a/iwl4965-reset-firmware-after-rfkill-off.patch b/iwl4965-reset-firmware-after-rfkill-off.patch new file mode 100644 index 00000000..08b360d1 --- /dev/null +++ b/iwl4965-reset-firmware-after-rfkill-off.patch @@ -0,0 +1,56 @@ +Using rfkill switch can make firmware unstable, what cause various +Microcode errors and kernel warnings. Reseting firmware just after +rfkill off (radio on) helped with that. + +Resolve: +https://bugzilla.redhat.com/show_bug.cgi?id=977053 + +Reported-and-tested-by: Justin Pearce <whitefox@guardianfox.net> +Cc: stable@vger.kernel.org +Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> +--- + drivers/net/wireless/iwlegacy/4965-mac.c | 10 +++++----- + drivers/net/wireless/iwlegacy/common.c | 1 + + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c +index f0b7794..f2ed62e 100644 +--- a/drivers/net/wireless/iwlegacy/4965-mac.c ++++ b/drivers/net/wireless/iwlegacy/4965-mac.c +@@ -4460,12 +4460,12 @@ il4965_irq_tasklet(struct il_priv *il) + * is killed. Hence update the killswitch state here. The + * rfkill handler will care about restarting if needed. + */ +- if (!test_bit(S_ALIVE, &il->status)) { +- if (hw_rf_kill) +- set_bit(S_RFKILL, &il->status); +- else +- clear_bit(S_RFKILL, &il->status); ++ if (hw_rf_kill) { ++ set_bit(S_RFKILL, &il->status); ++ } else { ++ clear_bit(S_RFKILL, &il->status); + wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); ++ il_force_reset(il, true); + } + + handled |= CSR_INT_BIT_RF_KILL; +diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c +index 3195aad..b03e22e 100644 +--- a/drivers/net/wireless/iwlegacy/common.c ++++ b/drivers/net/wireless/iwlegacy/common.c +@@ -4660,6 +4660,7 @@ il_force_reset(struct il_priv *il, bool external) + + return 0; + } ++EXPORT_SYMBOL(il_force_reset); + + int + il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, +-- +1.7.11.7 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-wireless" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/kernel.spec b/kernel.spec index bf12965d..b24e6d4d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -782,6 +782,9 @@ Patch25071: drm-i915-correctly-restore-fences-with-objects-attac.patch #rhbz 989138 Patch25072: HID-Revert-Revert-HID-Fix-logitech-dj-missing-Unifying-device-issue.patch +#rhbz 977053 +Patch25073: iwl4965-reset-firmware-after-rfkill-off.patch + # END OF PATCH DEFINITIONS %endif @@ -1512,6 +1515,9 @@ ApplyPatch drm-i915-correctly-restore-fences-with-objects-attac.patch #rhbz 989138 ApplyPatch HID-Revert-Revert-HID-Fix-logitech-dj-missing-Unifying-device-issue.patch +#rhbz 977053 +ApplyPatch iwl4965-reset-firmware-after-rfkill-off.patch + # END OF PATCH APPLICATIONS %endif @@ -2321,6 +2327,7 @@ fi %changelog * Thu Aug 01 2013 Josh Boyer <jwboyer@redhat.com> +- Fix firmware issues with iwl4965 and rfkill (rhbz 977053) - Drop hid-logitech-dj patch that was breaking enumeration (rhbz 989138) * Wed Jul 31 2013 Josh Boyer <jwboyer@redhat.com> |