ath9k: Store subsystem id in struct hw_version
PATCH 1/4 ath9k: Store subsystem id in struct hw_version
This subsystem id will be used later to turn on the btcoex support.
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ahb.c | 2 +- drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 7 ++++--- drivers/net/wireless/ath/ath9k/pci.c | 4 +++- 5 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath9k/ahb.c +1 -1
@@ -119,7 +119,7 @@ static int ath_ahb_probe(struct platform_device *pdev) sc->bus_ops = &ath_ahb_bus_ops; sc->irq = irq; - ret =ath_init_device (AR5416_AR9100_DEVID , sc); + ret =ath_init_device (AR5416_AR9100_DEVID , sc,0x0 );if (ret) {dev_err (&pdev->dev,"failed to initialize device\n" ); goto err_free_hw;
drivers/net/wireless/ath/ath9k/ath9k.h +1 -1
@@ -658,7 +658,7 @@ extern struct ieee80211_ops ath9k_ops;irqreturn_t ath_isr (int irq,void *dev);void ath_cleanup (struct ath_softc *sc); -int ath_init_device (u16 devid,struct ath_softc *sc); +int ath_init_device (u16 devid,struct ath_softc *sc,u16 subsysid);void ath_detach (struct ath_softc *sc);const char *ath_mac_bb_name (u32 mac_bb_version);const char *ath_rf_name (u16 rf_version);
drivers/net/wireless/ath/ath9k/hw.h +1 -0
@@ -390,6 +390,7 @@ struct ath9k_hw_version {u16 phyRev;u16 analog5GhzRev;u16 analog2GhzRev; +u16 subsysid; };/* Generic TSF timer definitions */
drivers/net/wireless/ath/ath9k/main.c +4 -3
@@ -1310,7 +1310,7 @@ static int ath9k_reg_notifier(struct wiphy *wiphy,* to allow the separation between hardware specific * variables (now in ath_hw) and driver specific variables. */ -static int ath_init_softc (u16 devid,struct ath_softc *sc) +static int ath_init_softc (u16 devid,struct ath_softc *sc,u16 subsysid) {struct ath_hw *ah =NULL ;int r =0 , i;
@@ -1348,6 +1348,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc) ah->ah_sc = sc; ah->hw_version.devid = devid; + ah->hw_version.subsysid = subsysid; sc->sc_ah = ah; r =ath9k_hw_init (ah);
@@ -1577,7 +1578,7 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) }/* Device driver core initialization */ -int ath_init_device (u16 devid,struct ath_softc *sc) +int ath_init_device (u16 devid,struct ath_softc *sc,u16 subsysid) {struct ieee80211_hw *hw = sc->hw;int error =0 , i;
@@ -1585,7 +1586,7 @@ int ath_init_device(u16 devid, struct ath_softc *sc)DPRINTF (sc,ATH_DBG_CONFIG ,"Attach ATH hw\n" ); - error =ath_init_softc (devid, sc); + error =ath_init_softc (devid, sc, subsysid);if (error !=0 )return error;
drivers/net/wireless/ath/ath9k/pci.c +3 -1
@@ -88,6 +88,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)struct ath_softc *sc;struct ieee80211_hw *hw;u8 csz; +u16 subsysid;u32 val;int ret =0 ;struct ath_hw *ah;
@@ -178,7 +179,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) sc->mem = mem; sc->bus_ops = &ath_pci_bus_ops; - ret =ath_init_device (id->device, sc); +pci_read_config_word (pdev,PCI_SUBSYSTEM_ID , &subsysid); + ret =ath_init_device (id->device, sc, subsysid);if (ret) {dev_err (&pdev->dev,"failed to initialize device\n" ); goto bad3;
Signature · 1 line
1.5.5.1
PATCH 2/4 ath9k: Enable btcoex based on the subsystem id of the device
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/btcoex.c | 23 +++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/btcoex.h | 1 + drivers/net/wireless/ath/ath9k/hw.c | 3 ++- drivers/net/wireless/ath/ath9k/hw.h | 4 ++++ 4 files changed, 30 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/btcoex.c +23 -0
@@ -19,6 +19,29 @@static const struct ath_btcoex_config ath_bt_config = {0 , true, true,ATH_BT_COEX_MODE_SLOTTED , true, true,2 ,5 , true }; +static const u16 ath_subsysid_tbl[] = { +AR9280_COEX2WIRE_SUBSYSID , +AT9285_COEX3WIRE_SA_SUBSYSID , +AT9285_COEX3WIRE_DA_SUBSYSID +}; + +/* +* Checks the subsystem id of the device to see if it +* supports btcoex +*/ +bool ath_btcoex_supported (u16 subsysid) +{ +int i; + +if (!subsysid) +return false; + +for (i =0 ; i <ARRAY_SIZE (ath_subsysid_tbl); i++) +if (subsysid == ath_subsysid_tbl[i]) +return true; + +return false; +}/* * Detects if there is any priority bt traffic
drivers/net/wireless/ath/ath9k/btcoex.h +1 -0
@@ -79,6 +79,7 @@ struct ath_btcoex_info {struct ath_gen_timer *no_stomp_timer;/*Timer for no BT stomping*/ }; +bool ath_btcoex_supported (u16 subsysid);int ath9k_hw_btcoex_init (struct ath_hw *ah);void ath9k_hw_btcoex_enable (struct ath_hw *ah);void ath9k_hw_btcoex_disable (struct ath_hw *ah);
drivers/net/wireless/ath/ath9k/hw.c +2 -1
@@ -3690,7 +3690,8 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah) pCap->num_antcfg_2ghz = ah->eep_ops->get_num_ant_config (ah,ATH9K_HAL_FREQ_BAND_2GHZ ); -if (AR_SREV_9280_10_OR_LATER (ah) && btcoex_enable) { +if (AR_SREV_9280_10_OR_LATER (ah) && +ath_btcoex_supported (ah->hw_version.subsysid)) { btcoex_info->btactive_gpio =ATH_BTACTIVE_GPIO ; btcoex_info->wlanactive_gpio =ATH_WLANACTIVE_GPIO ;
drivers/net/wireless/ath/ath9k/hw.h +4 -0
@@ -45,6 +45,10 @@#define AR5416_DEVID_AR9287_PCI 0x002D#define AR5416_DEVID_AR9287_PCIE 0x002E +#define AR9280_COEX2WIRE_SUBSYSID 0x309b +#define AT9285_COEX3WIRE_SA_SUBSYSID 0x30aa +#define AT9285_COEX3WIRE_DA_SUBSYSID 0x30ab +/* Register read/write primitives */ #define REG_WRITE (_ah, _reg, _val) ath9k_iowrite32((_ah), (_reg), (_val))#define REG_READ (_ah, _reg) ath9k_ioread32((_ah), (_reg))
Signature · 1 line
1.5.5.1
PATCH 3/4 ath9k: Get rid of the modparam btcoex_enable
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/hw.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +0 -4
@@ -21,10 +21,6 @@#include "ath9k.h" #include "initvals.h" -static int btcoex_enable; -module_param (btcoex_enable, bool,0 ); -MODULE_PARM_DESC (btcoex_enable,"Enable Bluetooth coexistence support" ); -#define ATH9K_CLOCK_RATE_CCK 22#define ATH9K_CLOCK_RATE_5GHZ_OFDM 40#define ATH9K_CLOCK_RATE_2GHZ_OFDM 44
Signature · 1 line
1.5.5.1
PATCH 4/4 ath9k: Initialize the priority gpio for BT coex 3-wire
Oops, a stupid mistake in the original patch which adds coex 3-wire support. Bluetooth priority gpio needs to be gpio 7.
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/btcoex.h | 1 + drivers/net/wireless/ath/ath9k/hw.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/btcoex.h +1 -0
@@ -19,6 +19,7 @@#define ATH_WLANACTIVE_GPIO 5#define ATH_BTACTIVE_GPIO 6 +#define ATH_BTPRIORITY_GPIO 7#define ATH_BTCOEX_DEF_BT_PERIOD 45#define ATH_BTCOEX_DEF_DUTY_CYCLE 55
drivers/net/wireless/ath/ath9k/hw.c +4 -2
@@ -3691,10 +3691,12 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah) btcoex_info->btactive_gpio =ATH_BTACTIVE_GPIO ; btcoex_info->wlanactive_gpio =ATH_WLANACTIVE_GPIO ; -if (AR_SREV_9285 (ah)) +if (AR_SREV_9285 (ah)) { btcoex_info->btcoex_scheme =ATH_BTCOEX_CFG_3WIRE ; -else + btcoex_info->btpriority_gpio =ATH_BTPRIORITY_GPIO ; + }else { btcoex_info->btcoex_scheme =ATH_BTCOEX_CFG_2WIRE ; + } }else { btcoex_info->btcoex_scheme =ATH_BTCOEX_CFG_NONE ; }
Signature · 1 line
1.5.5.1