[PATCH] mwifiex: mask PCIe interrupts before removal

From	Brian Norris <briannorris@chromium.org>
Newsgroups	linux.kernel
Subject	[PATCH] mwifiex: mask PCIe interrupts before removal
Date	2016-07-01 00:30 +0200
Message-ID	<rPSD7-6M3-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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: Brian Norris <briannorris@chromium.org>
---
 drivers/net/wireless/marvell/mwifiex/pcie.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 0c7937eb6b77..af98371dc2af 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -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.
  *
@@ -2945,6 +2950,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,
-- 
2.8.0.rc3.226.g39d4020

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] mwifiex: mask PCIe interrupts before removal Brian Norris <briannorris@chromium.org> - 2016-07-01 00:30 +0200
  Re: [PATCH] mwifiex: mask PCIe interrupts before removal Doug Anderson <dianders@chromium.org> - 2016-07-01 19:50 +0200
  Re: [PATCH] mwifiex: mask PCIe interrupts before removal Brian Norris <briannorris@chromium.org> - 2016-07-07 20:20 +0200
    Re: [PATCH] mwifiex: mask PCIe interrupts before removal Kalle Valo <kvalo@codeaurora.org> - 2016-07-07 21:40 +0200
  Re: mwifiex: mask PCIe interrupts before removal Kalle Valo <kvalo@codeaurora.org> - 2016-07-08 15:50 +0200

csiph-web