Commit 8060e169 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Enable extended synch for AR9485 to fix L0s recovery issue 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7f1c7a6a

drivers/net/wireless/ath/ath.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ struct ath_bus_ops { 
	void (*read_cachesize)(struct ath_common *common, int *csz);

	bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);

	void (*bt_coex_prep)(struct ath_common *common);

	void (*extn_synch_en)(struct ath_common *common);

};



struct ath_common {

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

+5 −0
Original line number Diff line number Diff line
@@ -1971,6 +1971,11 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 






	if (AR_SREV_9485_10(ah)) {

		pCap->pcie_lcr_extsync_en = true;

		pCap->pcie_lcr_offset = 0x80;

	}



	return 0;

}

drivers/net/wireless/ath/ath9k/hw.h

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,8 @@ struct ath9k_hw_capabilities { 
	u8 rx_status_len;

	u8 tx_desc_len;

	u8 txs_len;

	u16 pcie_lcr_offset;

	bool pcie_lcr_extsync_en;

};



struct ath9k_ops_config {

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

+3 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,9 @@ static int ath9k_start(struct ieee80211_hw *hw) 


	pm_qos_update_request(&sc->pm_qos_req, 55);



	if (ah->caps.pcie_lcr_extsync_en && common->bus_ops->extn_synch_en)

		common->bus_ops->extn_synch_en(common);



mutex_unlock:

	mutex_unlock(&sc->mutex);

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

+12 −0
Original line number Diff line number Diff line
@@ -103,11 +103,23 @@ static void ath_pci_bt_coex_prep(struct ath_common *common) 
	pci_write_config_byte(pdev, ATH_PCIE_CAP_LINK_CTRL, aspm);

}



static void ath_pci_extn_synch_enable(struct ath_common *common)

{

	struct ath_softc *sc = (struct ath_softc *) common->priv;

	struct pci_dev *pdev = to_pci_dev(sc->dev);

	u8 lnkctl;



	pci_read_config_byte(pdev, sc->sc_ah->caps.pcie_lcr_offset, &lnkctl);

	lnkctl |= PCI_EXP_LNKCTL_ES;

	pci_write_config_byte(pdev, sc->sc_ah->caps.pcie_lcr_offset, lnkctl);

}



static const struct ath_bus_ops ath_pci_bus_ops = {

	.ath_bus_type = ATH_PCI,

	.read_cachesize = ath_pci_read_cachesize,

	.eeprom_read = ath_pci_eeprom_read,

	.bt_coex_prep = ath_pci_bt_coex_prep,

	.extn_synch_en = ath_pci_extn_synch_enable,

};



static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)