Revert "rtw88: Disable PCIe ASPM while doing NAPI poll on 8821CE"

This reverts commit 1a0cba8dfcaa4b8e4d3611ee91805109575d696f.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c
index 08cf66141889bdb5cba5d8e7c63ba2b1643188db..a7a6ebfaa203c728c55d99509b288be1bed853f6 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/pci.c
+++ b/drivers/net/wireless/realtek/rtw88/pci.c
@@ -2,6 +2,7 @@
 /* Copyright(c) 2018-2019  Realtek Corporation
  */
 
+#include <linux/dmi.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include "main.h"
@@ -1408,11 +1409,7 @@ static void rtw_pci_link_ps(struct rtw_dev *rtwdev, bool enter)
         * throughput. This is probably because the ASPM behavior slightly
         * varies from different SOC.
         */
-       if (!(rtwpci->link_ctrl & PCI_EXP_LNKCTL_ASPM_L1))
-               return;
-
-       if ((enter && atomic_dec_if_positive(&rtwpci->link_usage) == 0) ||
-           (!enter && atomic_inc_return(&rtwpci->link_usage) == 1))
+       if (rtwpci->link_ctrl & PCI_EXP_LNKCTL_ASPM_L1)
                rtw_pci_aspm_set(rtwdev, enter);
 }
 
@@ -1661,9 +1658,6 @@ static int rtw_pci_napi_poll(struct napi_struct *napi, int budget)
                                              priv);
        int work_done = 0;
 
-       if (rtwpci->rx_no_aspm)
-               rtw_pci_link_ps(rtwdev, false);
-
        while (work_done < budget) {
                u32 work_done_once;
 
@@ -1687,8 +1681,6 @@ static int rtw_pci_napi_poll(struct napi_struct *napi, int budget)
                if (rtw_pci_get_hw_rx_ring_nr(rtwdev, rtwpci))
                        napi_schedule(napi);
        }
-       if (rtwpci->rx_no_aspm)
-               rtw_pci_link_ps(rtwdev, true);
 
        return work_done;
 }
@@ -1710,13 +1702,50 @@ static void rtw_pci_napi_deinit(struct rtw_dev *rtwdev)
        netif_napi_del(&rtwpci->napi);
 }
 
+enum rtw88_quirk_dis_pci_caps {
+       QUIRK_DIS_PCI_CAP_MSI,
+       QUIRK_DIS_PCI_CAP_ASPM,
+};
+
+static int disable_pci_caps(const struct dmi_system_id *dmi)
+{
+       uintptr_t dis_caps = (uintptr_t)dmi->driver_data;
+
+       if (dis_caps & BIT(QUIRK_DIS_PCI_CAP_MSI))
+               rtw_disable_msi = true;
+       if (dis_caps & BIT(QUIRK_DIS_PCI_CAP_ASPM))
+               rtw_pci_disable_aspm = true;
+
+       return 1;
+}
+
+static const struct dmi_system_id rtw88_pci_quirks[] = {
+       {
+               .callback = disable_pci_caps,
+               .ident = "Protempo Ltd L116HTN6SPW",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Protempo Ltd"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "L116HTN6SPW"),
+               },
+               .driver_data = (void *)BIT(QUIRK_DIS_PCI_CAP_ASPM),
+       },
+       {
+               .callback = disable_pci_caps,
+               .ident = "HP HP Pavilion Laptop 14-ce0xxx",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Laptop 14-ce0xxx"),
+               },
+               .driver_data = (void *)BIT(QUIRK_DIS_PCI_CAP_ASPM),
+       },
+       {}
+};
+
 int rtw_pci_probe(struct pci_dev *pdev,
                  const struct pci_device_id *id)
 {
-       struct pci_dev *bridge = pci_upstream_bridge(pdev);
        struct ieee80211_hw *hw;
        struct rtw_dev *rtwdev;
-       struct rtw_pci *rtwpci;
        int drv_data_size;
        int ret;
 
@@ -1734,9 +1763,6 @@ int rtw_pci_probe(struct pci_dev *pdev,
        rtwdev->hci.ops = &rtw_pci_ops;
        rtwdev->hci.type = RTW_HCI_TYPE_PCIE;
 
-       rtwpci = (struct rtw_pci *)rtwdev->priv;
-       atomic_set(&rtwpci->link_usage, 1);
-
        ret = rtw_core_init(rtwdev);
        if (ret)
                goto err_release_hw;
@@ -1765,10 +1791,7 @@ int rtw_pci_probe(struct pci_dev *pdev,
                goto err_destroy_pci;
        }
 
-       /* Disable PCIe ASPM L1 while doing NAPI poll for 8821CE */
-       if (pdev->device == 0xc821 && bridge->vendor == PCI_VENDOR_ID_INTEL)
-               rtwpci->rx_no_aspm = true;
-
+       dmi_check_system(rtw88_pci_quirks);
        rtw_pci_phy_cfg(rtwdev);
 
        ret = rtw_register_hw(rtwdev, hw);

diff --git a/drivers/net/wireless/realtek/rtw88/pci.h b/drivers/net/wireless/realtek/rtw88/pci.h
index 0c37efd8c66fa776be6362250a28ec154f19de58..66f78eb7757c573c9a342f8b68d14eeedeb342d4 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/pci.h
+++ b/drivers/net/wireless/realtek/rtw88/pci.h
@@ -223,8 +223,6 @@ struct rtw_pci {
        struct rtw_pci_tx_ring tx_rings[RTK_MAX_TX_QUEUE_NUM];
        struct rtw_pci_rx_ring rx_rings[RTK_MAX_RX_QUEUE_NUM];
        u16 link_ctrl;
-       atomic_t link_usage;
-       bool rx_no_aspm;
        DECLARE_BITMAP(flags, NUM_OF_RTW_PCI_FLAGS);
 
        void __iomem *mmap;