wifi: rtw89: consider TX power limit of DAG
Ping-Ke Shih
maintainercover wifi: rtw89: consider TX power limit of DAG
The DAG (dynamic antenna power) can increase TX power, and should be under the numbers of DA limit tables. Add this by patch 2/2.
The patch 1/2 is added to handle C2H event related to FW scan for new firmware. The event is to show status. No functional changes.
Kuan-Chung Chen (2):
wifi: rtw89: phy: add C2H event handler for report of FW scan
wifi: rtw89: constrain TX power according to dynamic antenna power
table
drivers/net/wireless/realtek/rtw89/core.h | 10 ++ drivers/net/wireless/realtek/rtw89/fw.c | 76 ++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 19 ++++ drivers/net/wireless/realtek/rtw89/phy.c | 119 ++++++++++++++++------ drivers/net/wireless/realtek/rtw89/phy.h | 1 + 5 files changed, 196 insertions(+), 29 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/2 wifi: rtw89: phy: add C2H event handler for report of FW scan
From: Kuan-Chung Chen <[email protected]>
Newer firmware will notify driver of the Packet Detection (PD) value on the channel after switch channels during FW scan.
--- drivers/net/wireless/realtek/rtw89/fw.h | 13 +++++++++ drivers/net/wireless/realtek/rtw89/phy.c | 35 ++++++++++++++++++++++-- drivers/net/wireless/realtek/rtw89/phy.h | 1 + 3 files changed, 46 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.h +13 -0
@@ -3620,6 +3620,19 @@ struct rtw89_c2h_ra_rpt {#define RTW89_C2H_RA_RPT_W3_MD_SEL_B2 BIT(15)#define RTW89_C2H_RA_RPT_W3_BW_B2 BIT(16) +struct rtw89_c2h_fw_scan_rpt { +struct rtw89_c2h_hdr hdr; +u8 phy_idx; +u8 band; +u8 center_ch; +u8 ofdm_pd_idx;/* in unit of 2 dBm */ +#define PD_LOWER_BOUND_BASE 102 +s8 cck_pd_idx; +u8 rsvd0; +u8 rsvd1; +u8 rsvd2; +} __packed; +/* For WiFi 6 chips: * VHT, HE, HT-old: [6:4]: NSS, [3:0]: MCS * HT-new: [6:5]: NA, [4:0]: MCS
drivers/net/wireless/realtek/rtw89/phy.c +32 -3
@@ -3023,6 +3023,35 @@ void (* const rtw89_phy_c2h_ra_handler[])(struct rtw89_dev *rtwdev, [RTW89_PHY_C2H_FUNC_TXSTS] = NULL, }; +static void +rtw89_phy_c2h_lowrt_rty (struct rtw89_dev *rtwdev,struct sk_buff *c2h,u32 len) +{ +} + +static void +rtw89_phy_c2h_fw_scan_rpt (struct rtw89_dev *rtwdev,struct sk_buff *c2h,u32 len) +{ +const struct rtw89_c2h_fw_scan_rpt *c2h_rpt = + (const struct rtw89_c2h_fw_scan_rpt *)c2h->data; + +rtw89_debug (rtwdev,RTW89_DBG_DIG , +"%s: band: %u, op_chan: %u, PD_low_bd(ofdm, cck): (-%d, %d), phy_idx: %u\n" , + __func__, c2h_rpt->band, c2h_rpt->center_ch, +PD_LOWER_BOUND_BASE - (c2h_rpt->ofdm_pd_idx <<1 ), + c2h_rpt->cck_pd_idx, c2h_rpt->phy_idx); +} + +static +void (*const rtw89_phy_c2h_dm_handler[])(struct rtw89_dev *rtwdev, +struct sk_buff *c2h,u32 len) = { + [RTW89_PHY_C2H_DM_FUNC_FW_TEST ] =NULL , + [RTW89_PHY_C2H_DM_FUNC_FW_TRIG_TX_RPT ] =NULL , + [RTW89_PHY_C2H_DM_FUNC_SIGB ] =NULL , + [RTW89_PHY_C2H_DM_FUNC_LOWRT_RTY ] = rtw89_phy_c2h_lowrt_rty, + [RTW89_PHY_C2H_DM_FUNC_MCC_DIG ] =NULL , + [RTW89_PHY_C2H_DM_FUNC_FW_SCAN ] = rtw89_phy_c2h_fw_scan_rpt, +}; +static void rtw89_phy_c2h_rfk_rpt_log (struct rtw89_dev *rtwdev,enum rtw89_phy_c2h_rfk_log_func func,void *content,u16 len)
@@ -3558,9 +3587,9 @@ void rtw89_phy_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb, handler = rtw89_phy_c2h_rfk_report_handler[func];break ;case RTW89_PHY_C2H_CLASS_DM : -if (func ==RTW89_PHY_C2H_DM_FUNC_LOWRT_RTY ) -return ; - fallthrough; +if (func <ARRAY_SIZE (rtw89_phy_c2h_dm_handler)) + handler = rtw89_phy_c2h_dm_handler[func]; +break ;default :rtw89_info (rtwdev,"PHY c2h class %d not support\n" , class);return ;
drivers/net/wireless/realtek/rtw89/phy.h +1 -0
@@ -164,6 +164,7 @@ enum rtw89_phy_c2h_dm_func {RTW89_PHY_C2H_DM_FUNC_SIGB ,RTW89_PHY_C2H_DM_FUNC_LOWRT_RTY ,RTW89_PHY_C2H_DM_FUNC_MCC_DIG , +RTW89_PHY_C2H_DM_FUNC_FW_SCAN =0xc , RTW89_PHY_C2H_DM_FUNC_NUM, };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 1/2] wifi: rtw89: phy: add C2H event handler for report of FW scan
Quoted 7 lines · Ping-Ke Shih
From: Kuan-Chung Chen <[email protected]>
Newer firmware will notify driver of the Packet Detection (PD) value on the channel after switch channels during FW scan.
Signed-off-by Kuan-Chung Chen <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
2 patch(es) applied to rtw-next branch of rtw.git, thanks.
d31c42466b1a wifi: rtw89: phy: add C2H event handler for report of FW scan 02eb1aff6fde wifi: rtw89: constrain TX power according to dynamic antenna power table
Ping-Ke Shih
maintainerPATCH 2/2 wifi: rtw89: constrain TX power according to dynamic antenna power table
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
Dynamic Antenna Gain (DAG) adjusts TX power based on antenna gain. To prevent signal distortion from excessive power increases, a dynamic antenna power table limits the maximum adjustable TX power.
--- drivers/net/wireless/realtek/rtw89/core.h | 10 +++ drivers/net/wireless/realtek/rtw89/fw.c | 76 ++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 6 ++ drivers/net/wireless/realtek/rtw89/phy.c | 84 ++++++++++++++++------- 4 files changed, 150 insertions(+), 26 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +10 -0
@@ -3987,7 +3987,11 @@ struct rtw89_rfe_parms {struct rtw89_txpwr_rule_2ghz rule_2ghz;struct rtw89_txpwr_rule_5ghz rule_5ghz;struct rtw89_txpwr_rule_6ghz rule_6ghz; +struct rtw89_txpwr_rule_2ghz rule_da_2ghz; +struct rtw89_txpwr_rule_5ghz rule_da_5ghz; +struct rtw89_txpwr_rule_6ghz rule_da_6ghz;struct rtw89_tx_shape tx_shape; +bool has_da; };struct rtw89_rfe_parms_conf {
@@ -4082,9 +4086,15 @@ struct rtw89_rfe_data {struct rtw89_txpwr_lmt_2ghz_data lmt_2ghz;struct rtw89_txpwr_lmt_5ghz_data lmt_5ghz;struct rtw89_txpwr_lmt_6ghz_data lmt_6ghz; +struct rtw89_txpwr_lmt_2ghz_data da_lmt_2ghz; +struct rtw89_txpwr_lmt_5ghz_data da_lmt_5ghz; +struct rtw89_txpwr_lmt_6ghz_data da_lmt_6ghz;struct rtw89_txpwr_lmt_ru_2ghz_data lmt_ru_2ghz;struct rtw89_txpwr_lmt_ru_5ghz_data lmt_ru_5ghz;struct rtw89_txpwr_lmt_ru_6ghz_data lmt_ru_6ghz; +struct rtw89_txpwr_lmt_ru_2ghz_data da_lmt_ru_2ghz; +struct rtw89_txpwr_lmt_ru_5ghz_data da_lmt_ru_5ghz; +struct rtw89_txpwr_lmt_ru_6ghz_data da_lmt_ru_6ghz;struct rtw89_tx_shape_lmt_data tx_shape_lmt;struct rtw89_tx_shape_lmt_ru_data tx_shape_lmt_ru;struct rtw89_rfe_parms rfe_parms;
drivers/net/wireless/realtek/rtw89/fw.c +76 -0
111 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +6 -0
@@ -3905,6 +3905,12 @@ enum rtw89_fw_element_id {RTW89_FW_ELEMENT_ID_TXPWR_TRK =18 ,RTW89_FW_ELEMENT_ID_RFKLOG_FMT =19 ,RTW89_FW_ELEMENT_ID_REGD =20 , +RTW89_FW_ELEMENT_ID_TXPWR_DA_LMT_2GHZ =21 , +RTW89_FW_ELEMENT_ID_TXPWR_DA_LMT_5GHZ =22 , +RTW89_FW_ELEMENT_ID_TXPWR_DA_LMT_6GHZ =23 , +RTW89_FW_ELEMENT_ID_TXPWR_DA_LMT_RU_2GHZ =24 , +RTW89_FW_ELEMENT_ID_TXPWR_DA_LMT_RU_5GHZ =25 , +RTW89_FW_ELEMENT_ID_TXPWR_DA_LMT_RU_6GHZ =26 , RTW89_FW_ELEMENT_ID_NUM, };
drivers/net/wireless/realtek/rtw89/phy.c +58 -26
197 lines not on this page · raw message
Signature · 1 line
2.25.1