From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pa0-f52.google.com ([209.85.220.52]:34550 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750844AbcGGSQ6 (ORCPT ); Thu, 7 Jul 2016 14:16:58 -0400 Received: by mail-pa0-f52.google.com with SMTP id bz2so8050621pad.1 for ; Thu, 07 Jul 2016 11:16:58 -0700 (PDT) Date: Thu, 7 Jul 2016 11:16:53 -0700 From: Brian Norris To: Amitkumar Karwar , Nishant Sarmukadam Cc: linux-kernel@vger.kernel.org, Doug Anderson , Brian Norris , Stephen Barber , Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, wnhuang@chromium.org Subject: Re: [PATCH] mwifiex: mask PCIe interrupts before removal Message-ID: <20160707181652.GA70075@google.com> (sfid-20160707_201727_730381_81DCDD86) References: <1467325262-82799-1-git-send-email-briannorris@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1467325262-82799-1-git-send-email-briannorris@chromium.org> Sender: linux-wireless-owner@vger.kernel.org List-ID: Hi, On Thu, Jun 30, 2016 at 03:21:02PM -0700, Brian Norris wrote: > 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. Ping? This is a bugfix, and it'd be nice to either know what's wrong with it, or see it merged. Regards, Brian > Signed-off-by: Brian Norris > --- > 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 >