On Fri, Sep 21, 2012 at 11:44 AM, Sujith Manoharan <c_manoha@xxxxxxxxxxxx> wrote: > 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@xxxxxxxxxxxxxxx > Signed-off-by: Sujith Manoharan <c_manoha@xxxxxxxxxxxxxxxx> Tested-by: Paul Stewart <pstew@xxxxxxxxxxxx> > --- > drivers/net/wireless/ath/ath9k/pci.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c > index a8f6126..c0c5996 100644 > --- a/drivers/net/wireless/ath/ath9k/pci.c > +++ b/drivers/net/wireless/ath/ath9k/pci.c > @@ -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); > -- > 1.7.12 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html