Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeec5d0e authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8821ae: Fix lockups on boot 



In commit 54328e64 ("rtlwifi: rtl8821ae: Fix system lockups on boot"),
an attempt was made to fix a regression introduced in commit 1277fa2a
("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: 54328e64 ("rtlwifi: rtl8821ae: Fix system lockups on boot")
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org> [V4.1+]
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent cecd4cfb

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);