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

Commit 046b6802 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Disable ASPM only for AR9285 



Currently, ASPM is disabled for all WLAN+BT combo chipsets
when BTCOEX is enabled. This is incorrect since the workaround
is required only for WB195, which is a AR9285+AR3011 combo
solution. Fix this by checking for the HW version when enabling
the workaround.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Tested-by: default avatarPaul Stewart <pstew@chromium.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 63c66424

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

+3 −2
Original line number Diff line number Diff line
@@ -128,8 +128,9 @@ static void ath_pci_aspm_init(struct ath_common *common) 
	if (!parent)

		return;



	if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) {

		/* Bluetooth coexistance requires disabling ASPM. */

	if ((ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) &&

	    (AR_SREV_9285(ah))) {

		/* Bluetooth coexistance requires disabling ASPM for AR9285. */

		pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &aspm);

		aspm &= ~(PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);

		pci_write_config_byte(pdev, pos + PCI_EXP_LNKCTL, aspm);