ath10k driver adjusts ASPM state itself which leaves ASPM service
driver in PCI core unaware of the link state changes the driver
implemented.

Call pci_disable_link_state() and pci_enable_link_state() instead of
adjusting ASPMC field in LNKCTL directly in the driver and let PCI core
handle the ASPM state management.

Signed-off-by: Ilpo Järvinen <ilpo.jarvi...@linux.intel.com>
---
 drivers/net/wireless/ath/ath10k/pci.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/pci.c 
b/drivers/net/wireless/ath/ath10k/pci.c
index 23f366221939..64f7133ce122 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -1963,9 +1963,8 @@ static int ath10k_pci_hif_start(struct ath10k *ar)
        ath10k_pci_irq_enable(ar);
        ath10k_pci_rx_post(ar);
 
-       pcie_capability_clear_and_set_word(ar_pci->pdev, PCI_EXP_LNKCTL,
-                                          PCI_EXP_LNKCTL_ASPMC,
-                                          ar_pci->link_ctl & 
PCI_EXP_LNKCTL_ASPMC);
+       pci_enable_link_state(ar_pci->pdev, ar_pci->link_ctl &
+                             (PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1));
 
        return 0;
 }
@@ -2822,8 +2821,7 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar,
 
        pcie_capability_read_word(ar_pci->pdev, PCI_EXP_LNKCTL,
                                  &ar_pci->link_ctl);
-       pcie_capability_clear_word(ar_pci->pdev, PCI_EXP_LNKCTL,
-                                  PCI_EXP_LNKCTL_ASPMC);
+       pci_disable_link_state(ar_pci->pdev, PCIE_LINK_STATE_L0S | 
PCIE_LINK_STATE_L1);
 
        /*
         * Bring the target up cleanly.
-- 
2.30.2


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

Reply via email to