From: Greg Kroah-Hartman Date: Wed, 29 Aug 2012 22:44:41 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.5.4~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=405d2cb3cdb977b58f9a16dcd8e7ac04d54a0eb4;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: ath9k-fix-decrypt_error-initialization-in-ath_rx_tasklet.patch ath9k-stop-btcoex-on-device-suspend.patch pci-ehci-fix-crash-during-hibernation-on-asus-computers.patch --- diff --git a/queue-3.4/ath9k-fix-decrypt_error-initialization-in-ath_rx_tasklet.patch b/queue-3.4/ath9k-fix-decrypt_error-initialization-in-ath_rx_tasklet.patch new file mode 100644 index 00000000000..b9afab8502f --- /dev/null +++ b/queue-3.4/ath9k-fix-decrypt_error-initialization-in-ath_rx_tasklet.patch @@ -0,0 +1,54 @@ +From e1352fde5682ab1bdd2a9e5d75c22d1fe210ef77 Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi +Date: Fri, 10 Aug 2012 11:00:24 +0200 +Subject: ath9k: fix decrypt_error initialization in ath_rx_tasklet() + +From: Lorenzo Bianconi + +commit e1352fde5682ab1bdd2a9e5d75c22d1fe210ef77 upstream. + +ath_rx_tasklet() calls ath9k_rx_skb_preprocess() and ath9k_rx_skb_postprocess() +in a loop over the received frames. The decrypt_error flag is +initialized to false +just outside ath_rx_tasklet() loop. ath9k_rx_accept(), called by +ath9k_rx_skb_preprocess(), +only sets decrypt_error to true and never to false. +Then ath_rx_tasklet() calls ath9k_rx_skb_postprocess() and passes +decrypt_error to it. +So, after a decryption error, in ath9k_rx_skb_postprocess(), we can +have a leftover value +from another processed frame. In that case, the frame will not be marked with +RX_FLAG_DECRYPTED even if it is decrypted correctly. +When using CCMP encryption this issue can lead to connection stuck +because of CCMP +PN corruption and a waste of CPU time since mac80211 tries to decrypt an already +deciphered frame with ieee80211_aes_ccm_decrypt. +Fix the issue initializing decrypt_error flag at the begging of the +ath_rx_tasklet() loop. + +Signed-off-by: Lorenzo Bianconi +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath9k/recv.c ++++ b/drivers/net/wireless/ath/ath9k/recv.c +@@ -1774,7 +1774,6 @@ int ath_rx_tasklet(struct ath_softc *sc, + struct ieee80211_hw *hw = sc->hw; + struct ieee80211_hdr *hdr; + int retval; +- bool decrypt_error = false; + struct ath_rx_status rs; + enum ath9k_rx_qtype qtype; + bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA); +@@ -1796,6 +1795,7 @@ int ath_rx_tasklet(struct ath_softc *sc, + tsf_lower = tsf & 0xffffffff; + + do { ++ bool decrypt_error = false; + /* If handling rx interrupt and flush is in progress => exit */ + if ((sc->sc_flags & SC_OP_RXFLUSH) && (flush == 0)) + break; diff --git a/queue-3.4/ath9k-stop-btcoex-on-device-suspend.patch b/queue-3.4/ath9k-stop-btcoex-on-device-suspend.patch new file mode 100644 index 00000000000..efcfd791280 --- /dev/null +++ b/queue-3.4/ath9k-stop-btcoex-on-device-suspend.patch @@ -0,0 +1,31 @@ +From e19f15ac6437624b6214b2f0ec0d69fb7eb205fa Mon Sep 17 00:00:00 2001 +From: Rajkumar Manoharan +Date: Thu, 9 Aug 2012 12:37:26 +0530 +Subject: ath9k: stop btcoex on device suspend + +From: Rajkumar Manoharan + +commit e19f15ac6437624b6214b2f0ec0d69fb7eb205fa upstream. + +During suspend, the device will be moved to FULLSLEEP state. +As btcoex is never been stopped, the btcoex timer is running +and tries to access hw on fullsleep state. Fix that. + +Signed-off-by: Rajkumar Manoharan +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ath/ath9k/pci.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/ath/ath9k/pci.c ++++ b/drivers/net/wireless/ath/ath9k/pci.c +@@ -312,6 +312,7 @@ static int ath_pci_suspend(struct device + * Otherwise the chip never moved to full sleep, + * when no interface is up. + */ ++ ath9k_stop_btcoex(sc); + ath9k_hw_disable(sc->sc_ah); + ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP); + diff --git a/queue-3.4/pci-ehci-fix-crash-during-hibernation-on-asus-computers.patch b/queue-3.4/pci-ehci-fix-crash-during-hibernation-on-asus-computers.patch new file mode 100644 index 00000000000..cfa141b9687 --- /dev/null +++ b/queue-3.4/pci-ehci-fix-crash-during-hibernation-on-asus-computers.patch @@ -0,0 +1,44 @@ +From 0b68c8e2c3afaf9807eb1ebe0ccfb3b809570aa4 Mon Sep 17 00:00:00 2001 +From: "Rafael J. Wysocki" +Date: Sun, 12 Aug 2012 23:26:07 +0200 +Subject: PCI: EHCI: Fix crash during hibernation on ASUS computers + +From: "Rafael J. Wysocki" + +commit 0b68c8e2c3afaf9807eb1ebe0ccfb3b809570aa4 upstream. + +Commit dbf0e4c (PCI: EHCI: fix crash during suspend on ASUS +computers) added a workaround for an ASUS suspend issue related to +USB EHCI and a bug in a number of ASUS BIOSes that attempt to shut +down the EHCI controller during system suspend if its PCI command +register doesn't contain 0 at that time. + +It turns out that the same workaround is necessary in the analogous +hibernation code path, so add it. + +References: https://bugzilla.kernel.org/show_bug.cgi?id=45811 +Reported-and-tested-by: Oleksij Rempel +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Bjorn Helgaas +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/pci/pci-driver.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/pci/pci-driver.c ++++ b/drivers/pci/pci-driver.c +@@ -952,6 +952,13 @@ static int pci_pm_poweroff_noirq(struct + if (!pci_dev->state_saved && !pci_is_bridge(pci_dev)) + pci_prepare_to_sleep(pci_dev); + ++ /* ++ * The reason for doing this here is the same as for the analogous code ++ * in pci_pm_suspend_noirq(). ++ */ ++ if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI) ++ pci_write_config_word(pci_dev, PCI_COMMAND, 0); ++ + return 0; + } + diff --git a/queue-3.4/series b/queue-3.4/series index 75f1a1965bc..b3ea470eae9 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -42,3 +42,6 @@ svcrpc-fix-svc_xprt_enqueue-svc_recv-busy-looping.patch svcrpc-sends-on-closed-socket-should-stop-immediately.patch cciss-fix-incorrect-scsi-status-reporting.patch acpi-export-symbol-acpi_get_table_with_size.patch +ath9k-stop-btcoex-on-device-suspend.patch +ath9k-fix-decrypt_error-initialization-in-ath_rx_tasklet.patch +pci-ehci-fix-crash-during-hibernation-on-asus-computers.patch