wifi: rtw89: some changes related to fw feature bit, PHY RSSI and PHY XTAL
Ping-Ke Shih
maintainercover wifi: rtw89: some changes related to fw feature bit, PHY RSSI and PHY XTAL
First three patches are related to firmware command format and features. Add them for coming firmware.
The third and fifth patches are related to PHY. The RSSI report can be from many places of RX, but each of them could be incomplete, so add this new one to complement. The other patch is to limit boundary when adjusting XTAL to track peer frequency.
The forth patch is to implement ops link_sta_rc_update() according to change of mac80211, which becomes a link-base ops.
No functional dependency within this patchset.
Chih-Kang Chang (2):
wifi: rtw89: 8922a: use RSSI from PHY report in RX descriptor
wifi: rtw89: add crystal_cap check to avoid setting as overflow value
Po-Hao Huang (3):
wifi: rtw89: 8922a: Extend channel info field length for scan
wifi: rtw89: 8852b: add beacon filter and CQM support
wifi: rtw89: 8852bt: add beacon filter and CQM support
Zong-Zhe Yang (1):
wifi: rtw89: refine link handling for link_sta_rc_update
drivers/net/wireless/realtek/rtw89/core.c | 17 +++++++ drivers/net/wireless/realtek/rtw89/core.h | 20 +++++++++ drivers/net/wireless/realtek/rtw89/fw.c | 45 ++++++++++++++----- drivers/net/wireless/realtek/rtw89/fw.h | 22 ++++++++- drivers/net/wireless/realtek/rtw89/mac.c | 25 ++++++++--- drivers/net/wireless/realtek/rtw89/mac.h | 36 +++++++++++++++ drivers/net/wireless/realtek/rtw89/mac80211.c | 9 +++- drivers/net/wireless/realtek/rtw89/mac_be.c | 15 +++++++ drivers/net/wireless/realtek/rtw89/phy.c | 26 +++++------ drivers/net/wireless/realtek/rtw89/phy.h | 5 ++- drivers/net/wireless/realtek/rtw89/reg.h | 4 ++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 4 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 5 ++- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../wireless/realtek/rtw89/rtw8852b_common.c | 4 +- .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 6 ++- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 19 ++++++-- drivers/net/wireless/realtek/rtw89/txrx.h | 3 ++ 19 files changed, 223 insertions(+), 44 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/6 wifi: rtw89: 8922a: Extend channel info field length for scan
From: Po-Hao Huang <[email protected]>
Extend the bitfield for duration in channel info to 16 bits. Update the related format in H2C and C2H, then increase firmware format sequence to 3.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 43 +++++++++++++------ drivers/net/wireless/realtek/rtw89/fw.h | 22 +++++++++- drivers/net/wireless/realtek/rtw89/mac.c | 24 ++++++++--- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 +- 5 files changed, 71 insertions(+), 21 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4456,6 +4456,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_RFK_RXDCK_V0 ,RTW89_FW_FEATURE_NO_WOW_CPU_IO_RX ,RTW89_FW_FEATURE_NOTIFY_AP_INFO , + RTW89_FW_FEATURE_CH_INFO_BE_V0, }; struct rtw89_fw_suit {
drivers/net/wireless/realtek/rtw89/fw.c +31 -12
127 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +20 -2
@@ -310,9 +310,12 @@ struct rtw89_fw_macid_pause_sleep_grp {#define RTW89_SCANOFLD_DEBUG_MASK 0x1F#define RTW89_CHAN_INVALID 0xFF#define RTW89_MAC_CHINFO_SIZE 28 +#define RTW89_MAC_CHINFO_SIZE_BE 32#define RTW89_SCAN_LIST_GUARD 4 -#define RTW89_SCAN_LIST_LIMIT \ - ((RTW89_H2C_MAX_SIZE / RTW89_MAC_CHINFO_SIZE) - RTW89_SCAN_LIST_GUARD) +#define RTW89_SCAN_LIST_LIMIT (size) \ + ((RTW89_H2C_MAX_SIZE / (size)) - RTW89_SCAN_LIST_GUARD) +#define RTW89_SCAN_LIST_LIMIT_AX RTW89_SCAN_LIST_LIMIT(RTW89_MAC_CHINFO_SIZE) +#define RTW89_SCAN_LIST_LIMIT_BE RTW89_SCAN_LIST_LIMIT(RTW89_MAC_CHINFO_SIZE_BE)#define RTW89_BCN_LOSS_CNT 10
@@ -2647,6 +2650,7 @@ struct rtw89_h2c_chinfo_elem_be {__le32 w4;__le32 w5;__le32 w6; +__le32 w7; } __packed;#define RTW89_H2C_CHINFO_BE_W0_PERIOD GENMASK(7, 0)
@@ -2678,6 +2682,7 @@ struct rtw89_h2c_chinfo_elem_be {#define RTW89_H2C_CHINFO_BE_W5_FW_PROBE0_SSIDS GENMASK(31, 16)#define RTW89_H2C_CHINFO_BE_W6_FW_PROBE0_SHORTSSIDS GENMASK(15, 0)#define RTW89_H2C_CHINFO_BE_W6_FW_PROBE0_BSSIDS GENMASK(31, 16) +#define RTW89_H2C_CHINFO_BE_W7_PERIOD_V1 GENMASK(15, 0)struct rtw89_h2c_chinfo {u8 ch_num;
@@ -2687,6 +2692,14 @@ struct rtw89_h2c_chinfo { struct rtw89_h2c_chinfo_elem elem[] __counted_by(ch_num); } __packed; +struct rtw89_h2c_chinfo_be { +u8 ch_num; +u8 elem_size; +u8 arg; +u8 rsvd0; + struct rtw89_h2c_chinfo_elem_be elem[] __counted_by(ch_num); +} __packed; +#define RTW89_H2C_CHINFO_ARG_MAC_IDX_MASK BIT(0)#define RTW89_H2C_CHINFO_ARG_APPEND_MASK BIT(1)
@@ -2733,6 +2746,7 @@ struct rtw89_h2c_scanofld_be_opch {__le32 w1;__le32 w2;__le32 w3; +__le32 w4; } __packed;#define RTW89_H2C_SCANOFLD_BE_OPCH_W0_MACID GENMASK(15, 0)
@@ -2754,6 +2768,7 @@ struct rtw89_h2c_scanofld_be_opch {#define RTW89_H2C_SCANOFLD_BE_OPCH_W3_PKT1 GENMASK(15, 8)#define RTW89_H2C_SCANOFLD_BE_OPCH_W3_PKT2 GENMASK(23, 16)#define RTW89_H2C_SCANOFLD_BE_OPCH_W3_PKT3 GENMASK(31, 24) +#define RTW89_H2C_SCANOFLD_BE_OPCH_W4_DURATION_V1 GENMASK(15, 0)struct rtw89_h2c_scanofld_be {__le32 w0;
@@ -3596,6 +3611,7 @@ struct rtw89_c2h_scanofld {__le32 w5;__le32 w6;__le32 w7; +__le32 w8; } __packed;#define RTW89_C2H_SCANOFLD_W2_PRI_CH GENMASK(7, 0)
@@ -3610,6 +3626,8 @@ struct rtw89_c2h_scanofld {#define RTW89_C2H_SCANOFLD_W6_EXPECT_PERIOD GENMASK(15, 8)#define RTW89_C2H_SCANOFLD_W6_FW_DEF GENMASK(23, 16)#define RTW89_C2H_SCANOFLD_W7_REPORT_TSF GENMASK(31, 0) +#define RTW89_C2H_SCANOFLD_W8_PERIOD_V1 GENMASK(15, 0) +#define RTW89_C2H_SCANOFLD_W8_EXPECT_PERIOD_V1 GENMASK(31, 16)#define RTW89_GET_MAC_C2H_MCC_RCV_ACK_GROUP (c2h) \ le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(1, 0))
drivers/net/wireless/realtek/rtw89/mac.c +18 -6
@@ -4788,9 +4788,11 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,struct rtw89_vif_link *rtwvif_link = rtwdev->scan_info.scanning_vif;struct rtw89_vif *rtwvif;struct rtw89_chan new; -u8 reason, status, tx_fail, band, actual_period, expect_period;u32 last_chan = rtwdev->scan_info.last_chan_idx, report_tsf; +u16 actual_period, expect_period; +u8 reason, status, tx_fail, band;u8 mac_idx, sw_def, fw_def; +u8 ver =U8_MAX ;u16 chan;int ret;
@@ -4799,6 +4801,9 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb, rtwvif = rtwvif_link->rtwvif; +if (RTW89_CHK_FW_FEATURE (CH_INFO_BE_V0 , &rtwdev->fw)) + ver =0 ; + tx_fail =le32_get_bits (c2h->w5,RTW89_C2H_SCANOFLD_W5_TX_FAIL ); status =le32_get_bits (c2h->w2,RTW89_C2H_SCANOFLD_W2_STATUS ); chan =le32_get_bits (c2h->w2,RTW89_C2H_SCANOFLD_W2_PRI_CH );
@@ -4811,21 +4816,28 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,if (!(rtwdev->chip->support_bands &BIT (NL80211_BAND_6GHZ ))) band = chan >14 ?RTW89_BAND_5G :RTW89_BAND_2G ; -rtw89_debug (rtwdev,RTW89_DBG_HW_SCAN , -"mac_idx[%d] band: %d, chan: %d, reason: %d, status: %d, tx_fail: %d, actual: %d\n" , - mac_idx, band, chan, reason, status, tx_fail, actual_period); -if (rtwdev->chip->chip_gen ==RTW89_CHIP_BE ) { sw_def =le32_get_bits (c2h->w6,RTW89_C2H_SCANOFLD_W6_SW_DEF ); - expect_period =le32_get_bits (c2h->w6,RTW89_C2H_SCANOFLD_W6_EXPECT_PERIOD ); fw_def =le32_get_bits (c2h->w6,RTW89_C2H_SCANOFLD_W6_FW_DEF ); report_tsf =le32_get_bits (c2h->w7,RTW89_C2H_SCANOFLD_W7_REPORT_TSF ); +if (ver ==0 ) { + expect_period = +le32_get_bits (c2h->w6,RTW89_C2H_SCANOFLD_W6_EXPECT_PERIOD ); + }else { + actual_period =le32_get_bits (c2h->w8,RTW89_C2H_SCANOFLD_W8_PERIOD_V1 ); + expect_period = +le32_get_bits (c2h->w8,RTW89_C2H_SCANOFLD_W8_EXPECT_PERIOD_V1 ); + }rtw89_debug (rtwdev,RTW89_DBG_HW_SCAN ,"sw_def: %d, fw_def: %d, tsf: %x, expect: %d\n" , sw_def, fw_def, report_tsf, expect_period); } +rtw89_debug (rtwdev,RTW89_DBG_HW_SCAN , +"mac_idx[%d] band: %d, chan: %d, reason: %d, status: %d, tx_fail: %d, actual: %d\n" , + mac_idx, band, chan, reason, status, tx_fail, actual_period); +switch (reason) {case RTW89_SCAN_LEAVE_OP_NOTIFY :case RTW89_SCAN_LEAVE_CH_NOTIFY :
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -1
@@ -14,7 +14,7 @@#include "rtw8922a_rfk.h" #include "util.h" -#define RTW8922A_FW_FORMAT_MAX 2 +#define RTW8922A_FW_FORMAT_MAX 3#define RTW8922A_FW_BASENAME "rtw89/rtw8922a_fw"#define RTW8922A_MODULE_FIRMWARE \ RTW8922A_FW_BASENAME "-" __stringify(RTW8922A_FW_FORMAT_MAX) ".bin"
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH 1/6] wifi: rtw89: 8922a: Extend channel info field length for scan
Quoted 8 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
Extend the bitfield for duration in channel info to 16 bits. Update the related format in H2C and C2H, then increase firmware format sequence to 3.
Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
6 patch(es) applied to rtw-next branch of rtw.git, thanks.
05b6555feedd wifi: rtw89: 8922a: Extend channel info field length for scan d56c261e5214 wifi: rtw89: 8852b: add beacon filter and CQM support 3374c63111b0 wifi: rtw89: 8852bt: add beacon filter and CQM support b6853ed2be27 wifi: rtw89: 8922a: use RSSI from PHY report in RX descriptor 148cd1e184cf wifi: rtw89: refine link handling for link_sta_rc_update 7b98caea3967 wifi: rtw89: add crystal_cap check to avoid setting as overflow value
Ping-Ke Shih
maintainerPATCH 2/6 wifi: rtw89: 8852b: add beacon filter and CQM support
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Declare beacon filter and connection monitor for 8852B. This offloads connection monitor mechanism to firmware, and this is required for the MCC feature.
--- drivers/net/wireless/realtek/rtw89/fw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw89/fw.c +1 -0
@@ -709,6 +709,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,26 ,0 ,TX_WAKE ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,0 ,CRASH_TRIGGER ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,0 ,SCAN_OFFLOAD ), +__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,7 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852B , lt,0 ,29 ,30 ,0 ,NO_WOW_CPU_IO_RX ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,NO_LPS_PG ), __CFG_FW_FEAT(RTL8852BT, ge, 0, 29, 74, 0, TX_WAKE),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/6 wifi: rtw89: 8852bt: add beacon filter and CQM support
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Declare beacon filter and connection monitor for 8852BT. This offloads connection monitor mechanism to firmware, and this is required for the MCC feature.
--- drivers/net/wireless/realtek/rtw89/fw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw89/fw.c +1 -0
@@ -715,6 +715,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,TX_WAKE ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,90 ,0 ,CRASH_TRIGGER ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,91 ,0 ,SCAN_OFFLOAD ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,110 ,0 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852C , le,0 ,27 ,33 ,0 ,NO_DEEP_PS ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,34 ,0 ,TX_WAKE ), __CFG_FW_FEAT(RTL8852C, ge, 0, 27, 36, 0, SCAN_OFFLOAD),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/6 wifi: rtw89: 8922a: use RSSI from PHY report in RX descriptor
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
The PPDU status of probe response will fail to parse the IE due to being filtered by the to_self check. Therefore, we parse RSSI from PHY report in RX descriptor.
--- drivers/net/wireless/realtek/rtw89/core.c | 17 +++++++++ drivers/net/wireless/realtek/rtw89/core.h | 19 ++++++++++ drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac.h | 36 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/mac_be.c | 15 ++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 4 +++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 4 ++- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 5 ++- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../wireless/realtek/rtw89/rtw8852b_common.c | 4 ++- .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 6 +++- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 17 +++++++-- drivers/net/wireless/realtek/rtw89/txrx.h | 3 ++ 14 files changed, 127 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +17 -0
@@ -2366,6 +2366,12 @@ static void rtw89_core_update_radiotap(struct rtw89_dev *rtwdev, } } +static void rtw89_core_validate_rx_signal (struct ieee80211_rx_status *rx_status) +{ +if (!rx_status->signal) + rx_status->flag |=RX_FLAG_NO_SIGNAL_VAL ; +} + static void rtw89_core_rx_to_mac80211(struct rtw89_dev *rtwdev, struct rtw89_rx_phy_ppdu *phy_ppdu, struct rtw89_rx_desc_info *desc_info,
@@ -2382,6 +2388,8 @@ static void rtw89_core_rx_to_mac80211(struct rtw89_dev *rtwdev,rtw89_core_rx_stats (rtwdev, phy_ppdu, desc_info, skb_ppdu);rtw89_core_update_rx_status_by_ppdu (rtwdev, rx_status, phy_ppdu);rtw89_core_update_radiotap (rtwdev, skb_ppdu, rx_status); +rtw89_core_validate_rx_signal (rx_status); +/* In low power mode, it does RX in thread context. */ local_bh_disable ();ieee80211_rx_napi (rtwdev->hw,NULL , skb_ppdu, napi);
@@ -2517,6 +2525,7 @@ void rtw89_core_query_rxdesc_v2(struct rtw89_dev *rtwdev,struct rtw89_rx_desc_info *desc_info, u8 *data, u32 data_offset) { + struct rtw89_rxdesc_phy_rpt_v2 *rxd_rpt;struct rtw89_rxdesc_short_v2 *rxd_s;struct rtw89_rxdesc_long_v2 *rxd_l;u16 shift_len, drv_info_len, phy_rtp_len, hdr_cnv_len;
@@ -2564,6 +2573,12 @@ void rtw89_core_query_rxdesc_v2(struct rtw89_dev *rtwdev, desc_info->rxd_len =sizeof (struct rtw89_rxdesc_short_v2 ); desc_info->ready = true; +if (phy_rtp_len ==sizeof (*rxd_rpt)) { + rxd_rpt = (struct rtw89_rxdesc_phy_rpt_v2 *)(data + data_offset + + desc_info->rxd_len); + desc_info->rssi =le32_get_bits (rxd_rpt->dword0,BE_RXD_PHY_RSSI ); + } +if (!desc_info->long_rxdesc)return ;
@@ -2706,6 +2721,7 @@ static void rtw89_core_update_rx_status(struct rtw89_dev *rtwdev, rx_status->flag |=RX_FLAG_MACTIME_START ; rx_status->mactime = desc_info->free_run_cnt; +rtw89_chip_phy_rpt_to_rssi (rtwdev, desc_info, rx_status);rtw89_core_stats_sta_rx_status (rtwdev, desc_info, rx_status); }
@@ -4522,6 +4538,7 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)rtw89_phy_dm_init (rtwdev);rtw89_mac_cfg_ppdu_status_bands (rtwdev, true); +rtw89_mac_cfg_phy_rpt_bands (rtwdev, true);rtw89_mac_update_rts_threshold (rtwdev);rtw89_tas_reset (rtwdev);
drivers/net/wireless/realtek/rtw89/core.h +19 -0
@@ -1084,6 +1084,7 @@ struct rtw89_rx_desc_info {u16 offset;u16 rxd_len;bool ready; +u16 rssi; };struct rtw89_rxdesc_short {
@@ -1126,6 +1127,11 @@ struct rtw89_rxdesc_long_v2 {__le32 dword9; } __packed; +struct rtw89_rxdesc_phy_rpt_v2 { +__le32 dword0; +__le32 dword1; +} __packed; +struct rtw89_tx_desc_info {u16 pkt_size;u8 wp_offset;
@@ -3624,6 +3630,9 @@ struct rtw89_chip_ops { struct ieee80211_rx_status *status);void (*convert_rpl_to_rssi)(struct rtw89_dev *rtwdev,struct rtw89_rx_phy_ppdu *phy_ppdu); +void (*phy_rpt_to_rssi)(struct rtw89_dev *rtwdev, +struct rtw89_rx_desc_info *desc_info, +struct ieee80211_rx_status *rx_status);void (*ctrl_nbtg_bt_tx)(struct rtw89_dev *rtwdev,bool en,enum rtw89_phy_idx phy_idx);void (*cfg_txrx_path)(struct rtw89_dev *rtwdev);
@@ -6706,6 +6715,16 @@ static inline void rtw89_chip_convert_rpl_to_rssi(struct rtw89_dev *rtwdev, chip->ops->convert_rpl_to_rssi (rtwdev, phy_ppdu); } +static inline void rtw89_chip_phy_rpt_to_rssi (struct rtw89_dev *rtwdev, +struct rtw89_rx_desc_info *desc_info, +struct ieee80211_rx_status *rx_status) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +if (chip->ops->phy_rpt_to_rssi) + chip->ops->phy_rpt_to_rssi (rtwdev, desc_info, rx_status); +} +static inline void rtw89_ctrl_nbtg_bt_tx (struct rtw89_dev *rtwdev,bool en,enum rtw89_phy_idx phy_idx) {
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -6736,6 +6736,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .typ_fltr_opt = rtw89_mac_typ_fltr_opt_ax, .cfg_ppdu_status = rtw89_mac_cfg_ppdu_status_ax, + .cfg_phy_rpt = NULL, .dle_mix_cfg = dle_mix_cfg_ax, .chk_dle_rdy = chk_dle_rdy_ax,
drivers/net/wireless/realtek/rtw89/mac.h +36 -0
@@ -169,6 +169,20 @@ enum rtw89_mac_ax_l0_to_l1_event { MAC_AX_L0_TO_L1_EVENT_MAX = 15, }; +enum rtw89_mac_phy_rpt_size { +MAC_AX_PHY_RPT_SIZE_0 =0 , +MAC_AX_PHY_RPT_SIZE_8 =1 , +MAC_AX_PHY_RPT_SIZE_16 =2 , +MAC_AX_PHY_RPT_SIZE_24 =3 , +}; + +enum rtw89_mac_hdr_cnv_size { +MAC_AX_HDR_CNV_SIZE_0 =0 , +MAC_AX_HDR_CNV_SIZE_32 =1 , +MAC_AX_HDR_CNV_SIZE_64 =2 , +MAC_AX_HDR_CNV_SIZE_96 =3 , +}; +enum rtw89_mac_wow_fw_status {WOWLAN_NOT_READY =0x00 ,WOWLAN_SLEEP_READY =0x01 ,
@@ -968,6 +982,7 @@ struct rtw89_mac_gen_def {enum rtw89_mac_fwd_target fwd_target, u8 mac_idx);int (*cfg_ppdu_status)(struct rtw89_dev *rtwdev,u8 mac_idx,bool enable); +void (*cfg_phy_rpt)(struct rtw89_dev *rtwdev,u8 mac_idx,bool enable);int (*dle_mix_cfg)(struct rtw89_dev *rtwdev,const struct rtw89_dle_mem *cfg);int (*chk_dle_rdy)(struct rtw89_dev *rtwdev,bool wde_or_ple);
@@ -1223,6 +1238,27 @@ int rtw89_mac_stop_sch_tx_v2(struct rtw89_dev *rtwdev, u8 mac_idx,int rtw89_mac_resume_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en);int rtw89_mac_resume_sch_tx_v1 (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en);int rtw89_mac_resume_sch_tx_v2 (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en); +void rtw89_mac_cfg_phy_rpt_be (struct rtw89_dev *rtwdev,u8 mac_idx,bool enable); + +static inline +void rtw89_mac_cfg_phy_rpt (struct rtw89_dev *rtwdev,u8 mac_idx,bool enable) +{ +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; + +if (mac->cfg_phy_rpt) + mac->cfg_phy_rpt (rtwdev, mac_idx, enable); +} + +static inline +void rtw89_mac_cfg_phy_rpt_bands (struct rtw89_dev *rtwdev,bool enable) +{ +rtw89_mac_cfg_phy_rpt (rtwdev,RTW89_MAC_0 , enable); + +if (!rtwdev->dbcc_en) +return ; + +rtw89_mac_cfg_phy_rpt (rtwdev,RTW89_MAC_1 , enable); +}static inline int rtw89_mac_cfg_ppdu_status (struct rtw89_dev *rtwdev,u8 mac_idx,bool enable)
drivers/net/wireless/realtek/rtw89/mac_be.c +15 -0
@@ -1988,6 +1988,20 @@ int rtw89_mac_resume_sch_tx_v2(struct rtw89_dev *rtwdev, u8 mac_idx, u32 tx_en) }EXPORT_SYMBOL (rtw89_mac_resume_sch_tx_v2); +void rtw89_mac_cfg_phy_rpt_be (struct rtw89_dev *rtwdev,u8 mac_idx,bool enable) +{ +u32 reg, val; + + reg =rtw89_mac_reg_by_idx (rtwdev,R_BE_RCR , mac_idx); + val = enable ?MAC_AX_PHY_RPT_SIZE_8 :MAC_AX_PHY_RPT_SIZE_0 ; +rtw89_write32_mask (rtwdev, reg,B_BE_PHY_RPT_SZ_MASK , val); +rtw89_write32_mask (rtwdev, reg,B_BE_HDR_CNV_SZ_MASK ,MAC_AX_HDR_CNV_SIZE_0 ); + + reg =rtw89_mac_reg_by_idx (rtwdev,R_BE_DRV_INFO_OPTION , mac_idx); +rtw89_write32_mask (rtwdev, reg,B_BE_DRV_INFO_PHYRPT_EN , enable); +} +EXPORT_SYMBOL (rtw89_mac_cfg_phy_rpt_be); +static int rtw89_mac_cfg_ppdu_status_be (struct rtw89_dev *rtwdev,u8 mac_idx,bool enable) {
@@ -2583,6 +2597,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .typ_fltr_opt = rtw89_mac_typ_fltr_opt_be, .cfg_ppdu_status = rtw89_mac_cfg_ppdu_status_be, + .cfg_phy_rpt = rtw89_mac_cfg_phy_rpt_be, .dle_mix_cfg = dle_mix_cfg_be, .chk_dle_rdy = chk_dle_rdy_be,
drivers/net/wireless/realtek/rtw89/reg.h +4 -0
@@ -7447,6 +7447,10 @@#define B_BE_CSIPRT_HESU_AID_EN BIT(25)#define B_BE_CSIPRT_VHTSU_AID_EN BIT(24) +#define R_BE_DRV_INFO_OPTION 0x11470 +#define R_BE_DRV_INFO_OPTION_C1 0x15470 +#define B_BE_DRV_INFO_PHYRPT_EN BIT(0) +#define R_BE_RX_ERR_ISR 0x114F4#define R_BE_RX_ERR_ISR_C1 0x154F4#define B_BE_RX_ERR_TRIG_ACT_TO BIT(9)
drivers/net/wireless/realtek/rtw89/rtw8851b.c +3 -1
@@ -2298,7 +2298,8 @@ static void rtw8851b_query_ppdu(struct rtw89_dev *rtwdev,u8 path;u8 *rx_power = phy_ppdu->rssi; - status->signal =RTW89_RSSI_RAW_TO_DBM (rx_power[RF_PATH_A ]); +if (!status->signal) + status->signal =RTW89_RSSI_RAW_TO_DBM (rx_power[RF_PATH_A ]);for (path =0 ; path < rtwdev->chip->rf_path_num; path++) { status->chains |=BIT (path);
@@ -2391,6 +2392,7 @@ static const struct rtw89_chip_ops rtw8851b_chip_ops = { .ctrl_btg_bt_rx = rtw8851b_ctrl_btg_bt_rx, .query_ppdu = rtw8851b_query_ppdu, .convert_rpl_to_rssi = NULL, + .phy_rpt_to_rssi = NULL, .ctrl_nbtg_bt_tx = rtw8851b_ctrl_nbtg_bt_tx, .cfg_txrx_path = rtw8851b_bb_cfg_txrx_path, .set_txpwr_ul_tb_offset = rtw8851b_set_txpwr_ul_tb_offset,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +4 -1
@@ -2068,7 +2068,9 @@ static void rtw8852a_query_ppdu(struct rtw89_dev *rtwdev,u8 path;u8 *rx_power = phy_ppdu->rssi; - status->signal =RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], rx_power[RF_PATH_B ])); +if (!status->signal) + status->signal =RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], + rx_power[RF_PATH_B ]));for (path =0 ; path < rtwdev->chip->rf_path_num; path++) { status->chains |=BIT (path); status->chain_signal[path] =RTW89_RSSI_RAW_TO_DBM (rx_power[path]);
@@ -2116,6 +2118,7 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { .ctrl_btg_bt_rx = rtw8852a_ctrl_btg_bt_rx, .query_ppdu = rtw8852a_query_ppdu, .convert_rpl_to_rssi = NULL, + .phy_rpt_to_rssi = NULL, .ctrl_nbtg_bt_tx = rtw8852a_ctrl_nbtg_bt_tx, .cfg_txrx_path = NULL, .set_txpwr_ul_tb_offset = rtw8852a_set_txpwr_ul_tb_offset,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -745,6 +745,7 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = { .ctrl_btg_bt_rx = rtw8852bx_ctrl_btg_bt_rx, .query_ppdu = rtw8852bx_query_ppdu, .convert_rpl_to_rssi = rtw8852bx_convert_rpl_to_rssi, + .phy_rpt_to_rssi = NULL, .ctrl_nbtg_bt_tx = rtw8852bx_ctrl_nbtg_bt_tx, .cfg_txrx_path = rtw8852bx_bb_cfg_txrx_path, .set_txpwr_ul_tb_offset = rtw8852bx_set_txpwr_ul_tb_offset,
drivers/net/wireless/realtek/rtw89/rtw8852b_common.c +3 -1
@@ -1950,7 +1950,9 @@ static void __rtw8852bx_query_ppdu(struct rtw89_dev *rtwdev,u8 path;u8 *rx_power = phy_ppdu->rssi; - status->signal =RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], rx_power[RF_PATH_B ])); +if (!status->signal) + status->signal =RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], + rx_power[RF_PATH_B ]));for (path =0 ; path < rtwdev->chip->rf_path_num; path++) { status->chains |=BIT (path); status->chain_signal[path] =RTW89_RSSI_RAW_TO_DBM (rx_power[path]);
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -679,6 +679,7 @@ static const struct rtw89_chip_ops rtw8852bt_chip_ops = { .ctrl_btg_bt_rx = rtw8852bx_ctrl_btg_bt_rx, .query_ppdu = rtw8852bx_query_ppdu, .convert_rpl_to_rssi = rtw8852bx_convert_rpl_to_rssi, + .phy_rpt_to_rssi = NULL, .ctrl_nbtg_bt_tx = rtw8852bx_ctrl_nbtg_bt_tx, .cfg_txrx_path = rtw8852bx_bb_cfg_txrx_path, .set_txpwr_ul_tb_offset = rtw8852bx_set_txpwr_ul_tb_offset,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +5 -1
@@ -2807,7 +2807,10 @@ static void rtw8852c_query_ppdu(struct rtw89_dev *rtwdev,u8 path;u8 *rx_power = phy_ppdu->rssi; - status->signal =RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], rx_power[RF_PATH_B ])); +if (!status->signal) + status->signal =RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], + rx_power[RF_PATH_B ])); +for (path =0 ; path < rtwdev->chip->rf_path_num; path++) { status->chains |=BIT (path); status->chain_signal[path] =RTW89_RSSI_RAW_TO_DBM (rx_power[path]);
@@ -2907,6 +2910,7 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .ctrl_btg_bt_rx = rtw8852c_ctrl_btg_bt_rx, .query_ppdu = rtw8852c_query_ppdu, .convert_rpl_to_rssi = NULL, + .phy_rpt_to_rssi = NULL, .ctrl_nbtg_bt_tx = rtw8852c_ctrl_nbtg_bt_tx, .cfg_txrx_path = rtw8852c_bb_cfg_txrx_path, .set_txpwr_ul_tb_offset = rtw8852c_set_txpwr_ul_tb_offset,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +15 -2
@@ -2565,8 +2565,10 @@ static void rtw8922a_query_ppdu(struct rtw89_dev *rtwdev,u8 path;u8 *rx_power = phy_ppdu->rssi; - status->signal = -RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], rx_power[RF_PATH_B ])); +if (!status->signal) + status->signal =RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], + rx_power[RF_PATH_B ])); +for (path =0 ; path < rtwdev->chip->rf_path_num; path++) { status->chains |=BIT (path); status->chain_signal[path] =RTW89_RSSI_RAW_TO_DBM (rx_power[path]);
@@ -2607,6 +2609,16 @@ static void rtw8922a_convert_rpl_to_rssi(struct rtw89_dev *rtwdev, phy_ppdu->rssi_avg = phy_ppdu->rpl_avg; } +static void rtw8922a_phy_rpt_to_rssi (struct rtw89_dev *rtwdev, +struct rtw89_rx_desc_info *desc_info, +struct ieee80211_rx_status *rx_status) +{ +if (desc_info->rssi <=0x1 || (desc_info->rssi >>2 ) >MAX_RSSI ) +return ; + + rx_status->signal = (desc_info->rssi >>2 ) -MAX_RSSI ; +} +static int rtw8922a_mac_enable_bb_rf (struct rtw89_dev *rtwdev) { rtw89_write8_set(rtwdev, R_BE_FEN_RST_ENABLE,
@@ -2665,6 +2677,7 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .ctrl_btg_bt_rx = rtw8922a_ctrl_btg_bt_rx, .query_ppdu = rtw8922a_query_ppdu, .convert_rpl_to_rssi = rtw8922a_convert_rpl_to_rssi, + .phy_rpt_to_rssi = rtw8922a_phy_rpt_to_rssi, .ctrl_nbtg_bt_tx = rtw8922a_ctrl_nbtg_bt_tx, .cfg_txrx_path = rtw8922a_bb_cfg_txrx_path, .set_txpwr_ul_tb_offset = NULL,
drivers/net/wireless/realtek/rtw89/txrx.h +3 -0
@@ -560,6 +560,9 @@ struct rtw89_phy_sts_iehdr {#define BE_RXD_HDR_OFFSET_MASK GENMASK(20, 16)#define BE_RXD_WL_HD_IV_LEN_MASK GENMASK(26, 21) +/* BE RXD - PHY RPT dword0 */ +#define BE_RXD_PHY_RSSI GENMASK(11, 0) +struct rtw89_phy_sts_ie00 {__le32 w0;__le32 w1;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/6 wifi: rtw89: refine link handling for link_sta_rc_update
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
The original handling will iterate all active links under the given sta and apply the changes to each. Now, stack tweaks ops from sta_rc_update to link_sta_rc_update, which means targeting a given link. Then, our link iteration looks redundant. So, refine it to apply the changes to the link directly.
--- drivers/net/wireless/realtek/rtw89/mac80211.c | 9 +++++++-- drivers/net/wireless/realtek/rtw89/phy.c | 15 ++++++--------- drivers/net/wireless/realtek/rtw89/phy.h | 3 +++ 3 files changed, 16 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw89/mac80211.c +7 -2
@@ -1307,10 +1307,15 @@ static void rtw89_ops_sta_rc_update(struct ieee80211_hw *hw, struct ieee80211_link_sta *link_sta, u32 changed) { -struct ieee80211_sta *sta = link_sta->sta; +struct rtw89_sta *rtwsta =sta_to_rtwsta (link_sta->sta);struct rtw89_dev *rtwdev = hw->priv; +struct rtw89_sta_link *rtwsta_link; + + rtwsta_link = rtwsta->links[link_sta->link_id]; +if (unlikely (!rtwsta_link)) +return ; -rtw89_phy_ra_update_sta (rtwdev, sta, changed); +rtw89_phy_ra_update_sta_link (rtwdev, rtwsta_link, changed); } static int rtw89_ops_add_chanctx(struct ieee80211_hw *hw,
drivers/net/wireless/realtek/rtw89/phy.c +6 -9
@@ -467,11 +467,11 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev, ra->csi_mode = csi_mode; } -static void __rtw89_phy_ra_update_sta (struct rtw89_dev *rtwdev, -struct rtw89_vif_link *rtwvif_link, -struct rtw89_sta_link *rtwsta_link, -u32 changed) +void rtw89_phy_ra_update_sta_link (struct rtw89_dev *rtwdev, +struct rtw89_sta_link *rtwsta_link, +u32 changed) { +struct rtw89_vif_link *rtwvif_link = rtwsta_link->rtwvif_link;struct ieee80211_vif *vif =rtwvif_link_to_vif (rtwvif_link);struct rtw89_ra_info *ra = &rtwsta_link->ra;struct ieee80211_link_sta *link_sta;
@@ -504,14 +504,11 @@ void rtw89_phy_ra_update_sta(struct rtw89_dev *rtwdev, struct ieee80211_sta *sta u32 changed) {struct rtw89_sta *rtwsta =sta_to_rtwsta (sta); -struct rtw89_vif_link *rtwvif_link;struct rtw89_sta_link *rtwsta_link;unsigned int link_id; -rtw89_sta_for_each_link (rtwsta, rtwsta_link, link_id) { - rtwvif_link = rtwsta_link->rtwvif_link; -__rtw89_phy_ra_update_sta (rtwdev, rtwvif_link, rtwsta_link, changed); - } +rtw89_sta_for_each_link (rtwsta, rtwsta_link, link_id) +rtw89_phy_ra_update_sta_link (rtwdev, rtwsta_link, changed); } static bool __check_rate_pattern(struct rtw89_phy_rate_pattern *next,
drivers/net/wireless/realtek/rtw89/phy.h +3 -0
@@ -926,6 +926,9 @@ void rtw89_phy_ra_assoc(struct rtw89_dev *rtwdev, struct rtw89_sta_link *rtwsta_void rtw89_phy_ra_update (struct rtw89_dev *rtwdev);void rtw89_phy_ra_update_sta (struct rtw89_dev *rtwdev,struct ieee80211_sta *sta,u32 changed); +void rtw89_phy_ra_update_sta_link (struct rtw89_dev *rtwdev, +struct rtw89_sta_link *rtwsta_link, +u32 changed);void rtw89_phy_rate_pattern_vif (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif,const struct cfg80211_bitrate_mask *mask);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/6 wifi: rtw89: add crystal_cap check to avoid setting as overflow value
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
In the original flow, the crystal_cap might be calculated as a negative value and set as an overflow value. Therefore, we added a check to limit the calculated crystal_cap value. Additionally, we shrank the crystal_cap adjustment according to specific CFO.
--- drivers/net/wireless/realtek/rtw89/phy.c | 11 ++++++----- drivers/net/wireless/realtek/rtw89/phy.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +6 -5
@@ -4266,7 +4266,6 @@ static void rtw89_phy_cfo_set_crystal_cap(struct rtw89_dev *rtwdev,if (!force && cfo->crystal_cap == crystal_cap)return ; - crystal_cap =clamp_t (u8, crystal_cap,0 ,127 );if (chip->chip_id ==RTL8852A || chip->chip_id ==RTL8851B ) {rtw89_phy_cfo_set_xcap_reg (rtwdev, true, crystal_cap);rtw89_phy_cfo_set_xcap_reg (rtwdev, false, crystal_cap);
@@ -4389,7 +4388,7 @@ static void rtw89_phy_cfo_crystal_cap_adjust(struct rtw89_dev *rtwdev, s32 curr_cfo) {struct rtw89_cfo_tracking_info *cfo = &rtwdev->cfo_tracking; -s8 crystal_cap = cfo->crystal_cap; +int crystal_cap = cfo->crystal_cap;s32 cfo_abs =abs (curr_cfo);int sign;
@@ -4410,15 +4409,17 @@ static void rtw89_phy_cfo_crystal_cap_adjust(struct rtw89_dev *rtwdev, } sign = curr_cfo >0 ?1 :-1 ;if (cfo_abs >CFO_TRK_STOP_TH_4 ) - crystal_cap +=7 * sign; + crystal_cap +=3 * sign;else if (cfo_abs >CFO_TRK_STOP_TH_3 ) - crystal_cap +=5 * sign; -else if (cfo_abs >CFO_TRK_STOP_TH_2 ) crystal_cap +=3 * sign; +else if (cfo_abs >CFO_TRK_STOP_TH_2 ) + crystal_cap +=1 * sign;else if (cfo_abs >CFO_TRK_STOP_TH_1 ) crystal_cap +=1 * sign;else return ; + + crystal_cap =clamp (crystal_cap,0 ,127 );rtw89_phy_cfo_set_crystal_cap (rtwdev, (u8 )crystal_cap, false); rtw89_debug(rtwdev, RTW89_DBG_CFO, "X_cap{Curr,Default}={0x%x,0x%x}\n",
drivers/net/wireless/realtek/rtw89/phy.h +1 -1
@@ -57,7 +57,7 @@#define CFO_TRK_STOP_TH_4 (30 << 2)#define CFO_TRK_STOP_TH_3 (20 << 2)#define CFO_TRK_STOP_TH_2 (10 << 2) -#define CFO_TRK_STOP_TH_1 (00 << 2) +#define CFO_TRK_STOP_TH_1 (03 << 2)#define CFO_TRK_STOP_TH (2 << 2)#define CFO_SW_COMP_FINE_TUNE (2 << 2)#define CFO_PERIOD_CNT 15
Signature · 1 line
2.25.1