ath9k_hw: Remove CHANNEL_CW_INT
PATCH 1/4 ath9k_hw: Remove CHANNEL_CW_INT
From: Sujith Manoharan <[email protected]>
This flag is used for indicating channel interference and we currently do nothing with it, so remove it.
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/calib.c | 4 +--- drivers/net/wireless/ath/ath9k/hw.c | 6 ++---- drivers/net/wireless/ath/ath9k/hw.h | 1 - 3 files changed, 3 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath9k/calib.c +1 -3
@@ -369,7 +369,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)struct ieee80211_channel *c = chan->chan;struct ath9k_hw_cal_data *caldata = ah->caldata; - chan->channelFlags &= (~CHANNEL_CW_INT );if (REG_READ (ah,AR_PHY_AGC_CONTROL ) &AR_PHY_AGC_CONTROL_NF ) {ath_dbg (common,CALIBRATE ,"NF did not complete in calibration window\n" );
@@ -384,7 +383,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)ath_dbg (common,CALIBRATE ,"noise floor failed detected; detected %d, threshold %d\n" , nf, nfThresh); - chan->channelFlags |=CHANNEL_CW_INT ; }if (!caldata) {
@@ -410,7 +408,7 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,int i, j; ah->caldata->channel = chan->channel; - ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT ; + ah->caldata->channelFlags = chan->channelFlags; ah->caldata->chanmode = chan->chanmode; h = ah->caldata->nfCalHist; default_nf =ath9k_hw_get_default_nf (ah, chan);
drivers/net/wireless/ath/ath9k/hw.c +2 -4
@@ -1763,10 +1763,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,ath9k_hw_getnf (ah, ah->curchan); ah->caldata = caldata; -if (caldata && - (chan->channel != caldata->channel || - (chan->channelFlags & ~CHANNEL_CW_INT ) != - (caldata->channelFlags & ~CHANNEL_CW_INT ))) { +if (caldata && (chan->channel != caldata->channel || + chan->channelFlags != caldata->channelFlags)) {/* Operating channel changed, reset channel calibration data */ memset (caldata,0 ,sizeof (*caldata));ath9k_init_nfcal_hist_buffer (ah, chan);
drivers/net/wireless/ath/ath9k/hw.h +0 -1
@@ -363,7 +363,6 @@ enum ath9k_int { ATH9K_INT_NOCARD = 0xffffffff }; -#define CHANNEL_CW_INT 0x00002#define CHANNEL_CCK 0x00020#define CHANNEL_OFDM 0x00040#define CHANNEL_2GHZ 0x00080
Signature · 1 line
1.8.1.5
PATCH 2/4 ath9k_hw: Use helper functions to simplify HW reset
From: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/hw.c | 182 ++++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 79 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +103 -79
@@ -1669,6 +1669,104 @@ bool ath9k_hw_check_alive(struct ath_hw *ah) }EXPORT_SYMBOL (ath9k_hw_check_alive); +static void ath9k_hw_init_mfp (struct ath_hw *ah) +{ +/* Setup MFP options for CCMP */ +if (AR_SREV_9280_20_OR_LATER (ah)) { +/* Mask Retry(b11), PwrMgt(b12), MoreData(b13) to 0 in mgmt +* frames when constructing CCMP AAD. */ +REG_RMW_FIELD (ah,AR_AES_MUTE_MASK1 ,AR_AES_MUTE_MASK1_FC_MGMT , +0xc7ff ); + ah->sw_mgmt_crypto = false; + }else if (AR_SREV_9160_10_OR_LATER (ah)) { +/* Disable hardware crypto for management frames */ +REG_CLR_BIT (ah,AR_PCU_MISC_MODE2 , +AR_PCU_MISC_MODE2_MGMT_CRYPTO_ENABLE ); +REG_SET_BIT (ah,AR_PCU_MISC_MODE2 , +AR_PCU_MISC_MODE2_NO_CRYPTO_FOR_NON_DATA_PKT ); + ah->sw_mgmt_crypto = true; + }else { + ah->sw_mgmt_crypto = true; + } +} + +static void ath9k_hw_reset_opmode (struct ath_hw *ah, +u32 macStaId1,u32 saveDefAntenna) +{ +struct ath_common *common =ath9k_hw_common (ah); + +ENABLE_REGWRITE_BUFFER (ah); + +REG_WRITE (ah,AR_STA_ID0 ,get_unaligned_le32 (common->macaddr)); +REG_WRITE (ah,AR_STA_ID1 ,get_unaligned_le16 (common->macaddr +4 ) + | macStaId1 + |AR_STA_ID1_RTS_USE_DEF + | (ah->config.ack_6mb ?AR_STA_ID1_ACKCTS_6MB :0 ) + | ah->sta_id1_defaults); +ath_hw_setbssidmask (common); +REG_WRITE (ah,AR_DEF_ANTENNA , saveDefAntenna); +ath9k_hw_write_associd (ah); +REG_WRITE (ah,AR_ISR , ~0 ); +REG_WRITE (ah,AR_RSSI_THR ,INIT_RSSI_THR ); + +REGWRITE_BUFFER_FLUSH (ah); + +ath9k_hw_set_operating_mode (ah, ah->opmode); +} + +static void ath9k_hw_init_queues (struct ath_hw *ah) +{ +int i; + +ENABLE_REGWRITE_BUFFER (ah); + +for (i =0 ; i <AR_NUM_DCU ; i++) +REG_WRITE (ah,AR_DQCUMASK (i),1 << i); + +REGWRITE_BUFFER_FLUSH (ah); + + ah->intr_txqs =0 ; +for (i =0 ; i <ATH9K_NUM_TX_QUEUES ; i++) +ath9k_hw_resettxqueue (ah, i); +} + +/* +* For big endian systems turn on swapping for descriptors +*/ +static void ath9k_hw_init_desc (struct ath_hw *ah) +{ +struct ath_common *common =ath9k_hw_common (ah); + +if (AR_SREV_9100 (ah)) { +u32 mask; + mask =REG_READ (ah,AR_CFG ); +if (mask & (AR_CFG_SWRB |AR_CFG_SWTB |AR_CFG_SWRG )) { +ath_dbg (common,RESET ,"CFG Byte Swap Set 0x%x\n" , + mask); + }else { + mask =INIT_CONFIG_STATUS |AR_CFG_SWRB |AR_CFG_SWTB ; +REG_WRITE (ah,AR_CFG , mask); +ath_dbg (common,RESET ,"Setting CFG 0x%x\n" , +REG_READ (ah,AR_CFG )); + } + }else { +if (common->bus_ops->ath_bus_type ==ATH_USB ) { +/* Configure AR9271 target WLAN */ +if (AR_SREV_9271 (ah)) +REG_WRITE (ah,AR_CFG ,AR_CFG_SWRB |AR_CFG_SWTB ); +else +REG_WRITE (ah,AR_CFG ,AR_CFG_SWTD |AR_CFG_SWRD ); + } +#ifdef __BIG_ENDIAN + else if (AR_SREV_9330(ah) || AR_SREV_9340(ah) || + AR_SREV_9550(ah)) + REG_RMW(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB, 0); + else + REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD); +#endif + } +} +/* * Fast channel change: * (Change synthesizer based on channel freq without resetting chip)
@@ -1746,7 +1844,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,u32 saveDefAntenna;u32 macStaId1;u64 tsf =0 ; -int i, r; +int r;bool start_mci_reset = false;bool save_fullsleep = ah->chip_fullsleep;
@@ -1851,22 +1949,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,ath9k_hw_settsf64 (ah, tsf); } -/* Setup MFP options for CCMP */ -if (AR_SREV_9280_20_OR_LATER (ah)) { -/* Mask Retry(b11), PwrMgt(b12), MoreData(b13) to 0 in mgmt -* frames when constructing CCMP AAD. */ -REG_RMW_FIELD (ah,AR_AES_MUTE_MASK1 ,AR_AES_MUTE_MASK1_FC_MGMT , -0xc7ff ); - ah->sw_mgmt_crypto = false; - }else if (AR_SREV_9160_10_OR_LATER (ah)) { -/* Disable hardware crypto for management frames */ -REG_CLR_BIT (ah,AR_PCU_MISC_MODE2 , -AR_PCU_MISC_MODE2_MGMT_CRYPTO_ENABLE ); -REG_SET_BIT (ah,AR_PCU_MISC_MODE2 , -AR_PCU_MISC_MODE2_NO_CRYPTO_FOR_NON_DATA_PKT ); - ah->sw_mgmt_crypto = true; - }else - ah->sw_mgmt_crypto = true; +ath9k_hw_init_mfp (ah);if (IS_CHAN_OFDM (chan) ||IS_CHAN_HT (chan))ath9k_hw_set_delta_slope (ah, chan);
@@ -1874,24 +1957,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,ath9k_hw_spur_mitigate_freq (ah, chan); ah->eep_ops->set_board_values (ah, chan); -ENABLE_REGWRITE_BUFFER (ah); - -REG_WRITE (ah,AR_STA_ID0 ,get_unaligned_le32 (common->macaddr)); -REG_WRITE (ah,AR_STA_ID1 ,get_unaligned_le16 (common->macaddr +4 ) - | macStaId1 - |AR_STA_ID1_RTS_USE_DEF - | (ah->config. - ack_6mb ?AR_STA_ID1_ACKCTS_6MB :0 ) - | ah->sta_id1_defaults); -ath_hw_setbssidmask (common); -REG_WRITE (ah,AR_DEF_ANTENNA , saveDefAntenna); -ath9k_hw_write_associd (ah); -REG_WRITE (ah,AR_ISR , ~0 ); -REG_WRITE (ah,AR_RSSI_THR ,INIT_RSSI_THR ); - -REGWRITE_BUFFER_FLUSH (ah); - -ath9k_hw_set_operating_mode (ah, ah->opmode); +ath9k_hw_reset_opmode (ah, macStaId1, saveDefAntenna); r =ath9k_hw_rf_set_freq (ah, chan);if (r)
@@ -1899,17 +1965,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,ath9k_hw_set_clockrate (ah); -ENABLE_REGWRITE_BUFFER (ah); - -for (i =0 ; i <AR_NUM_DCU ; i++) -REG_WRITE (ah,AR_DQCUMASK (i),1 << i); - -REGWRITE_BUFFER_FLUSH (ah); - - ah->intr_txqs =0 ; -for (i =0 ; i <ATH9K_NUM_TX_QUEUES ; i++) -ath9k_hw_resettxqueue (ah, i); - +ath9k_hw_init_queues (ah);ath9k_hw_init_interrupt_masks (ah, ah->opmode);ath9k_hw_ani_cache_ini_regs (ah);ath9k_hw_init_qos (ah);
@@ -1964,38 +2020,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,REGWRITE_BUFFER_FLUSH (ah); -/* -* For big endian systems turn on swapping for descriptors -*/ -if (AR_SREV_9100 (ah)) { -u32 mask; - mask =REG_READ (ah,AR_CFG ); -if (mask & (AR_CFG_SWRB |AR_CFG_SWTB |AR_CFG_SWRG )) { -ath_dbg (common,RESET ,"CFG Byte Swap Set 0x%x\n" , - mask); - }else { - mask = -INIT_CONFIG_STATUS |AR_CFG_SWRB |AR_CFG_SWTB ; -REG_WRITE (ah,AR_CFG , mask); -ath_dbg (common,RESET ,"Setting CFG 0x%x\n" , -REG_READ (ah,AR_CFG )); - } - }else { -if (common->bus_ops->ath_bus_type ==ATH_USB ) { -/* Configure AR9271 target WLAN */ -if (AR_SREV_9271 (ah)) -REG_WRITE (ah,AR_CFG ,AR_CFG_SWRB |AR_CFG_SWTB ); -else -REG_WRITE (ah,AR_CFG ,AR_CFG_SWTD |AR_CFG_SWRD ); - } -#ifdef __BIG_ENDIAN - else if (AR_SREV_9330(ah) || AR_SREV_9340(ah) || - AR_SREV_9550(ah)) - REG_RMW(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB, 0); - else - REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD); -#endif - } +ath9k_hw_init_desc (ah);if (ath9k_hw_btcoex_is_enabled (ah))ath9k_hw_btcoex_enable (ah);
@@ -2008,7 +2033,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,if (AR_SREV_9300_20_OR_LATER (ah)) {ar9003_hw_bb_watchdog_config (ah); -ar9003_hw_disable_phy_restart (ah); }
Signature · 1 line
1.8.1.5
PATCH 3/4 ath9k_hw: Update initvals for AR9462
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>
--- .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 49 +++++++++++----------- 1 file changed, 24 insertions(+), 25 deletions(-)
drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h +24 -25
@@ -37,28 +37,28 @@ static const u32 ar9462_pciephy_clkreq_enable_L1_2p0[][2] = {/* Addr allmodes */ {0x00018c00, 0x18253ede}, {0x00018c04, 0x000801d8}, - {0x00018c08, 0x0003580c}, + {0x00018c08, 0x0003780c}, };static const u32 ar9462_2p0_baseband_postamble[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ {0x00009810 ,0xd00a8005 ,0xd00a8005 ,0xd00a8011 ,0xd00a800d }, {0x00009820 ,0x206a022e ,0x206a022e ,0x206a012e ,0x206a01ae }, - {0x00009824 ,0x5ac640de ,0x5ac640d0 ,0x5ac640d0 ,0x63c640da }, + {0x00009824 ,0x63c640de ,0x5ac640d0 ,0x5ac640d0 ,0x63c640da }, {0x00009828 ,0x0796be89 ,0x0696b081 ,0x0696b881 ,0x09143e81 }, {0x0000982c ,0x05eea6d4 ,0x05eea6d4 ,0x05eea6d4 ,0x05eea6d4 }, {0x00009830 ,0x0000059c ,0x0000059c ,0x0000119c ,0x0000119c }, {0x00009c00 ,0x000000c4 ,0x000000c4 ,0x000000c4 ,0x000000c4 }, - {0x00009e00 ,0x0372111a ,0x0372111a ,0x037216a0 ,0x037216a0 }, + {0x00009e00 ,0x0372111a ,0x0372111a ,0x037216a0 ,0x037216a2 }, {0x00009e04 ,0x001c2020 ,0x001c2020 ,0x001c2020 ,0x001c2020 }, {0x00009e0c ,0x6c4000e2 ,0x6d4000e2 ,0x6d4000e2 ,0x6c4000d8 }, {0x00009e10 ,0x92c88d2e ,0x7ec88d2e ,0x7ec84d2e ,0x7ec86d2e }, - {0x00009e14 ,0x37b95d5e ,0x37b9605e ,0x3376605e ,0x32395d5e }, + {0x00009e14 ,0x37b95d5e ,0x37b9605e ,0x3236605e ,0x32365a5e }, {0x00009e18 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, {0x00009e1c ,0x0001cf9c ,0x0001cf9c ,0x00021f9c ,0x00021f9c }, {0x00009e20 ,0x000003b5 ,0x000003b5 ,0x000003ce ,0x000003ce }, {0x00009e2c ,0x0000001c ,0x0000001c ,0x00000021 ,0x00000021 }, - {0x00009e3c ,0xcf946222 ,0xcf946222 ,0xcfd5c782 ,0xcfd5c282 }, + {0x00009e3c ,0xcf946220 ,0xcf946220 ,0xcfd5c782 ,0xcfd5c282 }, {0x00009e44 ,0x62321e27 ,0x62321e27 ,0xfe291e27 ,0xfe291e27 }, {0x00009e48 ,0x5030201a ,0x5030201a ,0x50302012 ,0x50302012 }, {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
@@ -82,9 +82,9 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = { {0x0000a2d0, 0x00041981, 0x00041981, 0x00041981, 0x00041982}, {0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b}, {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, - {0x0000a3a4, 0x00000010, 0x00000010, 0x00000000, 0x00000000}, + {0x0000a3a4, 0x00000050, 0x00000050, 0x00000000, 0x00000000}, {0x0000a3a8, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa}, - {0x0000a3ac, 0xaaaaaa00, 0xaaaaaa30, 0xaaaaaa00, 0xaaaaaa00}, + {0x0000a3ac, 0xaaaaaa00, 0xaa30aa30, 0xaaaaaa00, 0xaaaaaa00}, {0x0000a41c, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce}, {0x0000a420, 0x000001ce, 0x000001ce, 0x000001ce, 0x000001ce}, {0x0000a424, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},
@@ -363,14 +363,14 @@ static const u32 ar9462_pciephy_clkreq_disable_L1_2p0[][2] = {/* Addr allmodes */ {0x00018c00, 0x18213ede}, {0x00018c04, 0x000801d8}, - {0x00018c08, 0x0003580c}, + {0x00018c08, 0x0003780c}, };static const u32 ar9462_pciephy_pll_on_clkreq_disable_L1_2p0[][2 ] = {/* Addr allmodes */ {0x00018c00 ,0x18212ede }, {0x00018c04 ,0x000801d8 }, - {0x00018c08 ,0x0003580c }, + {0x00018c08 ,0x0003780c }, }; static const u32 ar9462_2p0_radio_postamble_sys2ant[][5] = {
@@ -775,7 +775,7 @@ static const u32 ar9462_2p0_baseband_core[][2] = { {0x00009fc0, 0x803e4788}, {0x00009fc4, 0x0001efb5}, {0x00009fcc, 0x40000014}, - {0x00009fd0, 0x01193b93}, + {0x00009fd0, 0x0a193b93}, {0x0000a20c, 0x00000000}, {0x0000a220, 0x00000000}, {0x0000a224, 0x00000000},
@@ -850,7 +850,7 @@ static const u32 ar9462_2p0_baseband_core[][2] = { {0x0000a7cc, 0x00000000}, {0x0000a7d0, 0x00000000}, {0x0000a7d4, 0x00000004}, - {0x0000a7dc, 0x00000001}, + {0x0000a7dc, 0x00000000}, {0x0000a7f0, 0x80000000}, {0x0000a8d0, 0x004b6a8e}, {0x0000a8d4, 0x00000820},
@@ -886,7 +886,7 @@ static const u32 ar9462_modes_high_ob_db_tx_gain_table_2p0[][5] = { {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584}, {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800}, {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000}, - {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9}, + {0x0000a410, 0x000050da, 0x000050da, 0x000050de, 0x000050de}, {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000}, {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
@@ -906,20 +906,20 @@ static const u32 ar9462_modes_high_ob_db_tx_gain_table_2p0[][5] = { {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640}, {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660}, {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861}, - {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81}, - {0x0000a54c, 0x59025eb6, 0x59025eb6, 0x42001a83, 0x42001a83}, - {0x0000a550, 0x5d025ef6, 0x5d025ef6, 0x44001c84, 0x44001c84}, + {0x0000a548, 0x55025eb3, 0x55025eb3, 0x3e001a81, 0x3e001a81}, + {0x0000a54c, 0x58025ef3, 0x58025ef3, 0x42001a83, 0x42001a83}, + {0x0000a550, 0x5d025ef6, 0x5d025ef6, 0x44001a84, 0x44001a84}, {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3}, {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5}, {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9}, {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb}, - {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec}, - {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec}, - {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec}, - {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec}, - {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec}, - {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec}, - {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec}, + {0x0000a564, 0x751ffff6, 0x751ffff6, 0x56001eec, 0x56001eec}, + {0x0000a568, 0x751ffff6, 0x751ffff6, 0x58001ef0, 0x58001ef0}, + {0x0000a56c, 0x751ffff6, 0x751ffff6, 0x5a001ef4, 0x5a001ef4}, + {0x0000a570, 0x751ffff6, 0x751ffff6, 0x5c001ff6, 0x5c001ff6}, + {0x0000a574, 0x751ffff6, 0x751ffff6, 0x5c001ff6, 0x5c001ff6}, + {0x0000a578, 0x751ffff6, 0x751ffff6, 0x5c001ff6, 0x5c001ff6}, + {0x0000a57c, 0x751ffff6, 0x751ffff6, 0x5c001ff6, 0x5c001ff6}, {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
@@ -1053,7 +1053,6 @@ static const u32 ar9462_2p0_mac_core[][2] = { {0x00008044, 0x00000000}, {0x00008048, 0x00000000}, {0x0000804c, 0xffffffff}, - {0x00008050, 0xffffffff}, {0x00008054, 0x00000000}, {0x00008058, 0x00000000}, {0x0000805c, 0x000fc78f},
@@ -1117,9 +1116,9 @@ static const u32 ar9462_2p0_mac_core[][2] = { {0x000081f8, 0x00000000}, {0x000081fc, 0x00000000}, {0x00008240, 0x00100000}, - {0x00008244, 0x0010f424}, + {0x00008244, 0x0010f400}, {0x00008248, 0x00000800}, - {0x0000824c, 0x0001e848}, + {0x0000824c, 0x0001e800}, {0x00008250, 0x00000000}, {0x00008254, 0x00000000}, {0x00008258, 0x00000000},
Signature · 1 line
1.8.1.5
PATCH 4/4 ath9k_hw: Fix fixed antenna for AR9462
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
When the RX chainmask is set to 0x2 for AR9462, certain values from chain1 have to be programmed for chain0 also.
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +17 -0
@@ -3606,6 +3606,12 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) value =ar9003_hw_ant_ctrl_common_2_get (ah, is2ghz);REG_RMW_FIELD (ah,AR_PHY_SWITCH_COM_2 ,AR_SWITCH_TABLE_COM2_ALL , value); +if ((AR_SREV_9462 (ah)) && (ah->rxchainmask ==0x2 )) { + value =ar9003_hw_ant_ctrl_chain_get (ah,1 , is2ghz); +REG_RMW_FIELD (ah, switch_chain_reg[0 ], +AR_SWITCH_TABLE_ALL , value); + } +for (chain =0 ; chain <AR9300_MAX_CHAINS ; chain++) {if ((ah->rxchainmask &BIT (chain)) || (ah->txchainmask &BIT (chain))) {
@@ -3772,6 +3778,17 @@ static void ar9003_hw_atten_apply(struct ath_hw *ah, struct ath9k_channel *chan) AR_PHY_EXT_ATTEN_CTL_2, }; +if ((AR_SREV_9462 (ah)) && (ah->rxchainmask ==0x2 )) { + value =ar9003_hw_atten_chain_get (ah,1 , chan); +REG_RMW_FIELD (ah, ext_atten_reg[0 ], +AR_PHY_EXT_ATTEN_CTL_XATTEN1_DB , value); + + value =ar9003_hw_atten_chain_get_margin (ah,1 , chan); +REG_RMW_FIELD (ah, ext_atten_reg[0 ], +AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN , + value); + } +/* Test value. if 0 then attenuation is unused. Don't load anything. */ for (i =0 ; i <3 ; i++) {if (ah->txchainmask &BIT (i)) {
Signature · 1 line
1.8.1.5