Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1bc8227 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

wifi: ath10k: Use RMW accessors for changing LNKCTL 



[ Upstream commit f139492a09f15254fa261245cdbd65555cdf39e3 ]

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 RMW capability accessors which does proper locking to avoid losing
concurrent updates to the register value. On restore, clear the ASPMC field
properly.

Suggested-by: default avatarLukas Wunner <lukas@wunner.de>
Fixes: 76d870ed ("ath10k: enable ASPM")
Link: https://lore.kernel.org/r/20230717120503.15276-11-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Acked-by: default avatarKalle Valo <kvalo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d3150477

drivers/net/wireless/ath/ath10k/pci.c

+5 −4
Original line number Diff line number Diff line
@@ -1957,8 +1957,9 @@ static int ath10k_pci_hif_start(struct ath10k *ar) 
	ath10k_pci_irq_enable(ar);

	ath10k_pci_rx_post(ar);



	pcie_capability_write_word(ar_pci->pdev, PCI_EXP_LNKCTL,

				   ar_pci->link_ctl);

	pcie_capability_clear_and_set_word(ar_pci->pdev, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_ASPMC,

					   ar_pci->link_ctl & PCI_EXP_LNKCTL_ASPMC);



	return 0;

}
@@ -2813,8 +2814,8 @@ 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_write_word(ar_pci->pdev, PCI_EXP_LNKCTL,

				   ar_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC);

	pcie_capability_clear_word(ar_pci->pdev, PCI_EXP_LNKCTL,

				   PCI_EXP_LNKCTL_ASPMC);



	/*

	 * Bring the target up cleanly.