ath9k: RX stucks during heavy traffic in HT40 mode.
Running iperf along with p2p traffic on both TX and RX side then stop one side, then stop the other side, then start it up again, eventually the STA gets into a mode that it can not pass data at all. A hardware workaround for invalid RSSI can make FIFO write pointer to jump over read pointer, causing RX data corruption and repeated DMA. Both TX and RX works fine when the workaround is disabled. To replace the original hardware work around, software looks for frames with post delimiter CRC error and mark the RSSI invalid so that the upperlayer will not use the RSSI associated with this frame. So disable the hardware workaround by updating the appropriate registers. Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
a59b5a5e68
commit
dd8b15b027
@ -1208,6 +1208,19 @@ static void ath9k_hw_4k_set_gain(struct ath_hw *ah,
|
||||
pModal->xatten2Margin[0]);
|
||||
REG_RMW_FIELD(ah, AR_PHY_GAIN_2GHZ + regChainOffset,
|
||||
AR_PHY_GAIN_2GHZ_XATTEN2_DB, pModal->xatten2Db[0]);
|
||||
|
||||
/* Set the block 1 value to block 0 value */
|
||||
REG_RMW_FIELD(ah, AR_PHY_GAIN_2GHZ + 0x1000,
|
||||
AR_PHY_GAIN_2GHZ_XATTEN1_MARGIN,
|
||||
pModal->bswMargin[0]);
|
||||
REG_RMW_FIELD(ah, AR_PHY_GAIN_2GHZ + 0x1000,
|
||||
AR_PHY_GAIN_2GHZ_XATTEN1_DB, pModal->bswAtten[0]);
|
||||
REG_RMW_FIELD(ah, AR_PHY_GAIN_2GHZ + 0x1000,
|
||||
AR_PHY_GAIN_2GHZ_XATTEN2_MARGIN,
|
||||
pModal->xatten2Margin[0]);
|
||||
REG_RMW_FIELD(ah, AR_PHY_GAIN_2GHZ + 0x1000,
|
||||
AR_PHY_GAIN_2GHZ_XATTEN2_DB,
|
||||
pModal->xatten2Db[0]);
|
||||
}
|
||||
|
||||
REG_RMW_FIELD(ah, AR_PHY_RXGAIN + regChainOffset,
|
||||
@ -1215,6 +1228,11 @@ static void ath9k_hw_4k_set_gain(struct ath_hw *ah,
|
||||
REG_RMW_FIELD(ah, AR_PHY_RXGAIN + regChainOffset,
|
||||
AR9280_PHY_RXGAIN_TXRX_MARGIN, pModal->rxTxMarginCh[0]);
|
||||
|
||||
REG_RMW_FIELD(ah, AR_PHY_RXGAIN + 0x1000,
|
||||
AR9280_PHY_RXGAIN_TXRX_ATTEN, txRxAttenLocal);
|
||||
REG_RMW_FIELD(ah, AR_PHY_RXGAIN + 0x1000,
|
||||
AR9280_PHY_RXGAIN_TXRX_MARGIN, pModal->rxTxMarginCh[0]);
|
||||
|
||||
if (AR_SREV_9285_11(ah))
|
||||
REG_WRITE(ah, AR9285_AN_TOP4, (AR9285_AN_TOP4_DEFAULT | 0x14));
|
||||
}
|
||||
@ -1239,7 +1257,7 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
|
||||
ath9k_hw_4k_set_gain(ah, pModal, eep, txRxAttenLocal, 0);
|
||||
|
||||
/* Initialize Ant Diversity settings from EEPROM */
|
||||
if (pModal->version == 3) {
|
||||
if (pModal->version >= 3) {
|
||||
ant_div_control1 = ((pModal->ob_234 >> 12) & 0xf);
|
||||
ant_div_control2 = ((pModal->db1_234 >> 12) & 0xf);
|
||||
regVal = REG_READ(ah, 0x99ac);
|
||||
|
Reference in New Issue
Block a user