wifi: rtw89: add hardware scan and power save mode for WiFi 7 chips
Ping-Ke Shih
maintainercover wifi: rtw89: add hardware scan and power save mode for WiFi 7 chips
Hardware scan and power save mode for WiFi 7 chips are similar to existing chips, but more settings are introduced for MLO feature that we have not supported yet at this moment.
To support multi-links AP mode, the H2C command to download beacon frame to firmware is extended, so the last patch does change accordingly, but currently we don't release firmware of 8922A yet, so I don't have a condition for backward compatibility.
Chin-Yen Lee (2):
wifi: rtw89: add new H2C for PS mode in 802.11be chip
wifi: rtw89: update ps_state register for chips with different
generation
Po-Hao Huang (5):
wifi: rtw89: update scan C2H messages for wifi 7 IC
wifi: rtw89: debug: add FW log component for scan
wifi: rtw89: prepare scan leaf functions for wifi 7 ICs
wifi: rtw89: 8922a: add ieee80211_ops::hw_scan
wifi: rtw89: 8922a: add more fields to beacon H2C command to support
multi-links
drivers/net/wireless/realtek/rtw89/core.h | 39 ++ drivers/net/wireless/realtek/rtw89/fw.c | 450 +++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 201 ++++++++- drivers/net/wireless/realtek/rtw89/mac.c | 42 +- drivers/net/wireless/realtek/rtw89/mac.h | 7 + drivers/net/wireless/realtek/rtw89/mac_be.c | 4 + drivers/net/wireless/realtek/rtw89/ps.c | 10 +- drivers/net/wireless/realtek/rtw89/reg.h | 3 + 8 files changed, 736 insertions(+), 20 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/7 wifi: rtw89: update scan C2H messages for wifi 7 IC
From: Po-Hao Huang <[email protected]>
Add definition and parsing for wifi 7 extended fields. These fields include hardware index which is current reporting, timestamp and self defined sequences for debug purposes.
--- drivers/net/wireless/realtek/rtw89/fw.h | 5 +++++ drivers/net/wireless/realtek/rtw89/mac.c | 24 ++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.h +5 -0
@@ -3309,6 +3309,11 @@ struct rtw89_c2h_scanofld {#define RTW89_C2H_SCANOFLD_W5_TX_FAIL GENMASK(3, 0)#define RTW89_C2H_SCANOFLD_W5_AIR_DENSITY GENMASK(7, 4)#define RTW89_C2H_SCANOFLD_W5_BAND GENMASK(25, 24) +#define RTW89_C2H_SCANOFLD_W5_MAC_IDX BIT(26) +#define RTW89_C2H_SCANOFLD_W6_SW_DEF GENMASK(7, 0) +#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_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 +20 -4
@@ -4686,8 +4686,9 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,struct ieee80211_vif *vif = rtwdev->scan_info.scanning_vif;struct rtw89_vif *rtwvif =vif_to_rtwvif_safe (vif);struct rtw89_chan new; -u8 reason, status, tx_fail, band, actual_period; -u32 last_chan = rtwdev->scan_info.last_chan_idx; +u8 reason, status, tx_fail, band, actual_period, expect_period; +u32 last_chan = rtwdev->scan_info.last_chan_idx, report_tsf; +u8 mac_idx, sw_def, fw_def;u16 chan;int ret;
@@ -4700,15 +4701,29 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb, reason =le32_get_bits (c2h->w2,RTW89_C2H_SCANOFLD_W2_RSN ); band =le32_get_bits (c2h->w5,RTW89_C2H_SCANOFLD_W5_BAND ); actual_period =le32_get_bits (c2h->w2,RTW89_C2H_SCANOFLD_W2_PERIOD ); + mac_idx =le32_get_bits (c2h->w5,RTW89_C2H_SCANOFLD_W5_MAC_IDX ); +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 , -"band: %d, chan: %d, reason: %d, status: %d, tx_fail: %d, actual: %d\n" , - band, chan, reason, status, tx_fail, actual_period); +"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 ); + +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); + }switch (reason) { +case RTW89_SCAN_LEAVE_OP_NOTIFY :case RTW89_SCAN_LEAVE_CH_NOTIFY :if (rtw89_is_op_chan (rtwdev, band, chan)) {rtw89_mac_enable_beacon_for_ap_vifs (rtwdev, false);
@@ -4727,6 +4742,7 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,rtw89_hw_scan_complete (rtwdev, vif, rtwdev->scan_info.abort); }break ; +case RTW89_SCAN_ENTER_OP_NOTIFY :case RTW89_SCAN_ENTER_CH_NOTIFY :if (rtw89_is_op_chan (rtwdev, band, chan)) { rtw89_assign_entity_chan(rtwdev, rtwvif->sub_entity_idx,
Signature · 1 line
2.25.1
Re: [PATCH 1/7] wifi: rtw89: update scan C2H messages for wifi 7 IC
Quoted 8 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
Add definition and parsing for wifi 7 extended fields. These fields include hardware index which is current reporting, timestamp and self defined sequences for debug purposes.
Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
7 patches applied to wireless-next.git, thanks.
b5d7020134d9 wifi: rtw89: update scan C2H messages for wifi 7 ICac54faf507e5 wifi: rtw89: debug: add FW log component for scana412920b7019 wifi: rtw89: prepare scan leaf functions for wifi 7 ICs 4ba24331c973 wifi: rtw89: 8922a: add ieee80211_ops::hw_scane58e3117019c wifi: rtw89: add new H2C for PS mode in 802.11be chip f651300cd884 wifi: rtw89: update ps_state register for chips with different generation f1abee76dba8 wifi: rtw89: 8922a: add more fields to beacon H2C command to support multi-links
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/7 wifi: rtw89: debug: add FW log component for scan
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
This allows scan related logs when FW log debug mode is on.
--- drivers/net/wireless/realtek/rtw89/fw.c | 8 ++++++-- drivers/net/wireless/realtek/rtw89/fw.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +6 -2
@@ -1829,10 +1829,14 @@ int rtw89_fw_h2c_init_ba_cam_users(struct rtw89_dev *rtwdev, u8 users,int rtw89_fw_h2c_fw_log (struct rtw89_dev *rtwdev,bool enable) {struct sk_buff *skb; -u32 comp = enable ?BIT (RTW89_FW_LOG_COMP_INIT ) |BIT (RTW89_FW_LOG_COMP_TASK ) | -BIT (RTW89_FW_LOG_COMP_PS ) |BIT (RTW89_FW_LOG_COMP_ERROR ) :0 ; +u32 comp =0 ;int ret; +if (enable) + comp =BIT (RTW89_FW_LOG_COMP_INIT ) |BIT (RTW89_FW_LOG_COMP_TASK ) | +BIT (RTW89_FW_LOG_COMP_PS ) |BIT (RTW89_FW_LOG_COMP_ERROR ) | +BIT (RTW89_FW_LOG_COMP_SCAN ); + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_LOG_CFG_LEN );if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for fw log cfg\n" );
drivers/net/wireless/realtek/rtw89/fw.h +1 -0
@@ -149,6 +149,7 @@ enum rtw89_fw_log_comp {RTW89_FW_LOG_COMP_TWT ,RTW89_FW_LOG_COMP_RF ,RTW89_FW_LOG_COMP_MCC =20 , + RTW89_FW_LOG_COMP_SCAN = 28, }; enum rtw89_pkt_offload_op {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/7 wifi: rtw89: prepare scan leaf functions for wifi 7 ICs
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
The channel field slightly differs between WiFi 6 and WiFi 7. So we prepare some required functions in advance, this doesn't change existing wifi 6 ICs behavior. This H2C prepares the channel list to be scanned for. With layout as the following:
+--------+--------------------+-------------------+-----------------------+ | header | number of channels | channel info size | channel_info * number | +--------+--------------------+-------------------+-----------------------+
--- drivers/net/wireless/realtek/rtw89/fw.c | 220 +++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 79 ++++++- drivers/net/wireless/realtek/rtw89/mac.c | 2 + drivers/net/wireless/realtek/rtw89/mac.h | 3 + drivers/net/wireless/realtek/rtw89/mac_be.c | 2 + 5 files changed, 302 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +217 -3
@@ -4078,6 +4078,102 @@ int rtw89_fw_h2c_scan_list_offload(struct rtw89_dev *rtwdev, int ch_num,return 0 ; } +int rtw89_fw_h2c_scan_list_offload_be (struct rtw89_dev *rtwdev,int ch_num, +struct list_head *chan_list) +{ +struct rtw89_wait_info *wait = &rtwdev->mac.fw_ofld_wait; +struct rtw89_h2c_chinfo_elem_be *elem; +struct rtw89_mac_chinfo_be *ch_info; +struct rtw89_h2c_chinfo *h2c; +struct sk_buff *skb; +unsigned int cond; +int skb_len; +int ret; + +static_assert (sizeof (*elem) ==RTW89_MAC_CHINFO_SIZE ); + + skb_len =struct_size (h2c, elem, ch_num); + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, skb_len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for h2c scan list\n" ); +return -ENOMEM ; + } + +skb_put (skb,sizeof (*h2c)); + h2c = (struct rtw89_h2c_chinfo *)skb->data; + + h2c->ch_num = ch_num; + h2c->elem_size =sizeof (*elem) /4 ;/* in unit of 4 bytes */ + h2c->arg =u8_encode_bits (RTW89_PHY_0 ,RTW89_H2C_CHINFO_ARG_MAC_IDX_MASK ); + +list_for_each_entry (ch_info, chan_list, list) { + elem = (struct rtw89_h2c_chinfo_elem_be *)skb_put (skb,sizeof (*elem)); + + elem->w0 =le32_encode_bits (ch_info->period,RTW89_H2C_CHINFO_BE_W0_PERIOD ) | +le32_encode_bits (ch_info->dwell_time,RTW89_H2C_CHINFO_BE_W0_DWELL ) | +le32_encode_bits (ch_info->central_ch, +RTW89_H2C_CHINFO_BE_W0_CENTER_CH ) | +le32_encode_bits (ch_info->pri_ch,RTW89_H2C_CHINFO_BE_W0_PRI_CH ); + + elem->w1 =le32_encode_bits (ch_info->bw,RTW89_H2C_CHINFO_BE_W1_BW ) | +le32_encode_bits (ch_info->ch_band,RTW89_H2C_CHINFO_BE_W1_CH_BAND ) | +le32_encode_bits (ch_info->dfs_ch,RTW89_H2C_CHINFO_BE_W1_DFS ) | +le32_encode_bits (ch_info->pause_data, +RTW89_H2C_CHINFO_BE_W1_PAUSE_DATA ) | +le32_encode_bits (ch_info->tx_null,RTW89_H2C_CHINFO_BE_W1_TX_NULL ) | +le32_encode_bits (ch_info->rand_seq_num, +RTW89_H2C_CHINFO_BE_W1_RANDOM ) | +le32_encode_bits (ch_info->notify_action, +RTW89_H2C_CHINFO_BE_W1_NOTIFY ) | +le32_encode_bits (ch_info->probe_id !=0xff ?1 :0 , +RTW89_H2C_CHINFO_BE_W1_PROBE ) | +le32_encode_bits (ch_info->leave_crit, +RTW89_H2C_CHINFO_BE_W1_EARLY_LEAVE_CRIT ) | +le32_encode_bits (ch_info->chkpt_timer, +RTW89_H2C_CHINFO_BE_W1_CHKPT_TIMER ); + + elem->w2 =le32_encode_bits (ch_info->leave_time, +RTW89_H2C_CHINFO_BE_W2_EARLY_LEAVE_TIME ) | +le32_encode_bits (ch_info->leave_th, +RTW89_H2C_CHINFO_BE_W2_EARLY_LEAVE_TH ) | +le32_encode_bits (ch_info->tx_pkt_ctrl, +RTW89_H2C_CHINFO_BE_W2_TX_PKT_CTRL ); + + elem->w3 =le32_encode_bits (ch_info->pkt_id[0 ],RTW89_H2C_CHINFO_BE_W3_PKT0 ) | +le32_encode_bits (ch_info->pkt_id[1 ],RTW89_H2C_CHINFO_BE_W3_PKT1 ) | +le32_encode_bits (ch_info->pkt_id[2 ],RTW89_H2C_CHINFO_BE_W3_PKT2 ) | +le32_encode_bits (ch_info->pkt_id[3 ],RTW89_H2C_CHINFO_BE_W3_PKT3 ); + + elem->w4 =le32_encode_bits (ch_info->pkt_id[4 ],RTW89_H2C_CHINFO_BE_W4_PKT4 ) | +le32_encode_bits (ch_info->pkt_id[5 ],RTW89_H2C_CHINFO_BE_W4_PKT5 ) | +le32_encode_bits (ch_info->pkt_id[6 ],RTW89_H2C_CHINFO_BE_W4_PKT6 ) | +le32_encode_bits (ch_info->pkt_id[7 ],RTW89_H2C_CHINFO_BE_W4_PKT7 ); + + elem->w5 =le32_encode_bits (ch_info->sw_def,RTW89_H2C_CHINFO_BE_W5_SW_DEF ) | +le32_encode_bits (ch_info->fw_probe0_ssids, +RTW89_H2C_CHINFO_BE_W5_FW_PROBE0_SSIDS ); + + elem->w6 =le32_encode_bits (ch_info->fw_probe0_shortssids, +RTW89_H2C_CHINFO_BE_W6_FW_PROBE0_SHORTSSIDS ) | +le32_encode_bits (ch_info->fw_probe0_bssids, +RTW89_H2C_CHINFO_BE_W6_FW_PROBE0_BSSIDS ); + } + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC ,H2C_CL_MAC_FW_OFLD , +H2C_FUNC_ADD_SCANOFLD_CH ,1 ,1 , skb_len); + + cond =RTW89_SCANOFLD_WAIT_COND_ADD_CH ; + + ret =rtw89_h2c_tx_and_wait (rtwdev, skb, wait, cond); +if (ret) { +rtw89_debug (rtwdev,RTW89_DBG_FW ,"failed to add scan ofld ch\n" ); +return ret; + } + +return 0 ; +} +int rtw89_fw_h2c_scan_offload (struct rtw89_dev *rtwdev,struct rtw89_scan_option *option,struct rtw89_vif *rtwvif)
@@ -4769,8 +4865,66 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type, } } -static int rtw89_hw_scan_add_chan_list (struct rtw89_dev *rtwdev, -struct rtw89_vif *rtwvif,bool connected) +static void rtw89_hw_scan_add_chan_be (struct rtw89_dev *rtwdev,int chan_type, +int ssid_num, +struct rtw89_mac_chinfo_be *ch_info) +{ +struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info; +struct ieee80211_vif *vif = rtwdev->scan_info.scanning_vif; +struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv; +struct cfg80211_scan_request *req = rtwvif->scan_req; +struct rtw89_pktofld_info *info; +u8 band, probe_count =0 , i; + + ch_info->notify_action =RTW89_SCANOFLD_DEBUG_MASK ; + ch_info->dfs_ch = chan_type ==RTW89_CHAN_DFS ; + ch_info->bw =RTW89_SCAN_WIDTH ; + ch_info->tx_null = false; + ch_info->pause_data = false; + ch_info->probe_id =RTW89_SCANOFLD_PKT_NONE ; + +if (ssid_num) { + band =rtw89_hw_to_nl80211_band (ch_info->ch_band); + +list_for_each_entry (info, &scan_info->pkt_list[band], list) { +if (info->channel_6ghz && + ch_info->pri_ch != info->channel_6ghz) +continue ; + ch_info->pkt_id[probe_count++] = info->id; +if (probe_count >=RTW89_SCANOFLD_MAX_SSID ) +break ; + } + } + +if (ch_info->ch_band ==RTW89_BAND_6G ) { +if ((ssid_num ==1 && req->ssids[0 ].ssid_len ==0 ) || + !ch_info->is_psc) { + ch_info->probe_id =RTW89_SCANOFLD_PKT_NONE ; +if (!req->duration_mandatory) + ch_info->period -=RTW89_DWELL_TIME_6G ; + } + } + +for (i = probe_count; i <RTW89_SCANOFLD_MAX_SSID ; i++) + ch_info->pkt_id[i] =RTW89_SCANOFLD_PKT_NONE ; + +switch (chan_type) { +case RTW89_CHAN_DFS : +if (ch_info->ch_band !=RTW89_BAND_6G ) + ch_info->period = +max_t (u8, ch_info->period,RTW89_DFS_CHAN_TIME ); + ch_info->dwell_time =RTW89_DWELL_TIME ; +break ; +case RTW89_CHAN_ACTIVE : +break ; +default : +rtw89_warn (rtwdev,"Channel type out of bound\n" ); +break ; + } +} + +int rtw89_hw_scan_add_chan_list (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif,bool connected) {struct cfg80211_scan_request *req = rtwvif->scan_req;struct rtw89_mac_chinfo *ch_info, *tmp;
@@ -4846,9 +5000,69 @@ static int rtw89_hw_scan_add_chan_list(struct rtw89_dev *rtwdev,return ret; } +int rtw89_hw_scan_add_chan_list_be (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif,bool connected) +{ +struct cfg80211_scan_request *req = rtwvif->scan_req; +struct rtw89_mac_chinfo_be *ch_info, *tmp; +struct ieee80211_channel *channel; +struct list_head chan_list; +enum rtw89_chan_type type; +int list_len, ret; +bool random_seq; +u32 idx; + + random_seq = !!(req->flags &NL80211_SCAN_FLAG_RANDOM_SN ); +INIT_LIST_HEAD (&chan_list); + +for (idx = rtwdev->scan_info.last_chan_idx, list_len =0 ; + idx < req->n_channels && list_len <RTW89_SCAN_LIST_LIMIT ; + idx++, list_len++) { + channel = req->channels[idx]; + ch_info =kzalloc (sizeof (*ch_info),GFP_KERNEL ); +if (!ch_info) { + ret = -ENOMEM ; + goto out; + } + +if (req->duration_mandatory) + ch_info->period = req->duration; +else if (channel->band ==NL80211_BAND_6GHZ ) + ch_info->period =RTW89_CHANNEL_TIME_6G +RTW89_DWELL_TIME_6G ; +else + ch_info->period =RTW89_CHANNEL_TIME ; + + ch_info->ch_band =rtw89_nl80211_to_hw_band (channel->band); + ch_info->central_ch = channel->hw_value; + ch_info->pri_ch = channel->hw_value; + ch_info->rand_seq_num = random_seq; + ch_info->is_psc =cfg80211_channel_is_psc (channel); + +if (channel->flags & (IEEE80211_CHAN_RADAR |IEEE80211_CHAN_NO_IR )) + type =RTW89_CHAN_DFS ; +else + type =RTW89_CHAN_ACTIVE ; +rtw89_hw_scan_add_chan_be (rtwdev, type, req->n_ssids, ch_info); + +list_add_tail (&ch_info->list, &chan_list); + } + + rtwdev->scan_info.last_chan_idx = idx; + ret =rtw89_fw_h2c_scan_list_offload_be (rtwdev, list_len, &chan_list); + +out: +list_for_each_entry_safe (ch_info, tmp, &chan_list, list) { +list_del (&ch_info->list); +kfree (ch_info); + } + +return ret; +} +static int rtw89_hw_scan_prehandle (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,bool connected) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;int ret; ret =rtw89_hw_scan_update_probe_req (rtwdev, rtwvif);
@@ -4856,7 +5070,7 @@ static int rtw89_hw_scan_prehandle(struct rtw89_dev *rtwdev,rtw89_err (rtwdev,"Update probe request failed\n" ); goto out; } - ret =rtw89_hw_scan_add_chan_list (rtwdev, rtwvif, connected); + ret = mac->add_chan_list (rtwdev, rtwvif, connected); out:return ret; }
drivers/net/wireless/realtek/rtw89/fw.h +78 -1
110 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/mac.c +2 -0
@@ -6224,5 +6224,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .dump_err_status = rtw89_mac_dump_err_status_ax, .is_txq_empty = mac_is_txq_empty_ax, + + .add_chan_list = rtw89_hw_scan_add_chan_list, };EXPORT_SYMBOL (rtw89_mac_gen_ax);
drivers/net/wireless/realtek/rtw89/mac.h +3 -0
@@ -952,6 +952,9 @@ struct rtw89_mac_gen_def { enum mac_ax_err_info err);bool (*is_txq_empty)(struct rtw89_dev *rtwdev); + +int (*add_chan_list)(struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif,bool connected); };extern const struct rtw89_mac_gen_def rtw89_mac_gen_ax;
drivers/net/wireless/realtek/rtw89/mac_be.c +2 -0
@@ -2268,5 +2268,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .dump_err_status = rtw89_mac_dump_err_status_be, .is_txq_empty = mac_is_txq_empty_be, + + .add_chan_list = rtw89_hw_scan_add_chan_list_be, };EXPORT_SYMBOL (rtw89_mac_gen_be);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/7 wifi: rtw89: 8922a: add ieee80211_ops::hw_scan
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
This adds support for hardware scan after FW version 0.34.35. Currently we only support scanning on single hardware band and support of dual band scan will be added in the future. Adjust the current flow to make driver compatible with different generation ICs.
--- drivers/net/wireless/realtek/rtw89/core.h | 39 +++++ drivers/net/wireless/realtek/rtw89/fw.c | 178 +++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 86 +++++++++- drivers/net/wireless/realtek/rtw89/mac.c | 15 +- drivers/net/wireless/realtek/rtw89/mac.h | 3 + drivers/net/wireless/realtek/rtw89/mac_be.c | 1 + 6 files changed, 314 insertions(+), 8 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +39 -0
@@ -3258,6 +3258,45 @@ enum rtw89_mlo_dbcc_mode { DBCC_LEGACY = 0xffffffff, }; +enum rtw89_scan_be_operation { +RTW89_SCAN_OP_STOP , +RTW89_SCAN_OP_START , +RTW89_SCAN_OP_SETPARM , +RTW89_SCAN_OP_GETRPT , +RTW89_SCAN_OP_NUM +}; + +enum rtw89_scan_be_mode { +RTW89_SCAN_MODE_SA , +RTW89_SCAN_MODE_MACC , +RTW89_SCAN_MODE_NUM +}; + +enum rtw89_scan_be_opmode { +RTW89_SCAN_OPMODE_NONE , +RTW89_SCAN_OPMODE_TBTT , +RTW89_SCAN_OPMODE_INTV , +RTW89_SCAN_OPMODE_CNT , +RTW89_SCAN_OPMODE_NUM , +}; + +struct rtw89_scan_option { +bool enable; +bool target_ch_mode; +u8 num_macc_role; +u8 num_opch; +u8 repeat; +u16 norm_pd; +u16 slow_pd; +u16 norm_cy; +u8 opch_end; +u64 prohib_chan; +enum rtw89_phy_idx band; +enum rtw89_scan_be_operation operation; +enum rtw89_scan_be_mode scan_mode; +enum rtw89_mlo_dbcc_mode mlo_mode; +}; +enum rtw89_qta_mode {RTW89_QTA_SCC ,RTW89_QTA_DLFW ,
drivers/net/wireless/realtek/rtw89/fw.c +177 -1
202 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +81 -5
122 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/mac.c +13 -2
@@ -4867,6 +4867,9 @@ rtw89_mac_c2h_done_ack(struct rtw89_dev *rtwdev, struct sk_buff *skb_c2h, u32 lecase H2C_FUNC_SCANOFLD : cond =RTW89_SCANOFLD_WAIT_COND_START ;break ; +case H2C_FUNC_SCANOFLD_BE : + cond =RTW89_SCANOFLD_BE_WAIT_COND_START ; +break ; } data.err = !!h2c_return;
@@ -5116,14 +5119,21 @@ static void rtw89_mac_c2h_scanofld_rsp_atomic(struct rtw89_dev *rtwdev, (const struct rtw89_c2h_scanofld *)skb->data;struct rtw89_wait_info *fw_ofld_wait = &rtwdev->mac.fw_ofld_wait;struct rtw89_completion_data data = {}; +unsigned int cond;u8 status, reason; status =le32_get_bits (c2h->w2,RTW89_C2H_SCANOFLD_W2_STATUS ); reason =le32_get_bits (c2h->w2,RTW89_C2H_SCANOFLD_W2_RSN ); data.err = status !=RTW89_SCAN_STATUS_SUCCESS ; -if (reason ==RTW89_SCAN_END_SCAN_NOTIFY ) -rtw89_complete_cond (fw_ofld_wait,RTW89_SCANOFLD_WAIT_COND_STOP , &data); +if (reason ==RTW89_SCAN_END_SCAN_NOTIFY ) { +if (rtwdev->chip->chip_gen ==RTW89_CHIP_BE ) + cond =RTW89_SCANOFLD_BE_WAIT_COND_STOP ; +else + cond =RTW89_SCANOFLD_WAIT_COND_STOP ; + +rtw89_complete_cond (fw_ofld_wait, cond, &data); + } } bool rtw89_mac_c2h_chk_atomic(struct rtw89_dev *rtwdev, struct sk_buff *c2h,
@@ -6226,5 +6236,6 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .is_txq_empty = mac_is_txq_empty_ax, .add_chan_list = rtw89_hw_scan_add_chan_list, + .scan_offload = rtw89_fw_h2c_scan_offload, };EXPORT_SYMBOL (rtw89_mac_gen_ax);
drivers/net/wireless/realtek/rtw89/mac.h +3 -0
@@ -955,6 +955,9 @@ struct rtw89_mac_gen_def {int (*add_chan_list)(struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,bool connected); +int (*scan_offload)(struct rtw89_dev *rtwdev, +struct rtw89_scan_option *option, +struct rtw89_vif *rtwvif); };extern const struct rtw89_mac_gen_def rtw89_mac_gen_ax;
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -0
@@ -2270,5 +2270,6 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .is_txq_empty = mac_is_txq_empty_be, .add_chan_list = rtw89_hw_scan_add_chan_list_be, + .scan_offload = rtw89_fw_h2c_scan_offload_be, };EXPORT_SYMBOL (rtw89_mac_gen_be);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/7 wifi: rtw89: add new H2C for PS mode in 802.11be chip
In reply to Ping-Ke ShihFrom: Chin-Yen Lee <[email protected]>
Because 802.11be chip support MLO mode, driver needs to send new H2C to pass more connected channel information to firmware, to ensure PS mode work fine.
--- drivers/net/wireless/realtek/rtw89/fw.c | 44 +++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 16 +++++++++ drivers/net/wireless/realtek/rtw89/ps.c | 7 ++-- 3 files changed, 64 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +44 -0
@@ -2036,6 +2036,50 @@ int rtw89_fw_h2c_lps_parm(struct rtw89_dev *rtwdev,return ret; } +int rtw89_fw_h2c_lps_ch_info (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) +{ +const struct rtw89_chan *chan =rtw89_chan_get (rtwdev, + rtwvif->sub_entity_idx); +const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_h2c_lps_ch_info *h2c; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +int ret; + +if (chip->chip_gen !=RTW89_CHIP_BE ) +return 0 ; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for h2c lps_ch_info\n" ); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_lps_ch_info *)skb->data; + + h2c->info[0 ].central_ch = chan->channel; + h2c->info[0 ].pri_ch = chan->primary_channel; + h2c->info[0 ].band = chan->band_type; + h2c->info[0 ].bw = chan->band_width; + h2c->mlo_dbcc_mode_lps =cpu_to_le32 (MLO_2_PLUS_0_1RF ); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_OUTSRC ,H2C_CL_OUTSRC_DM , +H2C_FUNC_FW_LPS_CH_INFO ,0 ,0 , len); + + ret =rtw89_h2c_tx (rtwdev, skb, false); +if (ret) { +rtw89_err (rtwdev,"failed to send h2c\n" ); + goto fail; + } + +return 0 ; +fail: +dev_kfree_skb_any (skb); + +return ret; +} +#define H2C_P2P_ACT_LEN 20 int rtw89_fw_h2c_p2p_act(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, struct ieee80211_p2p_noa_desc *desc,
drivers/net/wireless/realtek/rtw89/fw.h +16 -0
@@ -1974,6 +1974,17 @@ static inline void SET_LPS_PARM_LASTRPWM(void *h2c, u32 val)le32p_replace_bits ((__le32 *)(h2c) +1 , val,GENMASK (15 ,8 )); } +struct rtw89_h2c_lps_ch_info { +struct { +u8 pri_ch; +u8 central_ch; +u8 bw; +u8 band; + } __packed info[2]; + +__le32 mlo_dbcc_mode_lps; +} __packed; +static inline void RTW89_SET_FWCMD_CPU_EXCEPTION_TYPE (void *cmd,u32 val) {le32p_replace_bits ((__le32 *)cmd, val,GENMASK (31 ,0 ));
@@ -3896,6 +3907,9 @@ enum rtw89_mcc_h2c_func {#define H2C_CL_OUTSRC_RA 0x1#define H2C_FUNC_OUTSRC_RA_MACIDCFG 0x0 +#define H2C_CL_OUTSRC_DM 0x2 +#define H2C_FUNC_FW_LPS_CH_INFO 0xb +#define H2C_CL_OUTSRC_RF_REG_A 0x8#define H2C_CL_OUTSRC_RF_REG_B 0x9#define H2C_CL_OUTSRC_RF_FW_NOTIFY 0xa
@@ -4110,6 +4124,8 @@ int rtw89_fw_h2c_init_ba_cam_users(struct rtw89_dev *rtwdev, u8 users,int rtw89_fw_h2c_lps_parm (struct rtw89_dev *rtwdev,struct rtw89_lps_parm *lps_param); +int rtw89_fw_h2c_lps_ch_info (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif);struct sk_buff *rtw89_fw_h2c_alloc_skb_with_hdr (struct rtw89_dev *rtwdev,u32 len);struct sk_buff *rtw89_fw_h2c_alloc_skb_no_hdr (struct rtw89_dev *rtwdev,u32 len); int rtw89_fw_msg_reg(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/ps.c +4 -3
@@ -83,16 +83,17 @@ void __rtw89_leave_ps_mode(struct rtw89_dev *rtwdev)rtw89_ps_power_mode_change (rtwdev, false); } -static void __rtw89_enter_lps (struct rtw89_dev *rtwdev,u8 mac_id) +static void __rtw89_enter_lps (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) {struct rtw89_lps_parm lps_param = { - .macid = mac_id, + .macid = rtwvif->mac_id, .psmode =RTW89_MAC_AX_PS_MODE_LEGACY , .lastrpwm =RTW89_LAST_RPWM_PS , };rtw89_btc_ntfy_radio_state (rtwdev,BTC_RFCTRL_FW_CTRL );rtw89_fw_h2c_lps_parm (rtwdev, &lps_param); +rtw89_fw_h2c_lps_ch_info (rtwdev, rtwvif); }static void __rtw89_leave_lps (struct rtw89_dev *rtwdev,u8 mac_id)
@@ -123,7 +124,7 @@ void rtw89_enter_lps(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif,if (test_and_set_bit (RTW89_FLAG_LEISURE_PS , rtwdev->flags))return ; -__rtw89_enter_lps (rtwdev, rtwvif->mac_id); +__rtw89_enter_lps (rtwdev, rtwvif);if (ps_mode)__rtw89_enter_ps_mode (rtwdev, rtwvif); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/7 wifi: rtw89: update ps_state register for chips with different generation
In reply to Ping-Ke ShihFrom: Chin-Yen Lee <[email protected]>
The ps_state register is used for driver to check if the WiFi chip leave power save mode successfully. The register is changed for new generation, so update it.
--- drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/mac_be.c | 1 + drivers/net/wireless/realtek/rtw89/ps.c | 3 ++- drivers/net/wireless/realtek/rtw89/reg.h | 3 +++ 5 files changed, 8 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -6184,6 +6184,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .rx_fltr = R_AX_RX_FLTR_OPT, .port_base = &rtw89_port_base_ax, .agg_len_ht = R_AX_AGG_LEN_HT_0, + .ps_status = R_AX_PPWRBIT_SETTING, .muedca_ctrl = { .addr = R_AX_MUEDCA_EN,
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -894,6 +894,7 @@ struct rtw89_mac_gen_def {u32 rx_fltr;const struct rtw89_port_reg *port_base;u32 agg_len_ht; +u32 ps_status;struct rtw89_reg_def muedca_ctrl;struct rtw89_reg_def bfee_ctrl;
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -0
@@ -2218,6 +2218,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .rx_fltr = R_BE_RX_FLTR_OPT, .port_base = &rtw89_port_base_be, .agg_len_ht = R_BE_AGG_LEN_HT_0, + .ps_status = R_BE_WMTX_POWER_BE_BIT_CTL, .muedca_ctrl = { .addr = R_BE_MUEDCA_EN,
drivers/net/wireless/realtek/rtw89/ps.c +2 -1
@@ -14,6 +14,7 @@static int rtw89_fw_leave_lps_check (struct rtw89_dev *rtwdev,u8 macid) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;u32 pwr_en_bit =0xE ;u32 chk_msk = pwr_en_bit << (4 * macid);u32 polling;
@@ -21,7 +22,7 @@ static int rtw89_fw_leave_lps_check(struct rtw89_dev *rtwdev, u8 macid) ret =read_poll_timeout_atomic (rtw89_read32_mask, polling, !polling,1000 ,50000 , false, rtwdev, -R_AX_PPWRBIT_SETTING , chk_msk); + mac->ps_status, chk_msk);if (ret) {rtw89_info (rtwdev,"rtw89: failed to leave lps state\n" );return -EBUSY ;
drivers/net/wireless/realtek/rtw89/reg.h +3 -0
@@ -6761,6 +6761,9 @@#define B_BE_UPD_HGQMD BIT(1)#define B_BE_UPD_TIMIE BIT(0) +#define R_BE_WMTX_POWER_BE_BIT_CTL 0x10E0C +#define R_BE_WMTX_POWER_BE_BIT_CTL_C1 0x14E0C +#define R_BE_WMTX_TCR_BE_4 0x10E2C#define R_BE_WMTX_TCR_BE_4_C1 0x14E2C#define B_BE_UL_EHT_MUMIMO_LTF_MODE BIT(30)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/7 wifi: rtw89: 8922a: add more fields to beacon H2C command to support multi-links
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
To support multi-links beacon, it needs more fields. But currently we still only support legacy AP mode. Only update struct to fit expected size of firmware.
--- drivers/net/wireless/realtek/rtw89/fw.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.h +18 -0
@@ -1730,6 +1730,24 @@ struct rtw89_h2c_bcn_upd_be {__le32 w9;__le32 w10;__le32 w11; +__le32 w12; +__le32 w13; +__le32 w14; +__le32 w15; +__le32 w16; +__le32 w17; +__le32 w18; +__le32 w19; +__le32 w20; +__le32 w21; +__le32 w22; +__le32 w23; +__le32 w24; +__le32 w25; +__le32 w26; +__le32 w27; +__le32 w28; +__le32 w29; } __packed;#define RTW89_H2C_BCN_UPD_BE_W0_PORT GENMASK(7, 0)
Signature · 1 line
2.25.1