atheros: move ath9k hw code to a module
cover atheros: move ath9k hw code to a module
Based on review through IRC of my RFC patches about moving ath9k hw code onto ath/ we determined its best to separate hw code from the ath module and instead use a separate new module. Since its shared between ath9k and ath9k_htc and since I'm working on reducing the number of files ath9k_htc has we'll just keep this new module, ath9k_hw, under ath9k/ as well as the future ath9k_htc module.
This patch series was rebased as of today's wireless-testing and applies on top of the other pending ath9k patches, specifically on top of Senthil's patch, "ath9k: Fix bugs in handling TX power".
If you have today's wireless-testing and want to apply all pending ath9k patches you can get all 61 patches from here:
http://bombadil.infradead.org/~mcgrof/patches/ath/2009/09/all-2009-09-23.patch
Its sha1sum is: 90b59e0c85029a89bff7c6ec064220586cc6543e
If you're working on new patches please rebase on top of these.
Luis R. Rodriguez (4):
ath9k: use common read/write ops on pci and debug code
ath9k: move hw code to its own module
ath9k_hw: print device ID if not supported
ath9k_hw: add AR9271 srev and device ID to allow hw to support ar9271
drivers/net/wireless/ath/Makefile | 2 +- drivers/net/wireless/ath/ath9k/Kconfig | 4 ++ drivers/net/wireless/ath/ath9k/Makefile | 27 ++++++------ drivers/net/wireless/ath/ath9k/ani.c | 2 + drivers/net/wireless/ath/ath9k/btcoex.c | 6 +++ drivers/net/wireless/ath/ath9k/calib.c | 3 + drivers/net/wireless/ath/ath9k/debug.c | 21 ++++++---- drivers/net/wireless/ath/ath9k/hw.c | 71 +++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath9k/hw.h | 5 ++ drivers/net/wireless/ath/ath9k/mac.c | 30 +++++++++++++ drivers/net/wireless/ath/ath9k/pci.c | 4 +- 11 files changed, 148 insertions(+), 27 deletions(-)
PATCH 1/4 ath9k: use common read/write ops on pci and debug code
PCI and debug code will not be shared between ath9k and ath9k_htc, so make that code use the common read/write ops.
--- drivers/net/wireless/ath/ath9k/debug.c | 21 +++++++++++++-------- drivers/net/wireless/ath/ath9k/pci.c | 4 ++-- 2 files changed, 15 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath9k/debug.c +13 -8
@@ -18,6 +18,11 @@#include "ath9k.h" +#define REG_WRITE_D (_ah, _reg, _val) \ + ath9k_hw_common(_ah)->ops->write((_ah), (_val), (_reg)) +#define REG_READ_D (_ah, _reg) \ + ath9k_hw_common(_ah)->ops->read((_ah), (_reg)) +static unsigned int ath9k_debug =ATH_DBG_DEFAULT ;module_param_named (debug, ath9k_debug, uint,0 );
@@ -82,7 +87,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,ath9k_ps_wakeup (sc); -REG_WRITE (ah,AR_MACMISC , +REG_WRITE_D (ah,AR_MACMISC , ((AR_MACMISC_DMA_OBS_LINE_8 <<AR_MACMISC_DMA_OBS_S ) | (AR_MACMISC_MISC_OBS_BUS_1 <<AR_MACMISC_MISC_OBS_BUS_MSB_S )));
@@ -94,7 +99,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,if (i %4 ==0 ) len +=snprintf (buf + len,sizeof (buf) - len,"\n" ); - val[i] =REG_READ (ah,AR_DMADBG_0 + (i *sizeof (u32))); + val[i] =REG_READ_D (ah,AR_DMADBG_0 + (i *sizeof (u32))); len +=snprintf (buf + len,sizeof (buf) - len,"%d: %08x " , i, val[i]); }
@@ -144,9 +149,9 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf, (val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17); len +=snprintf (buf + len,sizeof (buf) - len,"pcu observe: 0x%x \n" , -REG_READ (ah,AR_OBS_BUS_1 )); +REG_READ_D (ah,AR_OBS_BUS_1 )); len +=snprintf (buf + len,sizeof (buf) - len, -"AR_CR: 0x%x \n" ,REG_READ (ah,AR_CR )); +"AR_CR: 0x%x \n" ,REG_READ_D (ah,AR_CR ));ath9k_ps_restore (sc);
@@ -363,12 +368,12 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf, aphy->chan_idx, aphy->chan_is_ht); } -put_unaligned_le32 (REG_READ (sc->sc_ah,AR_STA_ID0 ), addr); -put_unaligned_le16 (REG_READ (sc->sc_ah,AR_STA_ID1 ) &0xffff , addr +4 ); +put_unaligned_le32 (REG_READ_D (sc->sc_ah,AR_STA_ID0 ), addr); +put_unaligned_le16 (REG_READ_D (sc->sc_ah,AR_STA_ID1 ) &0xffff , addr +4 ); len +=snprintf (buf + len,sizeof (buf) - len,"addr: %pM\n" , addr); -put_unaligned_le32 (REG_READ (sc->sc_ah,AR_BSSMSKL ), addr); -put_unaligned_le16 (REG_READ (sc->sc_ah,AR_BSSMSKU ) &0xffff , addr +4 ); +put_unaligned_le32 (REG_READ_D (sc->sc_ah,AR_BSSMSKL ), addr); +put_unaligned_le16 (REG_READ_D (sc->sc_ah,AR_BSSMSKU ) &0xffff , addr +4 ); len +=snprintf (buf + len,sizeof (buf) - len,"addrmask: %pM\n" , addr);
drivers/net/wireless/ath/ath9k/pci.c +2 -2
@@ -65,7 +65,7 @@ static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data) { struct ath_hw *ah = (struct ath_hw *) common->ah; - (void)REG_READ(ah, AR5416_EEPROM_OFFSET + (off << AR5416_EEPROM_S)); + common->ops->read(ah, AR5416_EEPROM_OFFSET + (off << AR5416_EEPROM_S)); if (!ath9k_hw_wait(ah, AR_EEPROM_STATUS_DATA,
@@ -75,7 +75,7 @@ static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data)return false; } - *data =MS (REG_READ (ah,AR_EEPROM_STATUS_DATA ), + *data =MS (common->ops->read (ah,AR_EEPROM_STATUS_DATA ),AR_EEPROM_STATUS_DATA_VAL );return true;
Signature · 1 line
1.6.3.3
PATCH 2/4 ath9k: move hw code to its own module
In reply to Luis R. Rodriguezhw code for Atheros 802.11n hardware is commmon between different chipsets. This moves this code into a separate module, the next expected user of this code will be the ath9k_htc module.
The ath9k/ dir is now selected by ATH9K_HW, an option which gets selected by either ath9k or ath9k_htc, but remains invisible for user menuconfig configuration. If either ath9k or ath9k_htc will be compiled into the kernel ath9k_hw will also be compiled in.
--- drivers/net/wireless/ath/Makefile | 2 +- drivers/net/wireless/ath/ath9k/Kconfig | 4 ++ drivers/net/wireless/ath/ath9k/Makefile | 27 +++++++------- drivers/net/wireless/ath/ath9k/ani.c | 2 + drivers/net/wireless/ath/ath9k/btcoex.c | 6 +++ drivers/net/wireless/ath/ath9k/calib.c | 3 ++ drivers/net/wireless/ath/ath9k/hw.c | 61 +++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/mac.c | 30 +++++++++++++++ 8 files changed, 121 insertions(+), 14 deletions(-)
drivers/net/wireless/ath/Makefile +1 -1
@@ -1,5 +1,5 @@ obj-$(CONFIG_ATH5K) += ath5k/ -obj-$(CONFIG_ATH9K) += ath9k/ +obj-$(CONFIG_ATH9K_HW) += ath9k/ obj-$(CONFIG_AR9170_USB) += ar9170/ obj-$(CONFIG_ATH_COMMON) += ath.o
drivers/net/wireless/ath/ath9k/Kconfig +4 -0
@@ -1,6 +1,10 @@ +config ATH9K_HW + tristate + config ATH9K tristate "Atheros 802.11n wireless cards support" depends on PCI && MAC80211 && WLAN_80211 + select ATH9K_HW select MAC80211_LEDS select LEDS_CLASS select NEW_LEDS
drivers/net/wireless/ath/ath9k/Makefile +14 -13
@@ -1,16 +1,4 @@ -ATH9K_HW += hw.o \ - eeprom.o \ - eeprom_def.o \ - eeprom_4k.o \ - eeprom_9287.o \ - calib.o \ - ani.o \ - phy.o \ - btcoex.o \ - mac.o \ - -ath9k-y += $(ATH9K_HW) \ - beacon.o \ +ath9k-y += beacon.o \ main.o \ recv.o \ xmit.o \
@@ -22,3 +10,16 @@ ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o ath9k-$(CONFIG_ATH9K_DEBUG) += debug.o obj-$(CONFIG_ATH9K) += ath9k.o + +ath9k_hw-y:= hw.o \ + eeprom.o \ + eeprom_def.o \ + eeprom_4k.o \ + eeprom_9287.o \ + calib.o \ + ani.o \ + phy.o \ + btcoex.o \ + mac.o \ + +obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o
drivers/net/wireless/ath/ath9k/ani.c +2 -0
@@ -629,6 +629,7 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah, } } } +EXPORT_SYMBOL (ath9k_hw_ani_monitor);void ath9k_enable_mib_counters (struct ath_hw *ah) {
@@ -756,6 +757,7 @@ void ath9k_hw_procmibevent(struct ath_hw *ah)ath9k_ani_restart (ah); } } +EXPORT_SYMBOL (ath9k_hw_procmibevent);void ath9k_hw_ani_setup (struct ath_hw *ah) {
drivers/net/wireless/ath/ath9k/btcoex.c +6 -0
@@ -95,6 +95,7 @@ void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum)for (i =0 ; i <32 ; i++) ah->hw_gen_timers.gen_timer_index[(debruijn32 << i) >>27 ] = i; } +EXPORT_SYMBOL (ath9k_hw_init_btcoex_hw);void ath9k_hw_btcoex_init_2wire (struct ath_hw *ah) {
@@ -116,6 +117,7 @@ void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah)/* Configure the desired gpio port for input */ ath9k_hw_cfg_gpio_input (ah, btcoex_hw->btactive_gpio); } +EXPORT_SYMBOL (ath9k_hw_btcoex_init_2wire);void ath9k_hw_btcoex_init_3wire (struct ath_hw *ah) {
@@ -141,6 +143,7 @@ void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah)ath9k_hw_cfg_gpio_input (ah, btcoex_hw->btactive_gpio);ath9k_hw_cfg_gpio_input (ah, btcoex_hw->btpriority_gpio); } +EXPORT_SYMBOL (ath9k_hw_btcoex_init_3wire);static void ath9k_hw_btcoex_enable_2wire (struct ath_hw *ah) {
@@ -160,6 +163,7 @@ void ath9k_hw_btcoex_set_weight(struct ath_hw *ah, btcoex_hw->bt_coex_weights =SM (bt_weight,AR_BTCOEX_BT_WGHT ) |SM (wlan_weight,AR_BTCOEX_WL_WGHT ); } +EXPORT_SYMBOL (ath9k_hw_btcoex_set_weight);static void ath9k_hw_btcoex_enable_3wire (struct ath_hw *ah) {
@@ -201,6 +205,7 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah) ah->btcoex_hw.enabled = true; } +EXPORT_SYMBOL (ath9k_hw_btcoex_enable);void ath9k_hw_btcoex_disable (struct ath_hw *ah) {
@@ -219,3 +224,4 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah) ah->btcoex_hw.enabled = false; } +EXPORT_SYMBOL (ath9k_hw_btcoex_disable);
drivers/net/wireless/ath/ath9k/calib.c +3 -0
@@ -594,6 +594,7 @@ bool ath9k_hw_reset_calvalid(struct ath_hw *ah)return false; } +EXPORT_SYMBOL (ath9k_hw_reset_calvalid);void ath9k_hw_start_nfcal (struct ath_hw *ah) {
@@ -746,6 +747,7 @@ s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan)return nf; } +EXPORT_SYMBOL (ath9k_hw_getchan_noise);static void ath9k_olc_temp_compensation_9287 (struct ath_hw *ah) {
@@ -1066,6 +1068,7 @@ bool ath9k_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,return iscaldone; } +EXPORT_SYMBOL (ath9k_hw_calibrate);static bool ar9285_clc (struct ath_hw *ah,struct ath9k_channel *chan) {
drivers/net/wireless/ath/ath9k/hw.c +61 -0
324 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/mac.c +30 -0
@@ -39,11 +39,13 @@ u32 ath9k_hw_gettxbuf(struct ath_hw *ah, u32 q) {return REG_READ (ah,AR_QTXDP (q)); } +EXPORT_SYMBOL (ath9k_hw_gettxbuf);void ath9k_hw_puttxbuf (struct ath_hw *ah,u32 q,u32 txdp) {REG_WRITE (ah,AR_QTXDP (q), txdp); } +EXPORT_SYMBOL (ath9k_hw_puttxbuf);void ath9k_hw_txstart (struct ath_hw *ah,u32 q) {
@@ -51,6 +53,7 @@ void ath9k_hw_txstart(struct ath_hw *ah, u32 q) "Enable TXE on queue: %u\n", q);REG_WRITE (ah,AR_Q_TXE ,1 << q); } +EXPORT_SYMBOL (ath9k_hw_txstart);u32 ath9k_hw_numtxpending (struct ath_hw *ah,u32 q) {
@@ -65,6 +68,7 @@ u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q)return npend; } +EXPORT_SYMBOL (ath9k_hw_numtxpending);bool ath9k_hw_updatetxtriglevel (struct ath_hw *ah,bool bIncTrigLevel) {
@@ -94,6 +98,7 @@ bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel)return newLevel != curLevel; } +EXPORT_SYMBOL (ath9k_hw_updatetxtriglevel);bool ath9k_hw_stoptxdma (struct ath_hw *ah,u32 q) {
@@ -173,6 +178,7 @@ bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q)#undef ATH9K_TX_STOP_DMA_TIMEOUT#undef ATH9K_TIME_QUANTUM } +EXPORT_SYMBOL (ath9k_hw_stoptxdma); void ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, u32 segLen, bool firstSeg,
@@ -199,6 +205,7 @@ void ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, ads->ds_txstatus6 = ads->ds_txstatus7 =0 ; ads->ds_txstatus8 = ads->ds_txstatus9 =0 ; } +EXPORT_SYMBOL (ath9k_hw_filltxdesc);void ath9k_hw_cleartxdesc (struct ath_hw *ah,struct ath_desc *ds) {
@@ -210,6 +217,7 @@ void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds) ads->ds_txstatus6 = ads->ds_txstatus7 =0 ; ads->ds_txstatus8 = ads->ds_txstatus9 =0 ; } +EXPORT_SYMBOL (ath9k_hw_cleartxdesc);int ath9k_hw_txprocdesc (struct ath_hw *ah,struct ath_desc *ds) {
@@ -285,6 +293,7 @@ int ath9k_hw_txprocdesc(struct ath_hw *ah, struct ath_desc *ds)return 0 ; } +EXPORT_SYMBOL (ath9k_hw_txprocdesc); void ath9k_hw_set11n_txdesc(struct ath_hw *ah, struct ath_desc *ds, u32 pktLen, enum ath9k_pkt_type type, u32 txPower,
@@ -320,6 +329,7 @@ void ath9k_hw_set11n_txdesc(struct ath_hw *ah, struct ath_desc *ds, ads->ds_ctl11 =0 ; } } +EXPORT_SYMBOL (ath9k_hw_set11n_txdesc); void ath9k_hw_set11n_ratescenario(struct ath_hw *ah, struct ath_desc *ds, struct ath_desc *lastds,
@@ -375,6 +385,7 @@ void ath9k_hw_set11n_ratescenario(struct ath_hw *ah, struct ath_desc *ds, last_ads->ds_ctl2 = ads->ds_ctl2; last_ads->ds_ctl3 = ads->ds_ctl3; } +EXPORT_SYMBOL (ath9k_hw_set11n_ratescenario);void ath9k_hw_set11n_aggr_first (struct ath_hw *ah,struct ath_desc *ds,u32 aggrLen)
@@ -385,6 +396,7 @@ void ath9k_hw_set11n_aggr_first(struct ath_hw *ah, struct ath_desc *ds, ads->ds_ctl6 &= ~AR_AggrLen; ads->ds_ctl6 |=SM (aggrLen, AR_AggrLen); } +EXPORT_SYMBOL (ath9k_hw_set11n_aggr_first);void ath9k_hw_set11n_aggr_middle (struct ath_hw *ah,struct ath_desc *ds,u32 numDelims)
@@ -399,6 +411,7 @@ void ath9k_hw_set11n_aggr_middle(struct ath_hw *ah, struct ath_desc *ds, ctl6 |=SM (numDelims, AR_PadDelim); ads->ds_ctl6 = ctl6; } +EXPORT_SYMBOL (ath9k_hw_set11n_aggr_middle);void ath9k_hw_set11n_aggr_last (struct ath_hw *ah,struct ath_desc *ds) {
@@ -408,6 +421,7 @@ void ath9k_hw_set11n_aggr_last(struct ath_hw *ah, struct ath_desc *ds) ads->ds_ctl1 &= ~AR_MoreAggr; ads->ds_ctl6 &= ~AR_PadDelim; } +EXPORT_SYMBOL (ath9k_hw_set11n_aggr_last);void ath9k_hw_clr11n_aggr (struct ath_hw *ah,struct ath_desc *ds) {
@@ -415,6 +429,7 @@ void ath9k_hw_clr11n_aggr(struct ath_hw *ah, struct ath_desc *ds) ads->ds_ctl1 &= (~AR_IsAggr & ~AR_MoreAggr); } +EXPORT_SYMBOL (ath9k_hw_clr11n_aggr);void ath9k_hw_set11n_burstduration (struct ath_hw *ah,struct ath_desc *ds,u32 burstDuration)
@@ -424,6 +439,7 @@ void ath9k_hw_set11n_burstduration(struct ath_hw *ah, struct ath_desc *ds, ads->ds_ctl2 &= ~AR_BurstDur; ads->ds_ctl2 |=SM (burstDuration, AR_BurstDur); } +EXPORT_SYMBOL (ath9k_hw_set11n_burstduration);void ath9k_hw_set11n_virtualmorefrag (struct ath_hw *ah,struct ath_desc *ds,u32 vmf)
@@ -441,6 +457,7 @@ void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs) *txqs &= ah->intr_txqs; ah->intr_txqs &= ~(*txqs); } +EXPORT_SYMBOL (ath9k_hw_gettxintrtxqs);bool ath9k_hw_set_txq_props (struct ath_hw *ah,int q,const struct ath9k_tx_queue_info *qinfo)
@@ -512,6 +529,7 @@ bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q,return true; } +EXPORT_SYMBOL (ath9k_hw_set_txq_props);bool ath9k_hw_get_txq_props (struct ath_hw *ah,int q,struct ath9k_tx_queue_info *qinfo)
@@ -550,6 +568,7 @@ bool ath9k_hw_get_txq_props(struct ath_hw *ah, int q,return true; } +EXPORT_SYMBOL (ath9k_hw_get_txq_props);int ath9k_hw_setuptxqueue (struct ath_hw *ah,enum ath9k_tx_queue type,const struct ath9k_tx_queue_info *qinfo)
@@ -617,6 +636,7 @@ int ath9k_hw_setuptxqueue(struct ath_hw *ah, enum ath9k_tx_queue type,return q; } +EXPORT_SYMBOL (ath9k_hw_setuptxqueue);bool ath9k_hw_releasetxqueue (struct ath_hw *ah,u32 q) {
@@ -648,6 +668,7 @@ bool ath9k_hw_releasetxqueue(struct ath_hw *ah, u32 q)return true; } +EXPORT_SYMBOL (ath9k_hw_releasetxqueue);bool ath9k_hw_resettxqueue (struct ath_hw *ah,u32 q) {
@@ -805,6 +826,7 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)return true; } +EXPORT_SYMBOL (ath9k_hw_resettxqueue);int ath9k_hw_rxprocdesc (struct ath_hw *ah,struct ath_desc *ds,u32 pa,struct ath_desc *nds,u64 tsf)
@@ -886,6 +908,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,return 0 ; } +EXPORT_SYMBOL (ath9k_hw_rxprocdesc);void ath9k_hw_setuprxdesc (struct ath_hw *ah,struct ath_desc *ds,u32 size,u32 flags)
@@ -901,6 +924,7 @@ void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds,if (!(pCap->hw_caps &ATH9K_HW_CAP_AUTOSLEEP ))memset (&(ads->u),0 ,sizeof (ads->u)); } +EXPORT_SYMBOL (ath9k_hw_setuprxdesc);bool ath9k_hw_setrxabort (struct ath_hw *ah,bool set) {
@@ -930,16 +954,19 @@ bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set)return true; } +EXPORT_SYMBOL (ath9k_hw_setrxabort);void ath9k_hw_putrxbuf (struct ath_hw *ah,u32 rxdp) {REG_WRITE (ah,AR_RXDP , rxdp); } +EXPORT_SYMBOL (ath9k_hw_putrxbuf);void ath9k_hw_rxena (struct ath_hw *ah) {REG_WRITE (ah,AR_CR ,AR_CR_RXE ); } +EXPORT_SYMBOL (ath9k_hw_rxena);void ath9k_hw_startpcureceive (struct ath_hw *ah) {
@@ -949,6 +976,7 @@ void ath9k_hw_startpcureceive(struct ath_hw *ah)REG_CLR_BIT (ah,AR_DIAG_SW , (AR_DIAG_RX_DIS |AR_DIAG_RX_ABORT )); } +EXPORT_SYMBOL (ath9k_hw_startpcureceive);void ath9k_hw_stoppcurecv (struct ath_hw *ah) {
@@ -956,6 +984,7 @@ void ath9k_hw_stoppcurecv(struct ath_hw *ah)ath9k_hw_disable_mib_counters (ah); } +EXPORT_SYMBOL (ath9k_hw_stoppcurecv);bool ath9k_hw_stopdmarecv (struct ath_hw *ah) {
@@ -988,3 +1017,4 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah)#undef AH_RX_TIME_QUANTUM#undef AH_RX_STOP_DMA_TIMEOUT } +EXPORT_SYMBOL (ath9k_hw_stopdmarecv);
Signature · 1 line
1.6.3.3
PATCH 2/4 ath9k: move hw code to its own module
Quoted 20 lines · On Thursday 24 September 2009 05:07:00 Luis R. Rodriguez wrote:
hw code for Atheros 802.11n hardware is commmon between different chipsets. This moves this code into a separate module, the next expected user of this code will be the
ath9k_htcmodule.The ath9k/ dir is now selected by
ATH9K_HW, an option which gets selected by either ath9k orath9k_htc, but remains invisible for user menuconfig configuration. If either ath9k orath9k_htcwill be compiled into the kernelath9k_hwwill also be compiled in.drivers/net/wireless/ath/ath9k/hw.c +1
-0@@ -33,6 +33,23 @@ static u32 ath9k_hw_ini_fixup(struct ath_hw *ah,static void ath9k_hw_9280_spur_mitigate (struct ath_hw *ah,struct ath9k_channel *chan);static void ath9k_hw_spur_mitigate (struct ath_hw *ah,struct ath9k_channel *chan); +MODULE_AUTHOR ("Atheros Communications" );
[...]
Quoted 6 lines
drivers/net/wireless/ath/ath9k/hw.c +6
-0+ +static int __init ath9k_init (void ) +{ +return 0 ; +} +module_init (ath9k_init);
drivers/net/wireless/ath/ath9k/hw.c static u32 ath9k_hw_ini_fixup(struct ath_hw *ah, · line 55
Quoted 10 lines
drivers/net/wireless/ath/ath9k/hw.c +7
-0+ +static void __exit ath9k_exit(void) +{ +return ; +} +module_exit (ath9k_exit); +/********************/ /* Helper Functions */ /********************/
FYI: there's no need for module_init/module_exit stubs. ( http://osdir.com/ml/linux-wireless/2009-04/msg00478.html )
PATCH 2/4 ath9k: move hw code to its own module
Quoted 33 lines · Christian Lamparter
Quoted 20 lines · On Thursday 24 September 2009 05:07:00 Luis R. Rodriguez wrote:
hw code for Atheros 802.11n hardware is commmon between different chipsets. This moves this code into a separate module, the next expected user of this code will be the
ath9k_htcmodule.The ath9k/ dir is now selected by
ATH9K_HW, an option which gets selected by either ath9k orath9k_htc, but remains invisible for user menuconfig configuration. If either ath9k orath9k_htcwill be compiled into the kernelath9k_hwwill also be compiled in.drivers/net/wireless/ath/ath9k/hw.c +1
-0@@ -33,6 +33,23 @@ static u32 ath9k_hw_ini_fixup(struct ath_hw *ah,static void ath9k_hw_9280_spur_mitigate (struct ath_hw *ah,struct ath9k_channel *chan);static void ath9k_hw_spur_mitigate (struct ath_hw *ah,struct ath9k_channel *chan); +MODULE_AUTHOR ("Atheros Communications" );[...]
Quoted 11 lines
drivers/net/wireless/ath/ath9k/hw.c +11
-0+ +static int __init ath9k_init (void ) +{ +return 0 ; +} +module_init (ath9k_init); + +static void __exit ath9k_exit(void) +{ +return ; +}
Quoted 8 lines
drivers/net/wireless/ath/ath9k/hw.c static u32 ath9k_hw_ini_fixup(struct ath_hw *ah, · line 55
Quoted 5 lines
drivers/net/wireless/ath/ath9k/hw.c +2
-0+module_exit (ath9k_exit); +/********************/ /* Helper Functions */ /********************/ FYI: there's no need for module_init/module_exit stubs. ( http://osdir.com/ml/linux-wireless/2009-04/msg00478.html )
But it's nicer if they are there, I'd recommend keeping them.
thanks,
greg k-h
PATCH 3/4 ath9k_hw: print device ID if not supported
In reply to Luis R. Rodriguez--- drivers/net/wireless/ath/ath9k/hw.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +5 -1
@@ -900,8 +900,12 @@ int ath9k_hw_init(struct ath_hw *ah)struct ath_common *common =ath9k_hw_common (ah);int r =0 ; -if (!ath9k_hw_devid_supported (ah->hw_version.devid)) +if (!ath9k_hw_devid_supported (ah->hw_version.devid)) { +ath_print (common,ATH_DBG_FATAL , +"Unsupported device ID: 0x%0x\n" , + ah->hw_version.devid);return -EOPNOTSUPP ; + }ath9k_hw_init_defaults (ah);ath9k_hw_init_config (ah);
Signature · 1 line
1.6.3.3
PATCH 4/4 ath9k_hw: add AR9271 srev and device ID to allow hw to support ar9271
In reply to Luis R. RodriguezThis allows for hw support to be enabled for ar9271.
--- drivers/net/wireless/ath/ath9k/hw.c | 4 ++-- drivers/net/wireless/ath/ath9k/hw.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +2 -2
@@ -609,6 +609,7 @@ static bool ath9k_hw_devid_supported(u16 devid)case AR9285_DEVID_PCIE :case AR5416_DEVID_AR9287_PCI :case AR5416_DEVID_AR9287_PCIE : +case AR9271_USB :return true;default :break ;
@@ -626,9 +627,8 @@ static bool ath9k_hw_macversion_supported(u32 macversion)case AR_SREV_VERSION_9280 :case AR_SREV_VERSION_9285 :case AR_SREV_VERSION_9287 : -return true; -/* Not yet */ case AR_SREV_VERSION_9271 : +return true;default :break ; }
drivers/net/wireless/ath/ath9k/hw.h +5 -0
@@ -33,13 +33,18 @@#include "../debug.h" #define ATHEROS_VENDOR_ID 0x168c +#define AR5416_DEVID_PCI 0x0023#define AR5416_DEVID_PCIE 0x0024#define AR9160_DEVID_PCI 0x0027#define AR9280_DEVID_PCI 0x0029#define AR9280_DEVID_PCIE 0x002a#define AR9285_DEVID_PCIE 0x002b +#define AR5416_AR9100_DEVID 0x000b + +#define AR9271_USB 0x9271 +#define AR_SUBVENDOR_ID_NOG 0x0e11#define AR_SUBVENDOR_ID_NEW_A 0x7065#define AR5416_MAGIC 0x19641014
Signature · 1 line
1.6.3.3