From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 BE3203EA947 for ; Fri, 26 Jun 2026 09:57:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782467824; cv=none; b=OwVL06V9Ha/w+4ay40vVGFOIEFj2vXjqFiLqfpV0qUQu3v44LAPjD4EUKzx1uEdwZBa8e+WIOZIBbBRg8B2jMgAkbPlybeFUvMm5ejm43kevyU7GI0UslEDOyWpWirhIVCAmg/I4s+4U6y3mkgusOmY0Y2xKg2SVX1NsDUw+CDk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782467824; c=relaxed/simple; bh=FeFNZCmtT+T/xrLBjl1uesmEU0VInlD8jZwriwm7Xas=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rBr6z66h4YX0rY4u6Szp/ORyuVtUigo+vJwla2XejM/c2OJeOpJe3AQf/tozEXI36I743ErDMOV1i1KIIdBy/xocohlJgrKt2bQbAYh3j9M2C1F92+N7JDm05LaS7Yn0spK5TVEw9xPKljaCX02kqWPtli3Q3tlxOL/BownoRX0= 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=o5TdWrKL; arc=none smtp.client-ip=209.85.218.49 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="o5TdWrKL" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-c07a6527453so105015366b.0 for ; Fri, 26 Jun 2026 02:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782467821; x=1783072621; 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=0bZ1u6m7Vf6sIYA8BIUsz5HaLdKBAiYXcGxrCJ5307M=; b=o5TdWrKL6mcBZhh1a725Tyt4eyQJVAWenWFC6Edv6ZMaEgs//0cBcO5AVZznwao62w dhQus/uLM2jxm1kZ+GN+it2/+o7y9R2p5wo5zYxaH7jt27XLXEUBcJTkqFaoUceYVcN0 zlDDT1IHcY1P8BzKO10VGAHME5ZssDAiodsXv6FiYvh4svLZ4eLN3HEea1JeQ400f/Vr vgALjpY2HEGGM8aGirgYXcrO8Y9DBc37935RX/Wov9JVMMZOHdfU5sd7S47FDbZU1AeP cqU3HaiX013vakK/ATCGZitmYNJFyuhyphP/57IoGUZfAJST+2kc6CdW6qu5vxw0/GfU HfqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782467821; x=1783072621; 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=0bZ1u6m7Vf6sIYA8BIUsz5HaLdKBAiYXcGxrCJ5307M=; b=OKMZoooTddrWRVQwrplQ8bHD4d4PRUyoNldjh7ZuOnCxF90O3HGcJEokKyaf9n6q/P +a5l2ltHWUAPOLGoWs96ApW+wNZqq3X6eZYk7tstSMRYEijSF1/4D79DZWzHHuYO0Rit HYVIIuNleNulcANwCrioAZrUXmeZs6uaLTR94ro9tlDhzqgRMSCHJie8wOeHPNNclF6r 3v5hQerfjqMUvGDnPvsS5eJSxxaFqleMVKYP6DaFT4MDWTFxIm5+qSxuaW+ryLpeEB6g KoQabVTzHHASj9CiayfMbuFVUrmvHnDLeDD+mhi6OGrAn5NMaMkJsG2hxovzl3wVvQcD AWhQ== X-Forwarded-Encrypted: i=1; AHgh+RpmvY96VNGKHRKMG+ImfHVC+A5CjclPaEavgBg3fwhxFyvqUIAA4D3A8eGapEQcwMc7PgaNbkHDCo/r5P0=@vger.kernel.org X-Gm-Message-State: AOJu0Yxjsfu/gP0NB0IGHsqWOZI/PkLr691ehMAZdpwPMz4DQq4NjuHH r99n37twnmgYH+Al3L4reMQ9JowI7XOPGLlJEMIB8R3BiMVhdyJGumyXWLqX7hUK0T8= X-Gm-Gg: AfdE7cmCDOhIWKrUiJKkfxKeDuj3heRTA8sH6TRYivjVOeOgvAT4TozzUJ5Scr4O6A+ srhEQQoAISMLIQEJ6p2tVZ+T0F7HpVkleMLXn9P3cXo575DCKNTkV0hQZiaRRZZlwfSw9U0ElAi Pp3U3KCbmQcSiag9WC71rSMQ3Gnllb68+HjYq8aqIW/oKhtDZHZaIO3sgOJZieLZuCttT9wzuuU s9ouCLPE4Q/6HxriVAzgMY05/DlmdsYYGyFZ0Snngr0mjTXtCKxVvt39uQYIAGIu2LERPLSApM5 CjSZjzTl+dO4xU12jjqPjooPFk4xCk09swZEafZoMHm+2m0Srd8S+eHS5Dc1uK2jsngqEoGN1tC zeHKJpERZryF0BOVBGpkt9hLk7LtU1aS3z0vBxa+R9Vm9LZc4buQB+urxGhaXPhdEWjamv2YqVp 5k5Pu1Axtya/TJThj2uPgJfmg= X-Received: by 2002:a17:907:1c93:b0:c0e:4007:8d9a with SMTP id a640c23a62f3a-c1205d8f6c7mr472178266b.2.1782467820820; Fri, 26 Jun 2026 02:57:00 -0700 (PDT) Received: from localhost ([80.208.66.169]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c11fbe05ed6sm301555066b.30.2026.06.26.02.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 02:56:59 -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 v3 2/3] wifi: rtlwifi: convert pci if-statement to ID table Date: Fri, 26 Jun 2026 11:56:47 +0200 Message-ID: <20260626095648.1124924-3-william.hansen.baird@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260626095648.1124924-1-william.hansen.baird@gmail.com> References: <20260626095648.1124924-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 Refactor the ASUSTek quirk logic from an if-statement to a standard rtl_aspm_quirks pci_device_id table. This allows future devices with the same quirk to be added more easily while avoiding a large if-chain. Signed-off-by: William Hansen-Baird --- drivers/net/wireless/realtek/rtlwifi/pci.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c index 38eca8d91581..44121203671c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.c +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -31,6 +31,12 @@ static const u8 ac_to_hwq[] = { BK_QUEUE }; +static const struct pci_device_id rtl_aspm_quirks[] = { + /* ASUSTek F441U/X555UQ */ + { PCI_DEVICE_SUB(PCI_VENDOR_ID_REALTEK, 0xb723, 0x11ad, 0x1723) }, + { } +}; + static u8 _rtl_mac_to_hwqueue(struct ieee80211_hw *hw, struct sk_buff *skb) { struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); @@ -330,19 +336,15 @@ static void rtl_pci_init_aspm(struct ieee80211_hw *hw) { struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); - struct rtl_priv *rtlpriv = rtl_priv(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 + * Certain pci devices 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)) { + if (pci_match_id(rtl_aspm_quirks, rtlpci->pdev)) { __rtl_pci_disable_aspm(hw); ppsc->support_aspm = false; } -- 2.54.0