Instead of deriving the CCK RX gain compensation from BW20/BW40 gain bias and CCK RPL offset fields, write the calibration efuse gain value directly to the efuse bias field. Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/reg.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8922d.c | 9 +++------ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h index 01da0b30a7ab..afec4e166b78 100644 --- a/drivers/net/wireless/realtek/rtw89/core.h +++ b/drivers/net/wireless/realtek/rtw89/core.h @@ -7437,6 +7437,7 @@ struct rtw89_phy_calc_efuse_gain { s8 cck_mean_gain_bias; s8 cck_rpl_ofst; s8 rssi_ofst; + s8 cck_efuse_bias; }; #define RTW89_MAX_PATTERN_NUM 18 diff --git a/drivers/net/wireless/realtek/rtw89/reg.h b/drivers/net/wireless/realtek/rtw89/reg.h index 4829f9fd8eb5..edbfc9514a08 100644 --- a/drivers/net/wireless/realtek/rtw89/reg.h +++ b/drivers/net/wireless/realtek/rtw89/reg.h @@ -11003,6 +11003,7 @@ #define R_CCK_FC0_INV_BE4 0x26090 #define B_CCK_FC0_INV_BE4 GENMASK(18, 0) #define R_GAIN_BIAS_BE4 0x260A0 +#define B_EFUSE_BIAS_BE4 GENMASK(5, 0) #define B_GAIN_BIAS_BW20_BE4 GENMASK(11, 6) #define B_GAIN_BIAS_BW40_BE4 GENMASK(17, 12) diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922d.c b/drivers/net/wireless/realtek/rtw89/rtw8922d.c index 43d9df619260..b874bac9bfee 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8922d.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8922d.c @@ -1720,6 +1720,7 @@ static void rtw8922d_calc_rx_gain_normal_cck(struct rtw89_dev *rtwdev, rx_gain_offset = -rtw8922d_get_rx_gain_by_chan(rtwdev, chan, path, true); calc->cck_mean_gain_bias = (rx_gain_offset & 0x3) << 1; calc->cck_rpl_ofst = (rx_gain_offset >> 2) + gain->cck_rpl_base[phy_idx]; + calc->cck_efuse_bias = rx_gain_offset; } static void rtw8922d_set_rx_gain_normal_cck(struct rtw89_dev *rtwdev, @@ -1731,12 +1732,8 @@ static void rtw8922d_set_rx_gain_normal_cck(struct rtw89_dev *rtwdev, rtw8922d_calc_rx_gain_normal_cck(rtwdev, chan, path, phy_idx, &calc); - rtw89_phy_write32_idx(rtwdev, R_GAIN_BIAS_BE4, B_GAIN_BIAS_BW20_BE4, - calc.cck_mean_gain_bias, phy_idx); - rtw89_phy_write32_idx(rtwdev, R_GAIN_BIAS_BE4, B_GAIN_BIAS_BW40_BE4, - calc.cck_mean_gain_bias, phy_idx); - rtw89_phy_write32_idx(rtwdev, R_CCK_RPL_OFST_BE4, B_CCK_RPL_OFST_BE4, - calc.cck_rpl_ofst, phy_idx); + rtw89_phy_write32_idx(rtwdev, R_GAIN_BIAS_BE4, B_EFUSE_BIAS_BE4, + calc.cck_efuse_bias, phy_idx); } static void rtw8922d_calc_rx_gain_normal_ofdm(struct rtw89_dev *rtwdev, -- 2.53.0