wifi: rtw89: support hw_scan v3 format for WiFI 7 chips
Ping-Ke Shih
maintainerv2 cover wifi: rtw89: support hw_scan v3 format for WiFI 7 chips
Due to firmware change the hw_scan format, update the format accordingly to support current new firmware. (By patch 2/3 and 3/3)
The patch 1/3 is to store RX filter settings by a variable, so hardware leaves from idle can restore the setting from the variable. Otherwise, the RX filter is unexpected, and AP mode can't receive certain types of frames.
v2:
- patch 3/3: consider WoWLAN PNO user scenario, and not consider wildcard_6ghz field for WiFi 7 chips.
Dian-Syuan Yang (1):
wifi: rtw89: refine RX filter configuration for WiFi 7 generation
Po-Hao Huang (2):
wifi: rtw89: fix scan offload version check logic
wifi: rtw89: change scan offload format to V3 for WiFi 7 IC
drivers/net/wireless/realtek/rtw89/core.c | 3 +- drivers/net/wireless/realtek/rtw89/core.h | 4 + drivers/net/wireless/realtek/rtw89/fw.c | 168 +++++++++++++++++--- drivers/net/wireless/realtek/rtw89/fw.h | 6 + drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/mac_be.c | 7 +- drivers/net/wireless/realtek/rtw89/reg.h | 6 +- drivers/net/wireless/realtek/rtw89/wow.c | 20 +++ 9 files changed, 187 insertions(+), 29 deletions(-)
base-commit: b0034a2e415603daa1cf00363b407cc145bbcd31
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/3 wifi: rtw89: refine RX filter configuration for WiFi 7 generation
From: Dian-Syuan Yang <[email protected]>
When an AP interface is registered and starts AP, mac80211 calls the configure_filter() to clear B_AX_A_UC_CAM_MATCH and B_AX_A_BC_CAM_MATCH so that frames from un-associated stations can be received. However, for a dedicated AP interface created via iw command, configure_filter() is only triggered on the initial AP startup. Since the interface remains up even after hostapd stops, and it isn't triggered again on later restarts. Additionally, each AP start causes IPS leave, reverting the RX filter to its default value.
For WiFi 7 chips, the default value is hardcoded in rx_fltr_init_be(), so the reverted value does not match hal.rx_fltr. Therefore, refine the behavior of WiFi 7 chips to align with the WiFi 6 implementation.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/core.c | 3 ++- drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/mac_be.c | 7 ++----- drivers/net/wireless/realtek/rtw89/reg.h | 6 +++++- 5 files changed, 11 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +2 -1
@@ -6960,6 +6960,7 @@ void rtw89_sta_unset_link(struct rtw89_sta *rtwsta, unsigned int link_id)int rtw89_core_init (struct rtw89_dev *rtwdev) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;struct rtw89_btc *btc = &rtwdev->btc;u8 band;
@@ -7016,7 +7017,7 @@ int rtw89_core_init(struct rtw89_dev *rtwdev)rtw89_core_ppdu_sts_init (rtwdev);rtw89_traffic_stats_init (rtwdev, &rtwdev->stats); - rtwdev->hal.rx_fltr =DEFAULT_AX_RX_FLTR ; + rtwdev->hal.rx_fltr = mac->default_rx_fltr; rtwdev->dbcc_en = false; rtwdev->mlo_dbcc_mode =MLO_DBCC_NOT_SUPPORT ; rtwdev->mac.qta_mode =RTW89_QTA_SCC ;
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -7458,6 +7458,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .mem_base_addrs = rtw89_mac_mem_base_addrs_ax, .mem_page_size = MAC_MEM_DUMP_PAGE_SIZE_AX, .rx_fltr = R_AX_RX_FLTR_OPT, + .default_rx_fltr = DEFAULT_AX_RX_FLTR, .port_base = &rtw89_port_base_ax, .agg_len_ht = R_AX_AGG_LEN_HT_0, .ps_status = R_AX_PPWRBIT_SETTING,
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -1063,6 +1063,7 @@ struct rtw89_mac_gen_def {const u32 *mem_base_addrs;u32 mem_page_size;u32 rx_fltr; +u32 default_rx_fltr;const struct rtw89_port_reg *port_base;u32 agg_len_ht;u32 ps_status;
drivers/net/wireless/realtek/rtw89/mac_be.c +2 -5
@@ -1332,11 +1332,7 @@ static int rx_fltr_init_be(struct rtw89_dev *rtwdev, u8 mac_idx)rtw89_mac_typ_fltr_opt_be (rtwdev,RTW89_DATA ,RTW89_FWD_TO_HOST , mac_idx); reg =rtw89_mac_reg_by_idx (rtwdev,R_BE_RX_FLTR_OPT , mac_idx); - val =B_BE_A_BC_CAM_MATCH |B_BE_A_UC_CAM_MATCH |B_BE_A_MC | -B_BE_A_BC |B_BE_A_A1_MATCH | -u32_encode_bits (15 ,B_BE_UID_FILTER_MASK ); -rtw89_write32 (rtwdev, reg, val); -u32p_replace_bits (&rtwdev->hal.rx_fltr,15 ,B_BE_UID_FILTER_MASK ); +rtw89_write32 (rtwdev, reg, rtwdev->hal.rx_fltr); reg =rtw89_mac_reg_by_idx (rtwdev,R_BE_PLCP_HDR_FLTR , mac_idx); val = B_BE_HE_SIGB_CRC_CHK | B_BE_VHT_MU_SIGB_CRC_CHK |
@@ -3280,6 +3276,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .mem_base_addrs = rtw89_mac_mem_base_addrs_be, .mem_page_size = MAC_MEM_DUMP_PAGE_SIZE_BE, .rx_fltr = R_BE_RX_FLTR_OPT, + .default_rx_fltr = DEFAULT_BE_RX_FLTR, .port_base = &rtw89_port_base_be, .agg_len_ht = R_BE_AGG_LEN_HT_0, .ps_status = R_BE_WMTX_POWER_BE_BIT_CTL,
drivers/net/wireless/realtek/rtw89/reg.h +5 -1
@@ -3348,7 +3348,7 @@#define DEFAULT_AX_RX_FLTR (B_AX_A_A1_MATCH | B_AX_A_BC | B_AX_A_MC | \ B_AX_A_UC_CAM_MATCH | B_AX_A_BC_CAM_MATCH | \ B_AX_A_PWR_MGNT | B_AX_A_FTM_REQ | \ - u32_encode_bits(3, B_AX_UID_FILTER_MASK) | \ + FIELD_PREP_CONST(B_AX_UID_FILTER_MASK, 3) | \ B_AX_A_BCN_CHK_EN)#define B_AX_RX_FLTR_CFG_MASK ((u32)~B_AX_RX_MPDU_MAX_LEN_MASK)
@@ -8209,6 +8209,10 @@#define B_BE_A_BC BIT(2)#define B_BE_A_A1_MATCH BIT(1)#define B_BE_SNIFFER_MODE BIT(0) +#define DEFAULT_BE_RX_FLTR (B_BE_A_BC_CAM_MATCH | B_BE_A_UC_CAM_MATCH | \ + B_BE_A_MC | B_BE_A_BC | B_BE_A_A1_MATCH | \ + FIELD_PREP_CONST(B_BE_UID_FILTER_MASK, 15) | \ + B_BE_A_FTM_REQ | B_BE_A_BCN_CHK_EN)#define R_BE_CTRL_FLTR 0x11424#define R_BE_CTRL_FLTR_C1 0x15424
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next v2 1/3] wifi: rtw89: refine RX filter configuration for WiFi 7 generation
Quoted 11 lines · Ping-Ke Shih
From: Dian-Syuan Yang <[email protected]>
When an AP interface is registered and starts AP, mac80211 calls the
configure_filter()to clearB_AX_A_UC_CAM_MATCHandB_AX_A_BC_CAM_MATCHso that frames from un-associated stations can be received. However, for a dedicated AP interface created via iw command,configure_filter()is only triggered on the initial AP startup. Since the interface remains up even after hostapd stops, and it isn't triggered again on later restarts. Additionally, each AP start causes IPS leave, reverting the RX filter to its default value.
Quoted 6 lines
For WiFi 7 chips, the default value is hardcoded in
rx_fltr_init_be(), so the reverted value does not match hal.rx_fltr. Therefore, refine the behavior of WiFi 7 chips to align with the WiFi 6 implementation.Signed-off-by Dian-Syuan Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
3 patch(es) applied to rtw-next branch of rtw.git, thanks.
304720870f4c wifi: rtw89: refine RX filter configuration for WiFi 7 generation 58c0d447c53b wifi: rtw89: fix scan offload version check logic d946a4e03116 wifi: rtw89: change scan offload format to V3 for WiFi 7 IC
Ping-Ke Shih
maintainerPATCH v2 2/3 wifi: rtw89: fix scan offload version check logic
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
The version check with less than should check for smallest upper-bound first, or some branch will be unreachable.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/fw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +4 -4
@@ -7615,12 +7615,12 @@ int rtw89_fw_h2c_scan_offload_be(struct rtw89_dev *rtwdev,rtw89_scan_get_6g_disabled_chan (rtwdev, option); -if (RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD_BE_V1 , &rtwdev->fw)) { - cfg_len =offsetofend (typeof (*h2c), w9); - scan_offload_ver =1 ; - }else if (RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD_BE_V0 , &rtwdev->fw)) { +if (RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD_BE_V0 , &rtwdev->fw)) { cfg_len =offsetofend (typeof (*h2c), w8); scan_offload_ver =0 ; + }else if (RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD_BE_V1 , &rtwdev->fw)) { + cfg_len =offsetofend (typeof (*h2c), w9); + scan_offload_ver =1 ; } len = cfg_len + macc_role_size + opch_size;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/3 wifi: rtw89: change scan offload format to V3 for WiFi 7 IC
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Adapt H2C format to fit firmware version after 0.35.113.2, which only supports active scanning with a provided SSID list. The wildcard_6ghz field is no longer required for WiFi 7 chips' new format, but not removed since WiFi 6 still requires it. Keep original H2C style also to support older firmwares.
---
v2: consider WoWLAN PNO user scenario, and not consider wildcard_6ghz
field for WiFi 7 chips.
--- drivers/net/wireless/realtek/rtw89/core.h | 4 + drivers/net/wireless/realtek/rtw89/fw.c | 160 +++++++++++++++++++--- drivers/net/wireless/realtek/rtw89/fw.h | 6 + drivers/net/wireless/realtek/rtw89/wow.c | 20 +++ 4 files changed, 172 insertions(+), 18 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +4 -0
@@ -5700,6 +5700,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_MACID_PAUSE_SLEEP ,RTW89_FW_FEATURE_SCAN_OFFLOAD_BE_V0 ,RTW89_FW_FEATURE_SCAN_OFFLOAD_BE_V1 , +RTW89_FW_FEATURE_SCAN_OFFLOAD_BE_V2 ,RTW89_FW_FEATURE_WOW_REASON_V1 , RTW89_FW_FEATURE_GROUP(WITH_RFK_PRE_NOTIFY, RTW89_FW_FEATURE_RFK_PRE_NOTIFY_V0,
@@ -6894,6 +6895,9 @@ struct rtw89_hw_scan_info {struct list_head chan_list;struct rtw89_chan op_chan;struct rtw89_hw_scan_extra_op extra_op; +u8 wildcard_pkt_id[NUM_NL80211_BANDS ]; +u16 ssid_total_len; +int n_ssids;bool connected;bool abort;u16 delay;/* in unit of ms */
drivers/net/wireless/realtek/rtw89/fw.c +142 -18
288 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +6 -0
@@ -3099,6 +3099,7 @@ struct rtw89_h2c_scanofld_be {__le32 w11;/* Added after SCAN_OFFLOAD_BE_V2 */ /* struct rtw89_h2c_scanofld_be_macc_role (flexible number) */ /* struct rtw89_h2c_scanofld_be_opch (flexible number) */ +/* probe SSID list (flexible number); Added after SCAN_OFFLOAD_BE_V3 */ } __packed;#define RTW89_H2C_SCANOFLD_BE_W0_OP GENMASK(1, 0)
@@ -5577,6 +5578,11 @@ int rtw89_hw_scan_add_chan_list_be(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link);int rtw89_pno_scan_add_chan_list_be (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link); +int rtw89_hw_scan_append_wildcard_probe_req (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +const u8 *mac_addr,bool wowlan); +void rtw89_hw_scan_calc_req_ssid (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link,bool wowlan);int rtw89_fw_h2c_trigger_cpu_exception (struct rtw89_dev *rtwdev);int rtw89_fw_h2c_pkt_drop (struct rtw89_dev *rtwdev,const struct rtw89_pkt_drop_params *params);
drivers/net/wireless/realtek/rtw89/wow.c +20 -0
@@ -1457,9 +1457,20 @@ static int rtw89_wow_disable_trx_post(struct rtw89_dev *rtwdev)static void rtw89_fw_release_pno_pkt_list (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link) { +struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info;struct rtw89_wow_param *rtw_wow = &rtwdev->wow;struct list_head *pkt_list = &rtw_wow->pno_pkt_list;struct rtw89_pktofld_info *info, *tmp; +u8 idx, wildcard_pkt_id; + +for (idx =NL80211_BAND_2GHZ ; idx <NUM_NL80211_BANDS ; idx++) { +if (!(rtwdev->chip->support_bands &BIT (idx))) +continue ; + + wildcard_pkt_id = scan_info->wildcard_pkt_id[idx]; +if (wildcard_pkt_id !=RTW89_SCANOFLD_PKT_NONE ) +rtw89_fw_h2c_del_pkt_offload (rtwdev, wildcard_pkt_id); + }list_for_each_entry_safe (info, tmp, pkt_list, list) {rtw89_fw_h2c_del_pkt_offload (rtwdev, info->id);
@@ -1480,6 +1491,11 @@ static int rtw89_pno_scan_update_probe_req(struct rtw89_dev *rtwdev,struct sk_buff *skb;int ret; + ret =rtw89_hw_scan_append_wildcard_probe_req (rtwdev, rtwvif_link, + rtwvif_link->mac_addr, true); +if (ret) +return ret; +for (i =0 ; i < num; i++) { skb = ieee80211_probereq_get(rtwdev->hw, rtwvif_link->mac_addr, nd_config->match_sets[i].ssid.ssid,
@@ -1523,6 +1539,10 @@ static int rtw89_pno_scan_offload(struct rtw89_dev *rtwdev, bool enable)int ret;if (enable) { +rtw89_hw_scan_calc_req_ssid (rtwdev, rtwvif_link, true); +memset (rtwdev->scan_info.wildcard_pkt_id,RTW89_SCANOFLD_PKT_NONE , +sizeof (rtwdev->scan_info.wildcard_pkt_id)); + ret =rtw89_pno_scan_update_probe_req (rtwdev, rtwvif_link);if (ret) {rtw89_err (rtwdev,"Update probe request failed\n" );
Signature · 1 line
2.25.1