lkml.org 
[lkml]   [2023]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/17] wifi: ath11k: Use pcie_lnkctl_clear_and_set() for changing LNKCTL
    Date
    Don't assume that only the driver would be accessing LNKCTL. ASPM
    policy changes can trigger write to LNKCTL outside of driver's control.

    Use pcie_lnkctl_clear_and_set() which does proper locking to avoid
    losing concurrent updates to the register value.

    Suggested-by: Lukas Wunner <lukas@wunner.de>
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
    ---
    drivers/net/wireless/ath/ath11k/pci.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
    index 7b33731a50ee..d0885d30dcbc 100644
    --- a/drivers/net/wireless/ath/ath11k/pci.c
    +++ b/drivers/net/wireless/ath/ath11k/pci.c
    @@ -581,8 +581,8 @@ static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci)
    u16_get_bits(ab_pci->link_ctl, PCI_EXP_LNKCTL_ASPM_L1));

    /* disable L0s and L1 */
    - pcie_capability_write_word(ab_pci->pdev, PCI_EXP_LNKCTL,
    - ab_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC);
    + pcie_lnkctl_clear_and_set(ab_pci->pdev,
    + ab_pci->link_ctl & PCI_EXP_LNKCTL_ASPMC, 0);

    set_bit(ATH11K_PCI_ASPM_RESTORE, &ab_pci->flags);
    }
    @@ -590,8 +590,8 @@ static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci)
    static void ath11k_pci_aspm_restore(struct ath11k_pci *ab_pci)
    {
    if (test_and_clear_bit(ATH11K_PCI_ASPM_RESTORE, &ab_pci->flags))
    - pcie_capability_write_word(ab_pci->pdev, PCI_EXP_LNKCTL,
    - ab_pci->link_ctl);
    + pcie_lnkctl_clear_and_set(ab_pci->pdev, 0,
    + ab_pci->link_ctl & PCI_EXP_LNKCTL_ASPMC);
    }

    static int ath11k_pci_power_up(struct ath11k_base *ab)
    --
    2.30.2
    \
     
     \ /
      Last update: 2023-05-11 15:18    [W:3.757 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site