ath9k_hw: fix more bitfield related endian issues
PATCH 1/1 ath9k_hw: fix more bitfield related endian issues
A few LNA control related flags were also specified as a bitfields, however for some strange reason they were written in big-endian order this time. Fix this by using flags instead.
--- drivers/net/wireless/ath/ath9k/eeprom.h | 14 ++++++++++---- drivers/net/wireless/ath/ath9k/eeprom_def.c | 11 ++++++----- 2 files changed, 16 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath9k/eeprom.h +10 -4
@@ -236,6 +236,15 @@#define CTL_EDGE_TPOWER (_ctl) ((_ctl) & 0x3f)#define CTL_EDGE_FLAGS (_ctl) (((_ctl) >> 6) & 0x03) +#define LNA_CTL_BUF_MODE BIT(0) +#define LNA_CTL_ISEL_LO BIT(1) +#define LNA_CTL_ISEL_HI BIT(2) +#define LNA_CTL_BUF_IN BIT(3) +#define LNA_CTL_FEM_BAND BIT(4) +#define LNA_CTL_LOCAL_BIAS BIT(5) +#define LNA_CTL_FORCE_XPA BIT(6) +#define LNA_CTL_USE_ANT1 BIT(7) +enum eeprom_param {EEP_NFTHRESH_5 ,EEP_NFTHRESH_2 ,
@@ -381,10 +390,7 @@ struct modal_eep_header {u8 xatten2Margin[AR5416_MAX_CHAINS ];u8 ob_ch1;u8 db_ch1; - u8 useAnt1:1, - force_xpaon:1, - local_bias:1, - femBandSelectUsed:1, xlnabufin:1, xlnaisel:2, xlnabufmode:1; +u8 lna_ctl;u8 miscBits;u16 xpaBiasLvlFreq[3 ];u8 futureModal[6 ];
drivers/net/wireless/ath/ath9k/eeprom_def.c +6 -5
@@ -451,9 +451,10 @@ static void ath9k_hw_def_set_board_values(struct ath_hw *ah,ath9k_hw_analog_shift_rmw (ah,AR_AN_TOP2 ,AR_AN_TOP2_LOCALBIAS ,AR_AN_TOP2_LOCALBIAS_S , - pModal->local_bias); + !!(pModal->lna_ctl & +LNA_CTL_LOCAL_BIAS ));REG_RMW_FIELD (ah,AR_PHY_XPA_CFG ,AR_PHY_FORCE_XPA_CFG , - pModal->force_xpaon); + !!(pModal->lna_ctl &LNA_CTL_FORCE_XPA )); } REG_RMW_FIELD(ah, AR_PHY_SETTLING, AR_PHY_SETTLING_SWITCH,
@@ -1432,9 +1433,9 @@ static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah, num_ant_config =1 ; -if (pBase->version >=0x0E0D ) -if (pModal->useAnt1) - num_ant_config +=1 ; +if (pBase->version >=0x0E0D && + (pModal->lna_ctl &LNA_CTL_USE_ANT1 )) + num_ant_config +=1 ;return num_ant_config; }
Signature · 1 line
1.7.3.2
Quoted 6 lines · Felix Fietkau
A few LNA control related flags were also specified as a bitfields, however for some strange reason they were written in big-endian order this time. Fix this by using flags instead.
Signed-off-by Felix Fietkau <[email protected]>
Why does this merit [email protected] (misspelled, BTW) inclusion?
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
Quoted 7 lines · John W. Linville
Quoted 6 lines · Felix Fietkau
A few LNA control related flags were also specified as a bitfields, however for some strange reason they were written in big-endian order this time. Fix this by using flags instead.
Signed-off-by Felix Fietkau <[email protected]>
Oops.
Quoted 1 line
Why does this merit [email protected] (misspelled, BTW) inclusion?
Trivial bug that can easily mess up baseband settings in some cases. Not sure if it could also mess with tx power.
- Felix
Quoted 6 lines · Felix Fietkau
Quoted 5 lines · John W. Linville
Quoted 4 lines · Felix Fietkau
A few LNA control related flags were also specified as a bitfields, however for some strange reason they were written in big-endian order this time. Fix this by using flags instead.
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Signed-off-by Felix Fietkau <[email protected]>Oops.
Quoted 1 line
Why does this merit [email protected] (misspelled, BTW) inclusion?
Trivial bug that can easily mess up baseband settings in some cases. Not sure if it could also mess with tx power.
See my reply to the related bug. Should this go to 2.6.37?
Thanks,
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.