From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD5223C378F for ; Sun, 14 Jun 2026 13:55:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781445330; cv=none; b=JRDiuu8B26nu+1SK6ZlFFTX8GBOenL8gqWokwsm91SVNMKlT/hkV3BPoaqeUI+olnFnucD/qAMRpbhKFIOZ0cWMifIeNIVSOP/9uke+tfmw1u1u20jJjBZMJhW/wtj/ZL7NFSLlXt52Uf9RhKOpbgVA0VfAtXJG9epJ5Frox3sg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781445330; c=relaxed/simple; bh=IOEELMBHPTQoy/DJQ3hmBqjNjGBRksgiX6uD4Astx3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ym71BkkjmSep8CpjLNuSrBzFB9wOhbBDQwTXT7uAgg+0YKwObJWvgnaaeIlzWYHg57+NAIvcm1rFuf7xeixwLuHyf7K5hqvmZ4K4SoObMaWGx4wmDy1iEqCBcfJqrZAl8QqP/bWfZ9eRf8kea2YGCdj6Y5pv+EU06Blh7W6CYos= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=pwHETO30; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pwHETO30" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-bec429c2bb1so342817266b.1 for ; Sun, 14 Jun 2026 06:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781445327; x=1782050127; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vyZ7rRMd2nepnzLpbMXPQjOGTvYeVQr8u2XVEvw4Sf4=; b=pwHETO30jrNs5JN1FjnJSihL1lxOuAOAxD8pHCau47QQaaER86r2AgiIL++ng2XCCC 3XmYsV6KM549w/X7xlWGMwWzYNHBjiXftQ7/HAuspCuSMGmOfMITlyT39KByH1vaa8dq WqqcUiWjn4CkHR/1s5O1kbcX4UH9bS3xkz1qDzVldepp6pQ/HeJMwEumz/h97Y+CG+gV H/cqHS34peNYWp279lOSb2ZEqq34884lYxxuQangFSHj1x+kfHiCvHY8GTji/CN56bpy 7nWuFRvGd/tAD9cGopeEiQoSw1CGqFgeKkSFrP0IkS+ojdWaLpoTCTSkdyyk9r3IAIEy en8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781445327; x=1782050127; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vyZ7rRMd2nepnzLpbMXPQjOGTvYeVQr8u2XVEvw4Sf4=; b=KoNm/8jgqP9FbxI10b+39OuSZtptIl7VhU9rPys+JDb4emj1oS6qJ1JYQ4qMgIQmjk aX7lKWyNZ6n43N7XyA1CWfbCerBFDFl2c1Xj5AZnP3Y2Wpqs/kEmfOD+lQAS8JsgnD4z wZ1AYsLIVQz45n0+B2zZoHQd6/MNo3ttEgCNJA7KCavneC6UyUcHuHKhRXjHVR9CQrUV KbFmrNyGcs8VO7GYXK/w/8vKGkVuy8FxU2FVvznuYso5UWrVoWN0sxH9jXZovD7lz81G L3p5gU7QmA7jdn+nuEwGPkO7gtO/jz3pQ7ASC7HcdB4mzB9ktqHq1udPnV/9r4NFKgfD hNmw== X-Forwarded-Encrypted: i=1; AFNElJ8jk9TPqqLKDWZMYNEeJ8hp6gJY46cph3WvMu6kF61gYsmJ4pOYijNLe7upF2uZOcLr+Cy6zXQd/2eE8qk=@vger.kernel.org X-Gm-Message-State: AOJu0Yyiv2CSXkOzRE0EOw+dBAzvHCVCHv6JM6yCd9kH5284NNoQUiAM Cm2A75o06RuwbC58X3b+wGP34NBVxA57R2091tYZ74ZK9Smwwd8jPgNW X-Gm-Gg: Acq92OFCioxuS/bxE4nx3gw7SnWRd8Set0dfyu0tPBviTXdpI2ckhxbK7JukQIEoMuU 9ogFA+nmEmeohoqw+vHgGqy2+d5hBJnPrNZmz6FpDHxHey4jCI39xsq1t0n6nwvF3CV5DhDXGMZ A03uuNMqGdqjtzLQPhMayTiGD+R5RgpJ9OIKwFlads9+TivKI0Yk1hWiH4wcMpFOgabDLmDXvD+ 5GaPoXaYtfGspRvMuvCTz5nXTbiE8ALxWMqmeRfdgcyfUiRz+0qbz8LZfzF6Sb5zaoj4wrksXec f8rXka+Wpk0wq/1no9CZ/6fC2VdsKOcF4g8fafbbnMuFZNck8yE5BQfysuZ+rXnH6hlnudlePMy T6AgAbj8tCT+CoQR7dfkNW/lIQemhqBSAqDMbNT7EZiPRKPejlE46bfPPMpiI7atcdGDakey1Mj 11mQXhlMTg4feLX+zt4urRedMfiOQHECoY X-Received: by 2002:a17:907:c0d:b0:bed:afd7:185 with SMTP id a640c23a62f3a-bff4c6fb2c9mr284460466b.43.1781445326848; Sun, 14 Jun 2026 06:55:26 -0700 (PDT) Received: from localhost ([37.185.178.0]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bfdb8b23f8fsm316775366b.53.2026.06.14.06.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2026 06:55:26 -0700 (PDT) From: William Hansen-Baird To: pkshih@realtek.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, William Hansen-Baird Subject: [PATCH rtw-next 1/3] wifi: rtlwifi: fix disabling of ASPM for RTL8723BE with AER flooding Date: Sun, 14 Jun 2026 15:55:06 +0200 Message-ID: <20260614135508.70307-2-william.hansen.baird@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260614135508.70307-1-william.hansen.baird@gmail.com> References: <20260614135508.70307-1-william.hansen.baird@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 77a6407c6ab2 ("wifi: rtlwifi: disable ASPM for RTL8723BE with subsystem ID 11ad:1723") adds code which sets ppsc->support_aspm to false in _rtl_pci_update_default_setting() in order to disable ASPM. This does not, however, disable ASPM. Rather, it disables driver control of ASPM, and blocks calls to rtl_pci_enable_aspm() and rtl_pci_disable_aspm(). In some cases, the pci device supplied to the probe function has ASPM enabled. The code would therefore not disable ASPM, as it means to, but rather just leave it enabled. This was discovered through testing on a Razer Blade 14 2017, where ASPM was enabled by default for the pci device. Move the code added in the previous commit to rtl_pci_init_aspm() to allow the adding of a call to rtl_pci_disable_aspm(hw) prior to disabling ppsc->pci_support. This makes sure ASPM is disabled before disabling driver control of ASPM to block it from being enabled later. Fixes: 77a6407c6ab2 ("wifi: rtlwifi: disable ASPM for RTL8723BE with subsystem ID 11ad:1723") Signed-off-by: William Hansen-Baird --- drivers/net/wireless/realtek/rtlwifi/pci.c | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c index 73018a0498b4..4ef1faf649e9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.c +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -156,15 +156,6 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw) PCI_EXP_LNKCTL_ASPM_L1 | PCI_EXP_LNKCTL_CCC)) ppsc->support_aspm = false; - /* RTL8723BE found on some ASUSTek laptops, such as F441U and - * X555UQ with subsystem ID 11ad:1723 are known to output large - * amounts of PCIe AER errors during and after boot up, causing - * heavy lags, poor network throughput, and occasional lock-ups. - */ - if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8723BE && - (rtlpci->pdev->subsystem_vendor == 0x11ad && - rtlpci->pdev->subsystem_device == 0x1723)) - ppsc->support_aspm = false; } static bool _rtl_pci_platform_switch_device_pci_aspm( @@ -330,10 +321,24 @@ static void rtl_pci_parse_configuration(struct pci_dev *pdev, static void rtl_pci_init_aspm(struct ieee80211_hw *hw) { + struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); + struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); _rtl_pci_update_default_setting(hw); + /* RTL8723BE found on some ASUSTek laptops, such as F441U and + * X555UQ with subsystem ID 11ad:1723 are known to output large + * amounts of PCIe AER errors during and after boot up, causing + * heavy lags, poor network throughput, and occasional lock-ups. + */ + if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8723BE && + (rtlpci->pdev->subsystem_vendor == 0x11ad && + rtlpci->pdev->subsystem_device == 0x1723)) { + rtl_pci_disable_aspm(hw); + ppsc->support_aspm = false; + } + if (ppsc->reg_rfps_level & RT_RF_PS_LEVEL_ALWAYS_ASPM) { /*Always enable ASPM & Clock Req. */ rtl_pci_enable_aspm(hw); -- 2.54.0