wifi: rtw89: refine hardware scan and concurrent
Ping-Ke Shih
maintainercover wifi: rtw89: refine hardware scan and concurrent
First two patches are to use struct to access H2C/C2H command formats related to hardware scan, and patches 5/8 and 6/8 are to refine scan abort to make abort operation safely stop. Patch 7/8 to stop hardware TSF function during scanning to make hardware scan smooth.
Patches 3/8 and 4/8 are two problems we found during testing as their commit messages.
The last patch is to correct mistakes that uses wrong delay unit, so hardware work improperly.
Chih-Kang Chang (2):
wifi: rtw89: fix HW scan timeout due to TSF sync issue
wifi: rtw89: fix disabling concurrent mode TX hang issue
Po-Hao Huang (6):
wifi: rtw89: refine add_chan H2C command to encode_bits
wifi: rtw89: refine hardware scan C2H events
wifi: rtw89: Set default CQM config if not present
wifi: rtw89: disable RTS when broadcast/multicast
wifi: rtw89: fix null pointer access when abort scan
wifi: rtw89: add wait/completion for abort scan
drivers/net/wireless/realtek/rtw89/core.c | 8 +- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 108 +++++---- drivers/net/wireless/realtek/rtw89/fw.h | 221 +++++++----------- drivers/net/wireless/realtek/rtw89/mac.c | 64 +++-- drivers/net/wireless/realtek/rtw89/mac.h | 5 +- drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +- 7 files changed, 205 insertions(+), 206 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 2/8 wifi: rtw89: refine hardware scan C2H events
From: Po-Hao Huang <[email protected]>
Define struct for scan offload C2H events and update each elements' bitfield. This patch does not change original behavior, just style conversion and naming changes.
--- drivers/net/wireless/realtek/rtw89/fw.h | 36 +++++++++++++++--------- drivers/net/wireless/realtek/rtw89/mac.c | 16 ++++++----- 2 files changed, 31 insertions(+), 21 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.h +22 -14
@@ -169,6 +169,10 @@ enum rtw89_scanofld_notify_reason {RTW89_SCAN_ENTER_CH_NOTIFY ,RTW89_SCAN_LEAVE_CH_NOTIFY ,RTW89_SCAN_END_SCAN_NOTIFY , +RTW89_SCAN_REPORT_NOTIFY , +RTW89_SCAN_CHKPT_NOTIFY , +RTW89_SCAN_ENTER_OP_NOTIFY , + RTW89_SCAN_LEAVE_OP_NOTIFY, }; enum rtw89_chan_type {
@@ -3278,20 +3282,24 @@ struct rtw89_c2h_ra_rpt {#define RTW89_GET_MAC_C2H_PKTOFLD_LEN (c2h) \ le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(31, 16)) -#define RTW89_GET_MAC_C2H_SCANOFLD_PRI_CH (c2h) \ - le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(7, 0)) -#define RTW89_GET_MAC_C2H_SCANOFLD_RSP (c2h) \ - le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(19, 16)) -#define RTW89_GET_MAC_C2H_SCANOFLD_STATUS (c2h) \ - le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(23, 20)) -#define RTW89_GET_MAC_C2H_ACTUAL_PERIOD (c2h) \ - le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(31, 24)) -#define RTW89_GET_MAC_C2H_SCANOFLD_TX_FAIL (c2h) \ - le32_get_bits(*((const __le32 *)(c2h) + 5), GENMASK(3, 0)) -#define RTW89_GET_MAC_C2H_SCANOFLD_AIR_DENSITY (c2h) \ - le32_get_bits(*((const __le32 *)(c2h) + 5), GENMASK(7, 4)) -#define RTW89_GET_MAC_C2H_SCANOFLD_BAND (c2h) \ - le32_get_bits(*((const __le32 *)(c2h) + 5), GENMASK(25, 24)) +struct rtw89_c2h_scanofld { +__le32 w0; +__le32 w1; +__le32 w2; +__le32 w3; +__le32 w4; +__le32 w5; +__le32 w6; +__le32 w7; +} __packed; + +#define RTW89_C2H_SCANOFLD_W2_PRI_CH GENMASK(7, 0) +#define RTW89_C2H_SCANOFLD_W2_RSN GENMASK(19, 16) +#define RTW89_C2H_SCANOFLD_W2_STATUS GENMASK(23, 20) +#define RTW89_C2H_SCANOFLD_W2_PERIOD GENMASK(31, 24) +#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_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 +9 -7
@@ -4671,9 +4671,11 @@ static bool rtw89_is_op_chan(struct rtw89_dev *rtwdev, u8 band, u8 channel) }static void -rtw89_mac_c2h_scanofld_rsp (struct rtw89_dev *rtwdev,struct sk_buff *c2h, +rtw89_mac_c2h_scanofld_rsp (struct rtw89_dev *rtwdev,struct sk_buff *skb,u32 len) { +const struct rtw89_c2h_scanofld *c2h = + (const struct rtw89_c2h_scanofld *)skb->data;struct ieee80211_vif *vif = rtwdev->scan_info.scanning_vif;struct rtw89_vif *rtwvif =vif_to_rtwvif_safe (vif);struct rtw89_chan new;
@@ -4685,12 +4687,12 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *c2h,if (!rtwvif)return ; - tx_fail =RTW89_GET_MAC_C2H_SCANOFLD_TX_FAIL (c2h->data); - status =RTW89_GET_MAC_C2H_SCANOFLD_STATUS (c2h->data); - chan =RTW89_GET_MAC_C2H_SCANOFLD_PRI_CH (c2h->data); - reason =RTW89_GET_MAC_C2H_SCANOFLD_RSP (c2h->data); - band =RTW89_GET_MAC_C2H_SCANOFLD_BAND (c2h->data); - actual_period =RTW89_GET_MAC_C2H_ACTUAL_PERIOD (c2h->data); + 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 ); + 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 );if (!(rtwdev->chip->support_bands &BIT (NL80211_BAND_6GHZ ))) band = chan >14 ?RTW89_BAND_5G :RTW89_BAND_2G ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/8 wifi: rtw89: refine add_chan H2C command to encode_bits
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Use struct filling style instead of pointer casting. This does not change the original behavior.
--- drivers/net/wireless/realtek/rtw89/fw.c | 71 +++++----- drivers/net/wireless/realtek/rtw89/fw.h | 171 ++++++------------------ 2 files changed, 80 insertions(+), 162 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +38 -33
@@ -3996,55 +3996,60 @@ int rtw89_fw_h2c_add_pkt_offload(struct rtw89_dev *rtwdev, u8 *id,return 0 ; } -#define H2C_LEN_SCAN_LIST_OFFLOAD 4 -int rtw89_fw_h2c_scan_list_offload (struct rtw89_dev *rtwdev,int len, +int rtw89_fw_h2c_scan_list_offload (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 *elem;struct rtw89_mac_chinfo *ch_info; +struct rtw89_h2c_chinfo *h2c;struct sk_buff *skb; -int skb_len =H2C_LEN_SCAN_LIST_OFFLOAD + len *RTW89_MAC_CHINFO_SIZE ;unsigned int cond; -u8 *cmd; +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,H2C_LEN_SCAN_LIST_OFFLOAD ); - cmd = skb->data; +skb_put (skb,sizeof (*h2c)); + h2c = (struct rtw89_h2c_chinfo *)skb->data; -RTW89_SET_FWCMD_SCANOFLD_CH_NUM (cmd, len); -/* in unit of 4 bytes */ -RTW89_SET_FWCMD_SCANOFLD_CH_SIZE (cmd,RTW89_MAC_CHINFO_SIZE /4 ); + h2c->ch_num = ch_num; + h2c->elem_size =sizeof (*elem) /4 ;/* in unit of 4 bytes */ list_for_each_entry (ch_info, chan_list, list) { - cmd =skb_put (skb,RTW89_MAC_CHINFO_SIZE ); - -RTW89_SET_FWCMD_CHINFO_PERIOD (cmd, ch_info->period); -RTW89_SET_FWCMD_CHINFO_DWELL (cmd, ch_info->dwell_time); -RTW89_SET_FWCMD_CHINFO_CENTER_CH (cmd, ch_info->central_ch); -RTW89_SET_FWCMD_CHINFO_PRI_CH (cmd, ch_info->pri_ch); -RTW89_SET_FWCMD_CHINFO_BW (cmd, ch_info->bw); -RTW89_SET_FWCMD_CHINFO_ACTION (cmd, ch_info->notify_action); -RTW89_SET_FWCMD_CHINFO_NUM_PKT (cmd, ch_info->num_pkt); -RTW89_SET_FWCMD_CHINFO_TX (cmd, ch_info->tx_pkt); -RTW89_SET_FWCMD_CHINFO_PAUSE_DATA (cmd, ch_info->pause_data); -RTW89_SET_FWCMD_CHINFO_BAND (cmd, ch_info->ch_band); -RTW89_SET_FWCMD_CHINFO_PKT_ID (cmd, ch_info->probe_id); -RTW89_SET_FWCMD_CHINFO_DFS (cmd, ch_info->dfs_ch); -RTW89_SET_FWCMD_CHINFO_TX_NULL (cmd, ch_info->tx_null); -RTW89_SET_FWCMD_CHINFO_RANDOM (cmd, ch_info->rand_seq_num); -RTW89_SET_FWCMD_CHINFO_PKT0 (cmd, ch_info->pkt_id[0 ]); -RTW89_SET_FWCMD_CHINFO_PKT1 (cmd, ch_info->pkt_id[1 ]); -RTW89_SET_FWCMD_CHINFO_PKT2 (cmd, ch_info->pkt_id[2 ]); -RTW89_SET_FWCMD_CHINFO_PKT3 (cmd, ch_info->pkt_id[3 ]); -RTW89_SET_FWCMD_CHINFO_PKT4 (cmd, ch_info->pkt_id[4 ]); -RTW89_SET_FWCMD_CHINFO_PKT5 (cmd, ch_info->pkt_id[5 ]); -RTW89_SET_FWCMD_CHINFO_PKT6 (cmd, ch_info->pkt_id[6 ]); -RTW89_SET_FWCMD_CHINFO_PKT7 (cmd, ch_info->pkt_id[7 ]); + elem = (struct rtw89_h2c_chinfo_elem *)skb_put (skb,sizeof (*elem)); + + elem->w0 =le32_encode_bits (ch_info->period,RTW89_H2C_CHINFO_W0_PERIOD ) | +le32_encode_bits (ch_info->dwell_time,RTW89_H2C_CHINFO_W0_DWELL ) | +le32_encode_bits (ch_info->central_ch,RTW89_H2C_CHINFO_W0_CENTER_CH ) | +le32_encode_bits (ch_info->pri_ch,RTW89_H2C_CHINFO_W0_PRI_CH ); + + elem->w1 =le32_encode_bits (ch_info->bw,RTW89_H2C_CHINFO_W1_BW ) | +le32_encode_bits (ch_info->notify_action,RTW89_H2C_CHINFO_W1_ACTION ) | +le32_encode_bits (ch_info->num_pkt,RTW89_H2C_CHINFO_W1_NUM_PKT ) | +le32_encode_bits (ch_info->tx_pkt,RTW89_H2C_CHINFO_W1_TX ) | +le32_encode_bits (ch_info->pause_data,RTW89_H2C_CHINFO_W1_PAUSE_DATA ) | +le32_encode_bits (ch_info->ch_band,RTW89_H2C_CHINFO_W1_BAND ) | +le32_encode_bits (ch_info->probe_id,RTW89_H2C_CHINFO_W1_PKT_ID ) | +le32_encode_bits (ch_info->dfs_ch,RTW89_H2C_CHINFO_W1_DFS ) | +le32_encode_bits (ch_info->tx_null,RTW89_H2C_CHINFO_W1_TX_NULL ) | +le32_encode_bits (ch_info->rand_seq_num,RTW89_H2C_CHINFO_W1_RANDOM ); + + elem->w2 =le32_encode_bits (ch_info->pkt_id[0 ],RTW89_H2C_CHINFO_W2_PKT0 ) | +le32_encode_bits (ch_info->pkt_id[1 ],RTW89_H2C_CHINFO_W2_PKT1 ) | +le32_encode_bits (ch_info->pkt_id[2 ],RTW89_H2C_CHINFO_W2_PKT2 ) | +le32_encode_bits (ch_info->pkt_id[3 ],RTW89_H2C_CHINFO_W2_PKT3 ); + + elem->w3 =le32_encode_bits (ch_info->pkt_id[4 ],RTW89_H2C_CHINFO_W3_PKT4 ) | +le32_encode_bits (ch_info->pkt_id[5 ],RTW89_H2C_CHINFO_W3_PKT5 ) | +le32_encode_bits (ch_info->pkt_id[6 ],RTW89_H2C_CHINFO_W3_PKT6 ) | +le32_encode_bits (ch_info->pkt_id[7 ],RTW89_H2C_CHINFO_W3_PKT7 ); } rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
drivers/net/wireless/realtek/rtw89/fw.h +42 -129
184 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/8 wifi: rtw89: Set default CQM config if not present
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
When wpa_supplicant is initiated by users and not by NetworkManager, the CQM configuration might not be set. Without this setting, ICs with connection monitor handled by driver won't detect connection loss. To fix this we prepare a default setting upon associated at first, then update again if any is given later.
--- drivers/net/wireless/realtek/rtw89/core.c | 2 ++ drivers/net/wireless/realtek/rtw89/fw.c | 11 +++++++++-- drivers/net/wireless/realtek/rtw89/fw.h | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +2 -0
@@ -3493,6 +3493,8 @@ int rtw89_core_sta_assoc(struct rtw89_dev *rtwdev,rtw89_warn (rtwdev,"failed to send h2c general packet\n" );return ret; } + +rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, vif, true); }return ret;
drivers/net/wireless/realtek/rtw89/fw.c +9 -2
@@ -3216,6 +3216,8 @@ int rtw89_fw_h2c_set_bcn_fltr_cfg(struct rtw89_dev *rtwdev, {struct rtw89_vif *rtwvif =vif_to_rtwvif_safe (vif);struct ieee80211_bss_conf *bss_conf = vif ? &vif->bss_conf :NULL ; +s32 thold =RTW89_DEFAULT_CQM_THOLD ; +u32 hyst =RTW89_DEFAULT_CQM_HYST ;struct rtw89_h2c_bcnfltr *h2c;u32 len =sizeof (*h2c);struct sk_buff *skb;
@@ -3236,14 +3238,19 @@ int rtw89_fw_h2c_set_bcn_fltr_cfg(struct rtw89_dev *rtwdev,skb_put (skb, len); h2c = (struct rtw89_h2c_bcnfltr *)skb->data; +if (bss_conf->cqm_rssi_hyst) + hyst = bss_conf->cqm_rssi_hyst; +if (bss_conf->cqm_rssi_thold) + thold = bss_conf->cqm_rssi_thold; + h2c->w0 =le32_encode_bits (connect,RTW89_H2C_BCNFLTR_W0_MON_RSSI ) |le32_encode_bits (connect,RTW89_H2C_BCNFLTR_W0_MON_BCN ) |le32_encode_bits (connect,RTW89_H2C_BCNFLTR_W0_MON_EN ) |le32_encode_bits (RTW89_BCN_FLTR_OFFLOAD_MODE_DEFAULT ,RTW89_H2C_BCNFLTR_W0_MODE ) |le32_encode_bits (RTW89_BCN_LOSS_CNT ,RTW89_H2C_BCNFLTR_W0_BCN_LOSS_CNT ) | -le32_encode_bits (bss_conf->cqm_rssi_hyst,RTW89_H2C_BCNFLTR_W0_RSSI_HYST ) | -le32_encode_bits (bss_conf->cqm_rssi_thold +MAX_RSSI , +le32_encode_bits (hyst,RTW89_H2C_BCNFLTR_W0_RSSI_HYST ) | +le32_encode_bits (thold +MAX_RSSI ,RTW89_H2C_BCNFLTR_W0_RSSI_THRESHOLD ) |le32_encode_bits (rtwvif->mac_id,RTW89_H2C_BCNFLTR_W0_MAC_ID );
drivers/net/wireless/realtek/rtw89/fw.h +3 -0
@@ -188,6 +188,9 @@ enum rtw89_p2pps_action { RTW89_P2P_ACT_TERMINATE = 3, }; +#define RTW89_DEFAULT_CQM_HYST 4 +#define RTW89_DEFAULT_CQM_THOLD -70 +enum rtw89_bcn_fltr_offload_mode {RTW89_BCN_FLTR_OFFLOAD_MODE_0 =0 ,RTW89_BCN_FLTR_OFFLOAD_MODE_1 ,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/8 wifi: rtw89: disable RTS when broadcast/multicast
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
RTS switch should not be enabled for broadcast and multicast. This could cause incorrect behavior during AP mode, so we fix it.
--- drivers/net/wireless/realtek/rtw89/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +4 -2
@@ -1176,7 +1176,8 @@ static __le32 rtw89_build_txwd_info2_v1(struct rtw89_tx_desc_info *desc_info)static __le32 rtw89_build_txwd_info4 (struct rtw89_tx_desc_info *desc_info) { -u32 dword =FIELD_PREP (RTW89_TXWD_INFO4_RTS_EN ,1 ) | +bool rts_en = !desc_info->is_bmc; +u32 dword =FIELD_PREP (RTW89_TXWD_INFO4_RTS_EN , rts_en) |FIELD_PREP (RTW89_TXWD_INFO4_HW_RTS_EN ,1 );return cpu_to_le32 (dword);
@@ -1329,7 +1330,8 @@ static __le32 rtw89_build_txwd_info2_v2(struct rtw89_tx_desc_info *desc_info)static __le32 rtw89_build_txwd_info4_v2 (struct rtw89_tx_desc_info *desc_info) { -u32 dword =FIELD_PREP (BE_TXD_INFO4_RTS_EN ,1 ) | +bool rts_en = !desc_info->is_bmc; +u32 dword =FIELD_PREP (BE_TXD_INFO4_RTS_EN , rts_en) |FIELD_PREP (BE_TXD_INFO4_HW_RTS_EN ,1 );return cpu_to_le32 (dword);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/8 wifi: rtw89: fix null pointer access when abort scan
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
During cancel scan we might use vif that weren't scanning. Fix this by using the actual scanning vif.
--- drivers/net/wireless/realtek/rtw89/mac80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/mac80211.c +2 -2
@@ -441,7 +441,7 @@ static void rtw89_ops_bss_info_changed(struct ieee80211_hw *hw,* when disconnected by peer */ if (rtwdev->scanning) -rtw89_hw_scan_abort (rtwdev, vif); +rtw89_hw_scan_abort (rtwdev, rtwdev->scan_info.scanning_vif); } }
@@ -994,7 +994,7 @@ static int rtw89_ops_remain_on_channel(struct ieee80211_hw *hw, }if (rtwdev->scanning) -rtw89_hw_scan_abort (rtwdev, vif); +rtw89_hw_scan_abort (rtwdev, rtwdev->scan_info.scanning_vif);if (type ==IEEE80211_ROC_TYPE_MGMT_TX ) roc->state =RTW89_ROC_MGMT ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/8 wifi: rtw89: add wait/completion for abort scan
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
When aborting scan, wait until FW is done to keep both states aligned. This prevents driver modifying channel then gets overwritten by FW.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 21 ++++++++++++---- drivers/net/wireless/realtek/rtw89/fw.h | 11 +++++++++ drivers/net/wireless/realtek/rtw89/mac.c | 29 ++++++++++++++++++++--- drivers/net/wireless/realtek/rtw89/mac.h | 3 ++- 5 files changed, 56 insertions(+), 9 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4608,6 +4608,7 @@ struct rtw89_hw_scan_info {struct ieee80211_vif *scanning_vif;struct list_head pkt_list[NUM_NL80211_BANDS ];struct rtw89_chan op_chan; +bool abort;u32 last_chan_idx; };
drivers/net/wireless/realtek/rtw89/fw.c +16 -5
@@ -4063,7 +4063,7 @@ int rtw89_fw_h2c_scan_list_offload(struct rtw89_dev *rtwdev, int ch_num,H2C_CAT_MAC ,H2C_CL_MAC_FW_OFLD , H2C_FUNC_ADD_SCANOFLD_CH, 1, 1, skb_len); - cond =RTW89_FW_OFLD_WAIT_COND (0 ,H2C_FUNC_ADD_SCANOFLD_CH ); + cond =RTW89_SCANOFLD_WAIT_COND_ADD_CH ; ret =rtw89_h2c_tx_and_wait (rtwdev, skb, wait, cond);if (ret) {
@@ -4122,7 +4122,10 @@ int rtw89_fw_h2c_scan_offload(struct rtw89_dev *rtwdev,H2C_FUNC_SCANOFLD ,1 ,1 , len); - cond =RTW89_FW_OFLD_WAIT_COND (0 ,H2C_FUNC_SCANOFLD ); +if (option->enable) + cond =RTW89_SCANOFLD_WAIT_COND_START ; +else + cond =RTW89_SCANOFLD_WAIT_COND_STOP ; ret =rtw89_h2c_tx_and_wait (rtwdev, skb, wait, cond);if (ret) {
@@ -4312,7 +4315,7 @@ static bool rtw89_fw_c2h_chk_atomic(struct rtw89_dev *rtwdev,default :return false;case RTW89_C2H_CAT_MAC : -return rtw89_mac_c2h_chk_atomic (rtwdev, class, func); +return rtw89_mac_c2h_chk_atomic (rtwdev, c2h, class, func);case RTW89_C2H_CAT_OUTSRC :return rtw89_phy_c2h_chk_atomic (rtwdev, class, func); }
@@ -4866,6 +4869,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,rtw89_get_channel (rtwdev, rtwvif, &rtwdev->scan_info.op_chan); rtwdev->scan_info.scanning_vif = vif; rtwdev->scan_info.last_chan_idx =0 ; + rtwdev->scan_info.abort = false; rtwvif->scan_ies = &scan_req->ies; rtwvif->scan_req = req;ieee80211_stop_queues (rtwdev->hw);
@@ -4917,14 +4921,21 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, rtwvif->scan_ies =NULL ; scan_info->last_chan_idx =0 ; scan_info->scanning_vif =NULL ; + scan_info->abort = false;rtw89_chanctx_proceed (rtwdev); }void rtw89_hw_scan_abort (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif) { -rtw89_hw_scan_offload (rtwdev, vif, false); -rtw89_hw_scan_complete (rtwdev, vif, true); +struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info; +int ret; + + scan_info->abort = true; + + ret =rtw89_hw_scan_offload (rtwdev, vif, false); +if (ret) +rtw89_hw_scan_complete (rtwdev, vif, true); }static bool rtw89_is_any_vif_connected_or_connecting (struct rtw89_dev *rtwdev)
drivers/net/wireless/realtek/rtw89/fw.h +11 -0
@@ -175,6 +175,12 @@ enum rtw89_scanofld_notify_reason { RTW89_SCAN_LEAVE_OP_NOTIFY, }; +enum rtw89_scanofld_status { +RTW89_SCAN_STATUS_NOTIFY , +RTW89_SCAN_STATUS_SUCCESS , +RTW89_SCAN_STATUS_FAIL , +}; +enum rtw89_chan_type {RTW89_CHAN_OPERATE =0 ,RTW89_CHAN_ACTIVE ,
@@ -3701,6 +3707,11 @@ enum rtw89_fw_ofld_h2c_func {RTW89_FW_OFLD_WAIT_COND (RTW89_PKT_OFLD_WAIT_TAG (pkt_id, pkt_op), \ H2C_FUNC_PACKET_OFLD) +#define RTW89_SCANOFLD_WAIT_COND_ADD_CH RTW89_FW_OFLD_WAIT_COND(0, H2C_FUNC_ADD_SCANOFLD_CH) + +#define RTW89_SCANOFLD_WAIT_COND_START RTW89_FW_OFLD_WAIT_COND(0, H2C_FUNC_SCANOFLD) +#define RTW89_SCANOFLD_WAIT_COND_STOP RTW89_FW_OFLD_WAIT_COND(1, H2C_FUNC_SCANOFLD) +/* CLASS 10 - Security CAM */ #define H2C_CL_MAC_SEC_CAM 0xa#define H2C_FUNC_MAC_SEC_UPD 0x1
drivers/net/wireless/realtek/rtw89/mac.c +26 -3
@@ -4717,7 +4717,7 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,rtw89_warn (rtwdev,"HW scan failed: %d\n" , ret); } }else { -rtw89_hw_scan_complete (rtwdev, vif, false); +rtw89_hw_scan_complete (rtwdev, vif, rtwdev->scan_info.abort); }break ;case RTW89_SCAN_ENTER_CH_NOTIFY :
@@ -4839,8 +4839,10 @@ rtw89_mac_c2h_done_ack(struct rtw89_dev *rtwdev, struct sk_buff *skb_c2h, u32 ledefault :return ;case H2C_FUNC_ADD_SCANOFLD_CH : + cond =RTW89_SCANOFLD_WAIT_COND_ADD_CH ; +break ;case H2C_FUNC_SCANOFLD : - cond =RTW89_FW_OFLD_WAIT_COND (0 , h2c_func); + cond =RTW89_SCANOFLD_WAIT_COND_START ;break ; }
@@ -5084,7 +5086,25 @@ void (* const rtw89_mac_c2h_mcc_handler[])(struct rtw89_dev *rtwdev, [RTW89_MAC_C2H_FUNC_MCC_STATUS_RPT] = rtw89_mac_c2h_mcc_status_rpt, }; -bool rtw89_mac_c2h_chk_atomic (struct rtw89_dev *rtwdev,u8 class,u8 func) +static void rtw89_mac_c2h_scanofld_rsp_atomic (struct rtw89_dev *rtwdev, +struct sk_buff *skb) +{ +const struct rtw89_c2h_scanofld *c2h = + (const struct rtw89_c2h_scanofld *)skb->data; +struct rtw89_wait_info *fw_ofld_wait = &rtwdev->mac.fw_ofld_wait; +struct rtw89_completion_data data = {}; +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); +} + +bool rtw89_mac_c2h_chk_atomic (struct rtw89_dev *rtwdev,struct sk_buff *c2h, +u8 class,u8 func) {switch (class) {default :
@@ -5101,6 +5121,9 @@ bool rtw89_mac_c2h_chk_atomic(struct rtw89_dev *rtwdev, u8 class, u8 func)switch (func) {default :return false; +case RTW89_MAC_C2H_FUNC_SCANOFLD_RSP : +rtw89_mac_c2h_scanofld_rsp_atomic (rtwdev, c2h); +return false;case RTW89_MAC_C2H_FUNC_PKT_OFLD_RSP :return true; }
drivers/net/wireless/realtek/rtw89/mac.h +2 -1
@@ -1127,7 +1127,8 @@ static inline int rtw89_chip_reset_bb_rf(struct rtw89_dev *rtwdev)u32 rtw89_mac_get_err_status (struct rtw89_dev *rtwdev);int rtw89_mac_set_err_status (struct rtw89_dev *rtwdev,u32 err); -bool rtw89_mac_c2h_chk_atomic (struct rtw89_dev *rtwdev,u8 class,u8 func); +bool rtw89_mac_c2h_chk_atomic (struct rtw89_dev *rtwdev,struct sk_buff *c2h, +u8 class,u8 func);void rtw89_mac_c2h_handle (struct rtw89_dev *rtwdev,struct sk_buff *skb,u32 len,u8 class,u8 func);int rtw89_mac_setup_phycap (struct rtw89_dev *rtwdev);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/8 wifi: rtw89: fix HW scan timeout due to TSF sync issue
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
When STA connects to an AP and doesn't receive any beacon yet, the hardware scan is triggered. This scan begins with the default TSF value. Once STA receives a beacon when switches back to the operating channel, its TSF synchronizes with the AP. However, if there is a significant difference in TSF values between the default value and the synchronized value, it will cause firmware fail to trigger interrupt, and the C2H won't be sent out. As a result, the scan continues until a timeout occurs. To fix this issue, we disable TSF synchronization during scanning to prevent drastic TSF changes, and enable TSF synchronization after scan.
--- drivers/net/wireless/realtek/rtw89/fw.c | 5 +++-- drivers/net/wireless/realtek/rtw89/mac.c | 17 ++++++++++++----- drivers/net/wireless/realtek/rtw89/mac.h | 2 ++ 3 files changed, 17 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +3 -2
@@ -4873,6 +4873,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, rtwvif->scan_ies = &scan_req->ies; rtwvif->scan_req = req;ieee80211_stop_queues (rtwdev->hw); +rtw89_mac_port_cfg_rx_sync (rtwdev, rtwvif, false);if (req->flags &NL80211_SCAN_FLAG_RANDOM_ADDR ) get_random_mask_addr(mac_addr, req->mac_addr,
@@ -4897,10 +4898,10 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, {const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info; +struct rtw89_vif *rtwvif =vif_to_rtwvif_safe (vif);struct cfg80211_scan_info info = { .aborted = aborted, }; -struct rtw89_vif *rtwvif;if (!vif)return ;
@@ -4913,10 +4914,10 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,rtw89_core_scan_complete (rtwdev, vif, true);ieee80211_scan_completed (rtwdev->hw, &info);ieee80211_wake_queues (rtwdev->hw); +rtw89_mac_port_cfg_rx_sync (rtwdev, rtwvif, true);rtw89_mac_enable_beacon_for_ap_vifs (rtwdev, true);rtw89_release_pkt_list (rtwdev); - rtwvif = (struct rtw89_vif *)vif->drv_priv; rtwvif->scan_req =NULL ; rtwvif->scan_ies =NULL ; scan_info->last_chan_idx =0 ;
drivers/net/wireless/realtek/rtw89/mac.c +12 -5
@@ -4185,13 +4185,11 @@ static void rtw89_mac_port_cfg_rx_sw(struct rtw89_dev *rtwdev,rtw89_write32_port_clr (rtwdev, rtwvif, p->port_cfg, bit); } -static void rtw89_mac_port_cfg_rx_sync (struct rtw89_dev *rtwdev, -struct rtw89_vif *rtwvif) +void rtw89_mac_port_cfg_rx_sync (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif,bool en) {const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;const struct rtw89_port_reg *p = mac->port_base; -bool en = rtwvif->net_type ==RTW89_NET_TYPE_INFRA || - rtwvif->net_type ==RTW89_NET_TYPE_AD_HOC ;if (en)rtw89_write32_port_set (rtwdev, rtwvif, p->port_cfg,B_AX_TSF_UDT_EN );
@@ -4199,6 +4197,15 @@ static void rtw89_mac_port_cfg_rx_sync(struct rtw89_dev *rtwdev,rtw89_write32_port_clr (rtwdev, rtwvif, p->port_cfg,B_AX_TSF_UDT_EN ); } +static void rtw89_mac_port_cfg_rx_sync_by_nettype (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif) +{ +bool en = rtwvif->net_type ==RTW89_NET_TYPE_INFRA || + rtwvif->net_type ==RTW89_NET_TYPE_AD_HOC ; + +rtw89_mac_port_cfg_rx_sync (rtwdev, rtwvif, en); +} +static void rtw89_mac_port_cfg_tx_sw (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,bool en) {
@@ -4538,7 +4545,7 @@ int rtw89_mac_port_update(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_mac_port_cfg_net_type (rtwdev, rtwvif);rtw89_mac_port_cfg_bcn_prct (rtwdev, rtwvif);rtw89_mac_port_cfg_rx_sw (rtwdev, rtwvif); -rtw89_mac_port_cfg_rx_sync (rtwdev, rtwvif); +rtw89_mac_port_cfg_rx_sync_by_nettype (rtwdev, rtwvif);rtw89_mac_port_cfg_tx_sw_by_nettype (rtwdev, rtwvif);rtw89_mac_port_cfg_bcn_intv (rtwdev, rtwvif);rtw89_mac_port_cfg_hiq_win (rtwdev, rtwvif);
drivers/net/wireless/realtek/rtw89/mac.h +2 -0
@@ -1086,6 +1086,8 @@ void rtw89_mac_port_tsf_sync(struct rtw89_dev *rtwdev, u16 offset_tu);int rtw89_mac_port_get_tsf (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,u64 *tsf); +void rtw89_mac_port_cfg_rx_sync (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif,bool en);void rtw89_mac_set_he_obss_narrow_bw_ru (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif);void rtw89_mac_stop_ap (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/8 wifi: rtw89: fix disabling concurrent mode TX hang issue
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
When disabling concurrent mode and switching to a single interface, the TX might stuck. The reason is TBTT prohibit area circuit still enable to block TX. To disable tbtt prohibit area circuit need to delay 2ms to make it effective. However, we only delay 2us in original code. So we fix it.
--- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +1 -1
@@ -4072,7 +4072,7 @@ static void rtw89_mac_bcn_drop(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvirtw89_write32_clr (rtwdev,R_AX_BCN_DROP_ALL0 ,BIT (rtwvif->port));rtw89_write32_port_clr (rtwdev, rtwvif, p->port_cfg,B_AX_TBTT_PROHIB_EN ); -fsleep (2 ); +fsleep (2000 ); }#define BCN_INTERVAL 100
Signature · 1 line
2.25.1
Re: [PATCH 1/8] wifi: rtw89: refine add_chan H2C command to encode_bits
In reply to Ping-Ke ShihQuoted 7 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
Use struct filling style instead of pointer casting. This does not change the original behavior.
Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
8 patches applied to wireless-next.git, thanks.
49d158557474 wifi: rtw89: refine add_chan H2C command to encode_bits b9979843febf wifi: rtw89: refine hardware scan C2H events 7cf6b6764b2f wifi: rtw89: Set default CQM config if not present dab2b8c41db2 wifi: rtw89: disable RTS when broadcast/multicast 7e11a2966f51 wifi: rtw89: fix null pointer access when abort scan bcbefbd032df wifi: rtw89: add wait/completion for abort scan f59a98c82534 wifi: rtw89: fix HW scan timeout due to TSF sync issue 5ba45ba77616 wifi: rtw89: fix disabling concurrent mode TX hang issue
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches