FAILED: patch "[PATCH] rtlwifi: rtl8821ae: Fix lockups on boot" failed to apply to 4.1-stable tree

PATCH [email protected] 1 participant 1 message Dec 7, 2015

Subsystems (2)

Stable branch Realtek wireless driver (rtlwifi family)

lore

Share & tools

lore

[email protected]

author maintainer

2015-12-07 12:12 UTC #0 lore raw

The patch below does not apply to the 4.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From eeec5d0ef7ee54a75e09e861c3cc44177b8752c7 Mon Sep 17 00:00:00 2001

From: Larry Finger <[email protected]>
Date: Tue, 10 Nov 2015 10:46:11 -0600
Subject: [PATCH] rtlwifi: rtl8821ae: Fix lockups on boot

In commit 54328e64047a5 ("rtlwifi: rtl8821ae: Fix system lockups on boot"), an attempt was made to fix a regression introduced in commit 1277fa2ab2f9 ("rtlwifi: Remove the clear interrupt routine from all drivers"). Unfortunately, there were logic errors in that patch that prevented affected boxes from booting even after that patch was applied.

The actual cause of the original problem is unknown as none of the developers have systems that are affected.

Fixes 54328e64047a ("rtlwifi: rtl8821ae: Fix system lockups on boot")

Signed-off-by Larry Finger <[email protected]>

Cc Stable <[email protected]> [V4.1+]

Signed-off-by Kalle Valo <[email protected]>

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +1 -1

index 6e9418ed90c2..bbb789f8990b 100644
@@ -2272,7 +2272,7 @@ void rtl8821ae_enable_interrupt(struct ieee80211_hw *hw)
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-	if (!rtlpci->int_clear)
+	if (rtlpci->int_clear)
 		rtl8821ae_clear_interrupt(hw);/*clear it here first*/
 
 	rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c +1 -1

index 8ee141a55bc5..142bdff4ed60 100644
@@ -448,7 +448,7 @@ MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
 MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 1)\n");
 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
 MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");
-MODULE_PARM_DESC(int_clear, "Set to 1 to disable interrupt clear before set (default 0)\n");
+MODULE_PARM_DESC(int_clear, "Set to 0 to disable interrupt clear before set (default 1)\n");
 
 static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);