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

Commit d41376ca authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo
Browse files

mwifiex: mask PCIe interrupts before removal 



The PCIe driver didn't mask the host interrupts before trying to tear
down. This causes lockups at reboot or rmmod when using MSI-X on 8997,
since the MSI handler gets confused and locks up the system.

Also tested on 8897, which does not support MSI-X (and wasn't
experiencing this same bug). No regressions seen there.

Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Tested-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 473dfbfa

drivers/net/wireless/marvell/mwifiex/pcie.c

+6 −0
Original line number Diff line number Diff line
@@ -440,6 +440,11 @@ static int mwifiex_pcie_disable_host_int(struct mwifiex_adapter *adapter) 
	return 0;

}



static void mwifiex_pcie_disable_host_int_noerr(struct mwifiex_adapter *adapter)

{

	WARN_ON(mwifiex_pcie_disable_host_int(adapter));

}



/*

 * This function enables the host interrupt.

 *
@@ -2946,6 +2951,7 @@ static struct mwifiex_if_ops pcie_ops = { 
	.register_dev =			mwifiex_register_dev,

	.unregister_dev =		mwifiex_unregister_dev,

	.enable_int =			mwifiex_pcie_enable_host_int,

	.disable_int =			mwifiex_pcie_disable_host_int_noerr,

	.process_int_status =		mwifiex_process_int_status,

	.host_to_card =			mwifiex_pcie_host_to_card,

	.wakeup =			mwifiex_pm_wakeup_card,