AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-11 22:29:00 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ath9k: ath9k_hw_loadnf: use REG_RMW

Browse Source 
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Oleksij Rempel 2015-03-22 19:29:54 +01:00 committed by Kalle Valo
parent 9c05babd93
commit 9830ba6c9a
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/wireless/ath/ath9k/calib.c
View File

@ -238,7 +238,6 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
{ {
struct ath9k_nfcal_hist *h = NULL; struct ath9k_nfcal_hist *h = NULL;
unsigned i, j; unsigned i, j;
int32_t val;
u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask; u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
struct ath_common *common = ath9k_hw_common(ah); struct ath_common *common = ath9k_hw_common(ah);
s16 default_nf = ath9k_hw_get_default_nf(ah, chan); s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
@ -246,6 +245,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
if (ah->caldata) if (ah->caldata)
h = ah->caldata->nfCalHist; h = ah->caldata->nfCalHist;
ENABLE_REG_RMW_BUFFER(ah);
for (i = 0; i < NUM_NF_READINGS; i++) { for (i = 0; i < NUM_NF_READINGS; i++) {
if (chainmask & (1 << i)) { if (chainmask & (1 << i)) {
s16 nfval; s16 nfval;
@ -258,10 +258,8 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
else else
nfval = default_nf; nfval = default_nf;
val = REG_READ(ah, ah->nf_regs[i]); REG_RMW(ah, ah->nf_regs[i],
val &= 0xFFFFFE00; (((u32) nfval << 1) & 0x1ff), 0x1ff);
val |= (((u32) nfval << 1) & 0x1ff);
REG_WRITE(ah, ah->nf_regs[i], val);
} }
} }
@ -274,6 +272,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL, REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
AR_PHY_AGC_CONTROL_NO_UPDATE_NF); AR_PHY_AGC_CONTROL_NO_UPDATE_NF);
REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF); REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
REG_RMW_BUFFER_FLUSH(ah);
/* /*
* Wait for load to complete, should be fast, a few 10s of us. * Wait for load to complete, should be fast, a few 10s of us.
@ -309,19 +308,17 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
* by the median we just loaded. This will be initial (and max) value * by the median we just loaded. This will be initial (and max) value
* of next noise floor calibration the baseband does. * of next noise floor calibration the baseband does.
*/ */
ENABLE_REGWRITE_BUFFER(ah); ENABLE_REG_RMW_BUFFER(ah);
for (i = 0; i < NUM_NF_READINGS; i++) { for (i = 0; i < NUM_NF_READINGS; i++) {
if (chainmask & (1 << i)) { if (chainmask & (1 << i)) {
if ((i >= AR5416_MAX_CHAINS) && !IS_CHAN_HT40(chan)) if ((i >= AR5416_MAX_CHAINS) && !IS_CHAN_HT40(chan))
continue; continue;
val = REG_READ(ah, ah->nf_regs[i]); REG_RMW(ah, ah->nf_regs[i],
val &= 0xFFFFFE00; (((u32) (-50) << 1) & 0x1ff), 0x1ff);
val |= (((u32) (-50) << 1) & 0x1ff);
REG_WRITE(ah, ah->nf_regs[i], val);
} }
} }
REGWRITE_BUFFER_FLUSH(ah); REG_RMW_BUFFER_FLUSH(ah);
return 0; return 0;
} }