Received: by 2002:ac0:aa62:0:0:0:0:0 with SMTP id w31-v6csp1947566ima; Thu, 25 Oct 2018 07:25:23 -0700 (PDT) X-Google-Smtp-Source: AJdET5da+sWkyNqz7najPjPvw/fPHD74PZTnnnmi98Wk1+/oVzk92Np7auqdrhJGJcbL/YkyKqCL X-Received: by 2002:a17:902:4e25:: with SMTP id f34-v6mr1697660ple.43.1540477523484; Thu, 25 Oct 2018 07:25:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540477523; cv=none; d=google.com; s=arc-20160816; b=EUwOTEGoZpB2C278G8iCyMFtoYhiJSrbI4uzMeSragxOxjhg9rnqm34uEEFh5ZVfHm IcCVWYXdL1MVwb9WsFcvkRP8tLy74rOJF9hnGd0FazJR211H4Lvfb246DaQ53fdQOQhR H4GDmNgIlBEufYzCDTMMpKp6MIg/QR0G+GkHXM1BSMF+XuivCz3J+G5sW7OxHfE5ofdX WL9ABvMitqx2kjtyQ3C+tgkyD3NVqa69VqNyYKh9s9XN2RU1c/95KIYcMEXaq8EUtyLn NLP8Ckgn7sX6xqRAdOO6ayWowDCE2oWYhiEk3OZDggGRG4StgCwFCVUxsRfEqAhzPGo1 36ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=wqEYz/wBVOm1mIq0IjjxjnSX9ifwAtNI2/398CFUux0=; b=Wi4v/tw5UcXt2D94vfHChfeuJHY7plfJ6QXHj3c+vv1rgoJ6VeVKAfBuAnf3Ye1Dq7 iOLmsmW1cqSEYN2TPzSbsz05jTTRG/lH8WIk/3VuoeI3VmIn4Oh8Wl3+gKSsvkt0C1ZB 6VvkYNe7BuyncL6uebTn9PM8mAod42gO+Hgny7WkKS89i77dr3GnoBOkmIeSLJqaUtrd pGgD34EJjxUa19nQJ6JUcQAzHaisM6qKWv5wmbdXnQx/pxfB1xRGYyyatJCBtazDTdNF WPpOTfUr3/nY3YFPDy1YjqAxp2JzhKyN83SIrR2TQuMrDaxd5G0YcxxBE6t5xpUL5xL3 gDyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=e6Gs2UTC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d9-v6si7821766pll.414.2018.10.25.07.24.38; Thu, 25 Oct 2018 07:25:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=e6Gs2UTC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731212AbeJYWxs (ORCPT + 99 others); Thu, 25 Oct 2018 18:53:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:36470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731163AbeJYWxr (ORCPT ); Thu, 25 Oct 2018 18:53:47 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 57CA120870; Thu, 25 Oct 2018 14:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540477249; bh=AAkThiCPCa2sfeqlFUFs44Umn5ceDgl8EZe+4C576IQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e6Gs2UTC/F53uRU5c5OA8A96SH+7LwXDNrJs32VJioTvmRCP78RBF3ODPubp3W2ah gw4qHk02dUCKIhxipYiDTH0+F/lTZ/BIpYjGfqyFfaCi7BMUTFAsa8ZeuWLgJeNfOf MSbZ+wSMq4KNU8C+/ZV2d28Ez4BLbmmy2Sz/2mro= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Larry Finger , Kalle Valo , Sasha Levin Subject: [PATCH AUTOSEL 3.18 76/98] rtlwifi: rtl8821ae: Fix lockups on boot Date: Thu, 25 Oct 2018 10:18:31 -0400 Message-Id: <20181025141853.214051-76-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141853.214051-1-sashal@kernel.org> References: <20181025141853.214051-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Larry Finger [ Upstream commit eeec5d0ef7ee54a75e09e861c3cc44177b8752c7 ] 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 Cc: Stable [V4.1+] Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c index 28b8b6a25f6d..3639398f3c71 100644 --- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c @@ -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); diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c index 80307d187c0a..71cf8120a95e 100644 --- a/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c @@ -474,7 +474,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); -- 2.17.1