wifi: rtw89: refine TAS and DAG
Ping-Ke Shih
maintainercover wifi: rtw89: refine TAS and DAG
TAS (Time Averaged SAR) and DAG (Dynamic Antenna Gain) are mechanisms to use higher TX power under regulation to get higher performance. Refine them by first four patches.
The last patch is to modify MAC register to resolve interoperability problem with 11ax AP.
Dian-Syuan Yang (1):
wifi: rtw89: set force HE TB mode when connecting to 11ax AP
Kuan-Chung Chen (4):
wifi: rtw89: add support for negative values of dBm to linear
conversion
wifi: rtw89: refine mechanism of TAS
wifi: rtw89: enable dynamic antenna gain based on country
wifi: rtw89: 8922a: enable dynamic antenna gain
drivers/net/wireless/realtek/rtw89/chan.c | 10 +- drivers/net/wireless/realtek/rtw89/core.c | 4 +- drivers/net/wireless/realtek/rtw89/core.h | 30 +- drivers/net/wireless/realtek/rtw89/debug.c | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 1 + drivers/net/wireless/realtek/rtw89/fw.h | 6 + drivers/net/wireless/realtek/rtw89/mac.c | 26 ++ drivers/net/wireless/realtek/rtw89/mac.h | 2 + drivers/net/wireless/realtek/rtw89/mac80211.c | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 41 +- drivers/net/wireless/realtek/rtw89/phy.h | 7 + drivers/net/wireless/realtek/rtw89/reg.h | 32 +- drivers/net/wireless/realtek/rtw89/regd.c | 27 ++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../wireless/realtek/rtw89/rtw8852b_common.c | 6 +- .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 55 ++- drivers/net/wireless/realtek/rtw89/sar.c | 369 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/sar.h | 5 +- drivers/net/wireless/realtek/rtw89/util.c | 215 ++++++---- drivers/net/wireless/realtek/rtw89/util.h | 8 +- 24 files changed, 658 insertions(+), 195 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/5 wifi: rtw89: add support for negative values of dBm to linear conversion
From: Kuan-Chung Chen <[email protected]>
Enhanced the dBm to linear conversion function to accommodate negative dBm values and improved the precision from 1 dBm to 0.25 dBm.
--- .../wireless/realtek/rtw89/rtw8852b_common.c | 6 +- drivers/net/wireless/realtek/rtw89/util.c | 215 +++++++++++------- drivers/net/wireless/realtek/rtw89/util.h | 8 +- 3 files changed, 137 insertions(+), 92 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852b_common.c +3 -3
@@ -621,9 +621,9 @@ static void rtw8852bt_ext_loss_avg_update(struct rtw89_dev *rtwdev,if (ext_loss_a == ext_loss_b) { ext_loss_avg = ext_loss_a; }else { - linear =rtw89_db_2_linear (abs (ext_loss_a - ext_loss_b)) +1 ; - linear =DIV_ROUND_CLOSEST_ULL (linear /2 ,1 <<RTW89_LINEAR_FRAC_BITS ); - ext_loss_avg =rtw89_linear_2_db (linear); + linear =rtw89_db_to_linear (abs (ext_loss_a - ext_loss_b)) +1 ; + linear /=2 ; + ext_loss_avg =rtw89_linear_to_db (linear); ext_loss_avg +=min (ext_loss_a, ext_loss_b); }
drivers/net/wireless/realtek/rtw89/util.c +130 -85
236 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/util.h +4 -4
@@ -6,8 +6,6 @@#include "core.h" -#define RTW89_LINEAR_FRAC_BITS 3 -#define rtw89_iterate_vifs_bh (rtwdev, iterator, data) \ ieee80211_iterate_active_interfaces_atomic((rtwdev)->hw, \ IEEE80211_IFACE_ITER_NORMAL, iterator, data)
@@ -75,8 +73,10 @@ static inline void ether_addr_copy_mask(u8 *dst, const u8 *src, u8 mask) } } -u32 rtw89_linear_2_db (u64 linear); -u64 rtw89_db_2_linear (u32 db); +s32 rtw89_linear_to_db_quarter (u64 val); +s32 rtw89_linear_to_db (u64 val); +u64 rtw89_db_quarter_to_linear (s32 db); +u64 rtw89_db_to_linear (s32 db);void rtw89_might_trailing_ellipsis (char *buf,size_t size,ssize_t used);#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 1/5] wifi: rtw89: add support for negative values of dBm to linear conversion
Quoted 7 lines · Ping-Ke Shih
From: Kuan-Chung Chen <[email protected]>
Enhanced the dBm to linear conversion function to accommodate negative dBm values and improved the precision from 1 dBm to 0.25 dBm.
Signed-off-by Kuan-Chung Chen <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
5 patch(es) applied to rtw-next branch of rtw.git, thanks.
3df4583ae0cf wifi: rtw89: add support for negative values of dBm to linear conversion 8ef675fc797b wifi: rtw89: refine mechanism of TAS9c225e119866 wifi: rtw89: enable dynamic antenna gain based on country 6f039d9ba9cb wifi: rtw89: 8922a: enable dynamic antenna gain a9b56f219a0f wifi: rtw89: set force HE TB mode when connecting to 11ax AP
Ping-Ke Shih
maintainerPATCH 2/5 wifi: rtw89: refine mechanism of TAS
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
TAS state switching mechanism now incorporates the TX ratio as a decision parameter. The average power calculation has been improved by using a higher resolution conversion from dBm to linear. During scan or MCC operations, TAS state is forced to static SAR and suspend the average power calculation. Additionally, TAS window size depends on the regulatory domain and band to ensure compliance.
TAS is enabled when permitted by the regulatory domain and is currently supported on the 8852CE.
For debugging, add a flag to disable_dm that can stop TAS mechanism.
--- drivers/net/wireless/realtek/rtw89/chan.c | 10 +- drivers/net/wireless/realtek/rtw89/core.c | 4 +- drivers/net/wireless/realtek/rtw89/core.h | 28 +- drivers/net/wireless/realtek/rtw89/debug.c | 1 + drivers/net/wireless/realtek/rtw89/fw.h | 6 + drivers/net/wireless/realtek/rtw89/phy.c | 24 ++ drivers/net/wireless/realtek/rtw89/regd.c | 13 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + drivers/net/wireless/realtek/rtw89/sar.c | 369 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/sar.h | 5 +- 15 files changed, 377 insertions(+), 91 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +9 -1
@@ -8,6 +8,7 @@#include "fw.h" #include "mac.h" #include "ps.h" +#include "sar.h" #include "util.h" static void rtw89_swap_chanctx(struct rtw89_dev *rtwdev,
@@ -2673,6 +2674,7 @@ int rtw89_chanctx_ops_assign_vif(struct rtw89_dev *rtwdev,struct rtw89_hal *hal = &rtwdev->hal;struct rtw89_entity_mgnt *mgnt = &hal->entity_mgnt;struct rtw89_entity_weight w = {}; +int ret; rtwvif_link->chanctx_idx = cfg->idx; rtwvif_link->chanctx_assigned = true;
@@ -2692,7 +2694,13 @@ int rtw89_chanctx_ops_assign_vif(struct rtw89_dev *rtwdev,rtw89_swap_chanctx (rtwdev, cfg->idx,RTW89_CHANCTX_0 ); out: -return rtw89_set_channel (rtwdev); + ret =rtw89_set_channel (rtwdev); +if (ret) +return ret; + +rtw89_tas_reset (rtwdev, true); + +return 0 ; } void rtw89_chanctx_ops_unassign_vif(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/core.c +2 -2
@@ -4601,8 +4601,6 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)rtw89_mac_cfg_phy_rpt_bands (rtwdev, true);rtw89_mac_update_rts_threshold (rtwdev); -rtw89_tas_reset (rtwdev); - ret =rtw89_hci_start (rtwdev);if (ret) {rtw89_err (rtwdev,"failed to start hci\n" );
@@ -4956,6 +4954,7 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvrtw89_chip_rfk_scan (rtwdev, rtwvif_link, true);rtw89_hci_recalc_int_mit (rtwdev);rtw89_phy_config_edcca (rtwdev, bb, true); +rtw89_tas_scan (rtwdev, true);rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL , mac_addr); }
@@ -4982,6 +4981,7 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,rtw89_btc_ntfy_scan_finish (rtwdev, rtwvif_link->phy_idx); bb =rtw89_get_bb_ctx (rtwdev, rtwvif_link->phy_idx);rtw89_phy_config_edcca (rtwdev, bb, false); +rtw89_tas_scan (rtwdev, false); rtwdev->scanning = false;rtw89_for_each_active_bb (rtwdev, bb)
drivers/net/wireless/realtek/rtw89/core.h +21 -7
@@ -4240,6 +4240,7 @@ enum rtw89_chanctx_state {enum rtw89_chanctx_callbacks {RTW89_CHANCTX_CALLBACK_PLACEHOLDER ,RTW89_CHANCTX_CALLBACK_RFK , +RTW89_CHANCTX_CALLBACK_TAS ,NUM_OF_RTW89_CHANCTX_CALLBACKS , };
@@ -4281,6 +4282,7 @@ struct rtw89_chip_info {bool support_unii4;bool support_rnr;bool support_ant_gain; +bool support_tas;bool ul_tb_waveform_ctrl;bool ul_tb_pwr_diff;bool rx_freq_frome_ie;
@@ -4679,18 +4681,29 @@ struct rtw89_6ghz_span {enum rtw89_tas_state {RTW89_TAS_STATE_DPR_OFF ,RTW89_TAS_STATE_DPR_ON , -RTW89_TAS_STATE_DPR_FORBID , +RTW89_TAS_STATE_STATIC_SAR , }; -#define RTW89_TAS_MAX_WINDOW 50 +#define RTW89_TAS_TX_RATIO_WINDOW 6 +#define RTW89_TAS_TXPWR_WINDOW 180struct rtw89_tas_info { -s16 txpwr_history[RTW89_TAS_MAX_WINDOW ]; -s32 total_txpwr; -u8 cur_idx; -s8 dpr_gap; -s8 delta; +u16 tx_ratio_history[RTW89_TAS_TX_RATIO_WINDOW ]; +u64 txpwr_history[RTW89_TAS_TXPWR_WINDOW ]; +u8 txpwr_head_idx; +u8 txpwr_tail_idx; +u8 tx_ratio_idx; +u16 total_tx_ratio; +u64 total_txpwr; +u64 instant_txpwr; +u32 window_size; +s8 dpr_on_threshold; +s8 dpr_off_threshold; +enum rtw89_tas_state backup_state;enum rtw89_tas_state state; +bool keep_history; +bool block_regd;bool enable; +bool pause; };struct rtw89_chanctx_cfg {
@@ -4748,6 +4761,7 @@ struct rtw89_edcca_bak {enum rtw89_dm_type {RTW89_DM_DYNAMIC_EDCCA ,RTW89_DM_THERMAL_PROTECT , +RTW89_DM_TAS , };#define RTW89_THERMAL_PROT_LV_MAX 5
drivers/net/wireless/realtek/rtw89/debug.c +1 -0
@@ -4154,6 +4154,7 @@ static const struct rtw89_disabled_dm_info { } rtw89_disabled_dm_infos[] = {DM_INFO (DYNAMIC_EDCCA ),DM_INFO (THERMAL_PROTECT ), + DM_INFO(TAS), }; static ssize_t
drivers/net/wireless/realtek/rtw89/fw.h +6 -0
@@ -4543,6 +4543,12 @@ struct rtw89_c2h_rfk_report {u8 version; } __packed; +struct rtw89_c2h_rf_tas_info { +struct rtw89_c2h_hdr hdr; +__le32 cur_idx; +__le16 txpwr_history[20 ]; +} __packed; +#define RTW89_FW_RSVD_PLE_SIZE 0x800#define RTW89_FW_BACKTRACE_INFO_SIZE 8
drivers/net/wireless/realtek/rtw89/phy.c +24 -0
@@ -3459,6 +3459,30 @@ rtw89_phy_c2h_rfk_report_state(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u3static void rtw89_phy_c2h_rfk_log_tas_pwr (struct rtw89_dev *rtwdev,struct sk_buff *c2h,u32 len) { +const struct rtw89_c2h_rf_tas_info *rf_tas = + (const struct rtw89_c2h_rf_tas_info *)c2h->data; +const enum rtw89_sar_sources src = rtwdev->sar.src; +struct rtw89_tas_info *tas = &rtwdev->tas; +u64 linear =0 ; +u32 i, cur_idx; +s16 txpwr; + +if (!tas->enable || src ==RTW89_SAR_SOURCE_NONE ) +return ; + + cur_idx =le32_to_cpu (rf_tas->cur_idx); +for (i =0 ; i < cur_idx; i++) { + txpwr = (s16 )le16_to_cpu (rf_tas->txpwr_history[i]); + linear +=rtw89_db_quarter_to_linear (txpwr); + +rtw89_debug (rtwdev,RTW89_DBG_SAR , +"tas: index: %u, txpwr: %d\n" , i, txpwr); + } + +if (cur_idx ==0 ) + tas->instant_txpwr =rtw89_db_to_linear (0 ); +else + tas->instant_txpwr =DIV_ROUND_DOWN_ULL (linear, cur_idx); } static
drivers/net/wireless/realtek/rtw89/regd.c +13 -0
@@ -721,6 +721,18 @@ static void rtw89_regd_apply_policy_6ghz(struct rtw89_dev *rtwdev, sband->channels[i].flags |=IEEE80211_CHAN_DISABLED ; } +static void rtw89_regd_apply_policy_tas (struct rtw89_dev *rtwdev) +{ +struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory; +const struct rtw89_regd *regd = regulatory->regd; +struct rtw89_tas_info *tas = &rtwdev->tas; + +if (!tas->enable) +return ; + + tas->block_regd = !test_bit (RTW89_REGD_FUNC_TAS , regd->func_bitmap); +} +static void rtw89_regd_notifier_apply (struct rtw89_dev *rtwdev,struct wiphy *wiphy,struct regulatory_request *request)
@@ -738,6 +750,7 @@ static void rtw89_regd_notifier_apply(struct rtw89_dev *rtwdev,rtw89_regd_apply_policy_unii4 (rtwdev, wiphy);rtw89_regd_apply_policy_6ghz (rtwdev, wiphy); +rtw89_regd_apply_policy_tas (rtwdev); } static
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2498,6 +2498,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = {BIT (NL80211_CHAN_WIDTH_80 ), .support_unii4 = true, .support_ant_gain = false, + .support_tas = false, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = true,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2216,6 +2216,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {BIT (NL80211_CHAN_WIDTH_80 ), .support_unii4 = false, .support_ant_gain = false, + .support_tas = false, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = true,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -852,6 +852,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {BIT (NL80211_CHAN_WIDTH_80 ), .support_unii4 = true, .support_ant_gain = true, + .support_tas = false, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = true,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -785,6 +785,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = {BIT (NL80211_CHAN_WIDTH_80 ), .support_unii4 = true, .support_ant_gain = true, + .support_tas = false, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = true,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +3 -0
@@ -12,6 +12,7 @@#include "rtw8852c.h" #include "rtw8852c_rfk.h" #include "rtw8852c_table.h" +#include "sar.h" #include "util.h" #define RTW8852C_FW_FORMAT_MAX 1
@@ -2880,6 +2881,7 @@ static int rtw8852c_mac_disable_bb_rf(struct rtw89_dev *rtwdev)static const struct rtw89_chanctx_listener rtw8852c_chanctx_listener = { .callbacks[RTW89_CHANCTX_CALLBACK_RFK ] = rtw8852c_rfk_chanctx_cb, + .callbacks[RTW89_CHANCTX_CALLBACK_TAS ] = rtw89_tas_chanctx_cb, };#ifdef CONFIG_PM
@@ -3011,6 +3013,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {BIT (NL80211_CHAN_WIDTH_160 ), .support_unii4 = true, .support_ant_gain = true, + .support_tas = true, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = true, .rx_freq_frome_ie = false,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -2770,6 +2770,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = {BIT (NL80211_CHAN_WIDTH_160 ), .support_unii4 = true, .support_ant_gain = false, + .support_tas = false, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = false,
drivers/net/wireless/realtek/rtw89/sar.c +289 -80
492 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/sar.h +4 -1
@@ -25,7 +25,10 @@ int rtw89_print_tas(struct rtw89_dev *rtwdev, char *buf, size_t bufsz);int rtw89_ops_set_sar_specs (struct ieee80211_hw *hw,const struct cfg80211_sar_specs *sar);void rtw89_tas_init (struct rtw89_dev *rtwdev); -void rtw89_tas_reset (struct rtw89_dev *rtwdev); +void rtw89_tas_reset (struct rtw89_dev *rtwdev,bool force);void rtw89_tas_track (struct rtw89_dev *rtwdev); +void rtw89_tas_scan (struct rtw89_dev *rtwdev,bool start); +void rtw89_tas_chanctx_cb (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_state state);#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/5 wifi: rtw89: enable dynamic antenna gain based on country
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
The dynamic antenna gain (DAG) considers the country, meaning DAG can be activated only when countries and regulatory domains allow it.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 11 ++++++++--- drivers/net/wireless/realtek/rtw89/regd.c | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4666,6 +4666,7 @@ enum rtw89_ant_gain_domain_type {struct rtw89_ant_gain_info {s8 offset[RTW89_ANT_GAIN_CHAIN_NUM ][RTW89_ANT_GAIN_SUBBAND_NR ];u32 regd_enabled; +bool block_country; };struct rtw89_6ghz_span {
drivers/net/wireless/realtek/rtw89/phy.c +8 -3
@@ -2044,7 +2044,7 @@ static s8 rtw89_phy_ant_gain_offset(struct rtw89_dev *rtwdev, u8 band, u32 centeif (!chip->support_ant_gain)return 0 ; -if (!(ant_gain->regd_enabled &BIT (regd))) +if (ant_gain->block_country || !(ant_gain->regd_enabled &BIT (regd)))return 0 ; offset_patha =rtw89_phy_ant_gain_query (rtwdev,RF_PATH_A , center_freq);
@@ -2057,10 +2057,14 @@ s16 rtw89_phy_ant_gain_pwr_offset(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan) {struct rtw89_ant_gain_info *ant_gain = &rtwdev->ant_gain; +const struct rtw89_chip_info *chip = rtwdev->chip;u8 regd =rtw89_regd_get (rtwdev, chan->band_type);s8 offset_patha, offset_pathb; -if (!(ant_gain->regd_enabled &BIT (regd))) +if (!chip->support_ant_gain) +return 0 ; + +if (ant_gain->block_country || !(ant_gain->regd_enabled &BIT (regd)))return 0 ; offset_patha =rtw89_phy_ant_gain_query (rtwdev,RF_PATH_A , chan->freq);
@@ -2079,7 +2083,8 @@ int rtw89_print_ant_gain(struct rtw89_dev *rtwdev, char *buf, size_t bufsz,char *p = buf, *end = buf + bufsz;s8 offset_patha, offset_pathb; -if (!chip->support_ant_gain || !(ant_gain->regd_enabled &BIT (regd))) { +if (!(chip->support_ant_gain && (ant_gain->regd_enabled &BIT (regd))) || + ant_gain->block_country) { p +=scnprintf (p, end - p,"no DAG is applied\n" ); goto out; }
drivers/net/wireless/realtek/rtw89/regd.c +14 -0
@@ -733,6 +733,19 @@ static void rtw89_regd_apply_policy_tas(struct rtw89_dev *rtwdev) tas->block_regd = !test_bit (RTW89_REGD_FUNC_TAS , regd->func_bitmap); } +static void rtw89_regd_apply_policy_ant_gain (struct rtw89_dev *rtwdev) +{ +struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory; +struct rtw89_ant_gain_info *ant_gain = &rtwdev->ant_gain; +const struct rtw89_chip_info *chip = rtwdev->chip; +const struct rtw89_regd *regd = regulatory->regd; + +if (!chip->support_ant_gain) +return ; + + ant_gain->block_country = !test_bit (RTW89_REGD_FUNC_DAG , regd->func_bitmap); +} +static void rtw89_regd_notifier_apply (struct rtw89_dev *rtwdev,struct wiphy *wiphy,struct regulatory_request *request)
@@ -751,6 +764,7 @@ static void rtw89_regd_notifier_apply(struct rtw89_dev *rtwdev,rtw89_regd_apply_policy_unii4 (rtwdev, wiphy);rtw89_regd_apply_policy_6ghz (rtwdev, wiphy);rtw89_regd_apply_policy_tas (rtwdev); +rtw89_regd_apply_policy_ant_gain (rtwdev); } static
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/5 wifi: rtw89: 8922a: enable dynamic antenna gain
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
The 8922A now supports dynamic antenna gain. However, in firmware before v0.35.64.0, different transmit powers cannot be applied to each RF path. To comply with regulatory limits in these older firmware, the lower of the two requested transmit powers will be used for both paths when they differ.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 6 +++ drivers/net/wireless/realtek/rtw89/phy.h | 7 +++ drivers/net/wireless/realtek/rtw89/reg.h | 28 +++++++--- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 54 ++++++++++++++++++- 6 files changed, 88 insertions(+), 9 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4492,6 +4492,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_CH_INFO_BE_V0 ,RTW89_FW_FEATURE_LPS_CH_INFO ,RTW89_FW_FEATURE_NO_PHYCAP_P1 , + RTW89_FW_FEATURE_NO_POWER_DIFFERENCE, }; struct rtw89_fw_suit {
drivers/net/wireless/realtek/rtw89/fw.c +1 -0
@@ -849,6 +849,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,47 ,0 ,CH_INFO_BE_V0 ),__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,49 ,0 ,RFK_PRE_NOTIFY_V1 ),__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,51 ,0 ,NO_PHYCAP_P1 ), + __CFG_FW_FEAT(RTL8922A, lt, 0, 35, 64, 0, NO_POWER_DIFFERENCE), }; static void rtw89_fw_iterate_feature_cfg(struct rtw89_fw_info *fw,
drivers/net/wireless/realtek/rtw89/phy.c +6 -0
@@ -2050,6 +2050,9 @@ static s8 rtw89_phy_ant_gain_offset(struct rtw89_dev *rtwdev, u8 band, u32 cente offset_patha =rtw89_phy_ant_gain_query (rtwdev,RF_PATH_A , center_freq); offset_pathb =rtw89_phy_ant_gain_query (rtwdev,RF_PATH_B , center_freq); +if (RTW89_CHK_FW_FEATURE (NO_POWER_DIFFERENCE , &rtwdev->fw)) +return min (offset_patha, offset_pathb); +return max (offset_patha, offset_pathb); }
@@ -2067,6 +2070,9 @@ s16 rtw89_phy_ant_gain_pwr_offset(struct rtw89_dev *rtwdev,if (ant_gain->block_country || !(ant_gain->regd_enabled &BIT (regd)))return 0 ; +if (RTW89_CHK_FW_FEATURE (NO_POWER_DIFFERENCE , &rtwdev->fw)) +return 0 ; + offset_patha =rtw89_phy_ant_gain_query (rtwdev,RF_PATH_A , chan->freq); offset_pathb =rtw89_phy_ant_gain_query (rtwdev,RF_PATH_B , chan->freq);
drivers/net/wireless/realtek/rtw89/phy.h +7 -0
@@ -914,6 +914,13 @@ static inline s8 rtw89_phy_txpwr_rf_to_bb(struct rtw89_dev *rtwdev, s8 txpwr_rf)return txpwr_rf << (chip->txpwr_factor_bb - chip->txpwr_factor_rf); } +static inline s8 rtw89_phy_txpwr_bb_to_rf (struct rtw89_dev *rtwdev,s8 txpwr_bb) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +return txpwr_bb >> (chip->txpwr_factor_bb - chip->txpwr_factor_rf); +} +static inline s8 rtw89_phy_txpwr_rf_to_mac (struct rtw89_dev *rtwdev,s8 txpwr_rf) {const struct rtw89_chip_info *chip = rtwdev->chip;
drivers/net/wireless/realtek/rtw89/reg.h +20 -8
@@ -9181,6 +9181,16 @@#define B_IQKINF2_FCNT GENMASK(23, 16)#define B_IQKINF2_KCNT GENMASK(15, 8)#define B_IQKINF2_NCTLV GENMASK(7, 0) +#define R_TXAGC_REF_DBM_RF1_P0 0xBC04 +#define B_TXAGC_OFDM_REF_DBM_RF1_P0 GENMASK(10, 2) +#define B_TXAGC_CCK_REF_DBM_RF1_P0 GENMASK(19, 11) +#define R_TSSI_K_RF1_P0 0xBC28 +#define B_TSSI_K_OFDM_RF1_P0 GENMASK(9, 0) +#define R_TXAGC_REF_DBM_RF1_P1 0xBD04 +#define B_TXAGC_OFDM_REF_DBM_RF1_P1 GENMASK(10, 2) +#define B_TXAGC_CCK_REF_DBM_RF1_P1 GENMASK(19, 11) +#define R_TSSI_K_RF1_P1 0xBD28 +#define B_TSSI_K_OFDM_RF1_P1 GENMASK(9, 0)#define R_RFK_ST 0xBFF8#define R_DCOF0 0xC000#define B_DCOF0_RST BIT(17)
@@ -9350,16 +9360,18 @@#define R_TSSI_MAP_OFST_P1 0xE720#define B_TSSI_MAP_OFST_OFDM GENMASK(17, 9)#define B_TSSI_MAP_OFST_CCK GENMASK(26, 18) -#define R_TXAGC_REF0_P0 0xE628 -#define R_TXAGC_REF0_P1 0xE728 -#define B_TXAGC_REF0_OFDM_DBM GENMASK(8, 0) -#define B_TXAGC_REF0_CCK_DBM GENMASK(17, 9) -#define B_TXAGC_REF0_OFDM_CW GENMASK(26, 18) -#define R_TXAGC_REF1_P0 0xE62C -#define R_TXAGC_REF1_P1 0xE72C -#define B_TXAGC_REF1_CCK_CW GENMASK(8, 0) +#define R_TXAGC_REF_DBM_P0 0xE628 +#define B_TXAGC_OFDM_REF_DBM_P0 GENMASK(8, 0) +#define B_TXAGC_CCK_REF_DBM_P0 GENMASK(17, 9) +#define R_TSSI_K_P0 0xE6A0 +#define B_TSSI_K_OFDM_P0 GENMASK(29, 20)#define R_TXPWR_RSTB 0xE70C#define B_TXPWR_RSTB BIT(16) +#define R_TXAGC_REF_DBM_P1 0xE728 +#define B_TXAGC_OFDM_REF_DBM_P1 GENMASK(8, 0) +#define B_TXAGC_CCK_REF_DBM_P1 GENMASK(17, 9) +#define R_TSSI_K_P1 0xE7A0 +#define B_TSSI_K_OFDM_P1 GENMASK(29, 20)/* WiFi CPU local domain */ #define R_AX_WDT_CTRL 0x0040
drivers/net/wireless/realtek/rtw89/rtw8922a.c +53 -1
72 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/5 wifi: rtw89: set force HE TB mode when connecting to 11ax AP
In reply to Ping-Ke ShihFrom: Dian-Syuan Yang <[email protected]>
Some of 11ax AP set the UL HE-SIG-A2 reserved subfield to all 0s, which will cause the 11be chip to recognize trigger frame as EHT. We propose a method to bypass the "UL HE-SIG-A2 reserved subfield" and always uses HE TB in response to the AP's trigger frame.
--- drivers/net/wireless/realtek/rtw89/mac.c | 26 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/mac.h | 2 ++ drivers/net/wireless/realtek/rtw89/mac80211.c | 1 + drivers/net/wireless/realtek/rtw89/reg.h | 4 +++ 4 files changed, 33 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +26 -0
@@ -4837,6 +4837,32 @@ void rtw89_mac_set_he_obss_narrow_bw_ru(struct rtw89_dev *rtwdev,rtw89_write32_set (rtwdev, reg, mac->narrow_bw_ru_dis.mask); } +void rtw89_mac_set_he_tb (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link) +{ +struct ieee80211_bss_conf *bss_conf; +bool set; +u32 reg; + +if (rtwdev->chip->chip_gen !=RTW89_CHIP_BE ) +return ; + +rcu_read_lock (); + + bss_conf =rtw89_vif_rcu_dereference_link (rtwvif_link, true); + set = bss_conf->he_support && !bss_conf->eht_support; + +rcu_read_unlock (); + + reg =rtw89_mac_reg_by_idx (rtwdev,R_BE_CLIENT_OM_CTRL , + rtwvif_link->mac_idx); + +if (set) +rtw89_write32_set (rtwdev, reg,B_BE_TRIG_DIS_EHTTB ); +else +rtw89_write32_clr (rtwdev, reg,B_BE_TRIG_DIS_EHTTB ); +} +void rtw89_mac_stop_ap (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link) {rtw89_mac_port_cfg_func_sw (rtwdev, rtwvif_link);
drivers/net/wireless/realtek/rtw89/mac.h +2 -0
@@ -1188,6 +1188,8 @@ void rtw89_mac_port_cfg_rx_sync(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link, bool en);void rtw89_mac_set_he_obss_narrow_bw_ru (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link); +void rtw89_mac_set_he_tb (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link);void rtw89_mac_stop_ap (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link);void rtw89_mac_enable_beacon_for_ap_vifs (struct rtw89_dev *rtwdev,bool en);int rtw89_mac_remove_vif (struct rtw89_dev *rtwdev,struct rtw89_vif_link *vif);
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -0
@@ -656,6 +656,7 @@ static void __rtw89_ops_bss_link_assoc(struct rtw89_dev *rtwdev,rtw89_chip_cfg_txpwr_ul_tb_offset (rtwdev, rtwvif_link);rtw89_mac_port_update (rtwdev, rtwvif_link);rtw89_mac_set_he_obss_narrow_bw_ru (rtwdev, rtwvif_link); +rtw89_mac_set_he_tb (rtwdev, rtwvif_link); } static void __rtw89_ops_bss_assoc(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/reg.h +4 -0
@@ -7102,6 +7102,10 @@#define B_BE_MACLBK_RDY_NUM_MASK GENMASK(7, 3)#define B_BE_MACLBK_EN BIT(0) +#define R_BE_CLIENT_OM_CTRL 0x11040 +#define R_BE_CLIENT_OM_CTRL_C1 0x15040 +#define B_BE_TRIG_DIS_EHTTB BIT(24) +#define R_BE_WMAC_NAV_CTL 0x11080#define R_BE_WMAC_NAV_CTL_C1 0x15080#define B_BE_WMAC_NAV_UPPER_EN BIT(26)
Signature · 1 line
2.25.1