upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 00:02:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtw88: Use RF_CFGCH instead of hard coded 0x18

Browse source 
While debugging some funky register reads of 0xaeaea from RF_CFGCH
resulting in "rtw880: [TXGAPK] unknown channel 234!!" more of these
reads came to my attention hidden by using the register index rather
than the defined value.  Make this more grep-able.

MFC after:	3 days
This commit is contained in:
Bjoern A. Zeeb 2023-10-05 14:01:48 +00:00
parent 1137943b1c
commit 4f3b2bba24
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/contrib/dev/rtw88/rtw8822c.c
View file

@ -2204,7 +2204,11 @@ static void rtw8822c_set_channel_rf(struct rtw_dev *rtwdev, u8 channel, u8 bw)
u32 rf_reg18 = 0;
u32 rf_rxbb = 0;
#if defined(__linux__)
rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK);
#elif defined(__FreeBSD__)
rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK);
#endif
rf_reg18 &= ~(RF18_BAND_MASK | RF18_CHANNEL_MASK | RF18_RFSI_MASK |
RF18_BW_MASK);
@ -3277,7 +3281,11 @@ static void rtw8822c_dpk_information(struct rtw_dev *rtwdev)
u32 reg;
u8 band_shift;
#if defined(__linux__)
reg = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK);
#elif defined(__FreeBSD__)
reg = rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK);
#endif
band_shift = FIELD_GET(BIT(16), reg);
dpk_info->dpk_band = 1 << band_shift;
@ -4158,7 +4166,11 @@ static bool rtw8822c_dpk_reload(struct rtw_dev *rtwdev)
dpk_info->is_reload = false;
#if defined(__linux__)
channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK) & 0xff);
#elif defined(__FreeBSD__)
channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK) & 0xff);
#endif
if (channel == dpk_info->dpk_ch) {
rtw_dbg(rtwdev, RTW_DBG_RFK,