wifi: rtw89: refine TX/RX logic as preparation to support MLO
Ping-Ke Shih
maintainercover wifi: rtw89: refine TX/RX logic as preparation to support MLO
To support MLO, two HW will work simultaneous, and driver needs to decide which HW to transmit packets corresponding to selected link. Therefore, refine TX logic to achieve this.
For the RX path, read the received HW from RX descriptor, and report corresponding link id to mac80211.
Ping-Ke Shih (1):
wifi: rtw89: 8922a: rfk: adjust timeout time of RX DCK
Po-Hao Huang (6):
wifi: rtw89: 8922a: use SW CRYPTO when broadcast in MLO mode
wifi: rtw89: Adjust management queue mapping for [MLO, HW-1]
wifi: rtw89: Configure scan band when mlo_dbcc_mode changes
wifi: rtw89: extend join_info H2C command for MLO fields
wifi: rtw89: add MLD capabilities declaration
wifi: rtw89: Fill in correct Rx link ID for MLO
Zong-Zhe Yang (3):
wifi: rtw89: extend mapping from Qsel to DMA ch for MLO
wifi: rtw89: roc: dynamically handle link id and link instance index
wifi: rtw89: introduce helper to get designated link for MLO
drivers/net/wireless/realtek/rtw89/cam.c | 4 + drivers/net/wireless/realtek/rtw89/chan.c | 23 ++--- drivers/net/wireless/realtek/rtw89/chan.h | 2 +- drivers/net/wireless/realtek/rtw89/core.c | 95 ++++++++++++------- drivers/net/wireless/realtek/rtw89/core.h | 16 +++- drivers/net/wireless/realtek/rtw89/fw.c | 28 +++++- drivers/net/wireless/realtek/rtw89/fw.h | 3 + drivers/net/wireless/realtek/rtw89/mac.c | 2 + drivers/net/wireless/realtek/rtw89/mac80211.c | 21 ++-- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 4 +- drivers/net/wireless/realtek/rtw89/txrx.h | 31 ++++++ drivers/net/wireless/realtek/rtw89/wow.c | 3 +- 17 files changed, 169 insertions(+), 68 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/10 wifi: rtw89: 8922a: rfk: adjust timeout time of RX DCK
The RX DCK in firmware could retry 3 times if calibration value is not stable. Roughly each calibration can be done within 16 ms, so expect 16 * 4 (with additional 16 ms) will be enough. More, in coming MLO, it will do calibration on two path, so multiply 2.
--- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/rtw8922a.c +2 -1
@@ -2071,7 +2071,8 @@ static void __rtw8922a_rfk_init_late(struct rtw89_dev *rtwdev,rtw89_phy_rfk_pre_ntfy_and_wait (rtwdev, phy_idx,5 );rtw89_phy_rfk_dack_and_wait (rtwdev, phy_idx, chan,58 ); -rtw89_phy_rfk_rxdck_and_wait (rtwdev, phy_idx, chan, false,32 ); +if (!test_bit (RTW89_FLAG_SER_HANDLING , rtwdev->flags)) +rtw89_phy_rfk_rxdck_and_wait (rtwdev, phy_idx, chan, false,128 ); }static void rtw8922a_rfk_init_late (struct rtw89_dev *rtwdev)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/10] wifi: rtw89: 8922a: rfk: adjust timeout time of RX DCK
Quoted 6 lines · Ping-Ke Shih
The RX DCK in firmware could retry 3 times if calibration value is not stable. Roughly each calibration can be done within 16 ms, so expect 16 * 4 (with additional 16 ms) will be enough. More, in coming MLO, it will do calibration on two path, so multiply 2.
Signed-off-by Ping-Ke Shih <[email protected]>
10 patch(es) applied to rtw-next branch of rtw.git, thanks.
b47e250e593e wifi: rtw89: 8922a: rfk: adjust timeout time of RX DCK 372559788161 wifi: rtw89: 8922a: use SW CRYPTO when broadcast in MLO mode e6512916eeb1 wifi: rtw89: Adjust management queue mapping for [MLO, HW-1] 6d9e16a961a3 wifi: rtw89: extend mapping from Qsel to DMA ch for MLO 667231dfea08 wifi: rtw89: Configure scan band when mlo_dbcc_mode changes 8bb7dfa6b5b9 wifi: rtw89: extend join_info H2C command for MLO fields 9f1aa1054d80 wifi: rtw89: add MLD capabilities declaration 6173b636c722 wifi: rtw89: Fill in correct Rx link ID for MLO d0e6c18fff72 wifi: rtw89: roc: dynamically handle link id and link instance index c3dded779137 wifi: rtw89: introduce helper to get designated link for MLO
Ping-Ke Shih
maintainerPATCH 2/10 wifi: rtw89: 8922a: use SW CRYPTO when broadcast in MLO mode
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
8922A doesn't support broadcast/multicast traffic under MLO mode. So let mac80211 do the encryption/decryption for us when the connection is in MLO mode. Future BE ICs fixes this issue.
--- drivers/net/wireless/realtek/rtw89/cam.c | 4 ++++ drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 8 files changed, 11 insertions(+)
drivers/net/wireless/realtek/rtw89/cam.c +4 -0
@@ -469,6 +469,10 @@ int rtw89_cam_sec_key_add(struct rtw89_dev *rtwdev,bool ext_key = false;int ret; +if (ieee80211_vif_is_mld (vif) && !chip->hw_mlo_bmc_crypto && + !(key->flags &IEEE80211_KEY_FLAG_PAIRWISE )) +return -EOPNOTSUPP ; +switch (key->cipher) {case WLAN_CIPHER_SUITE_WEP40 : hw_key_type =RTW89_SEC_KEY_TYPE_WEP40 ;
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4292,6 +4292,7 @@ struct rtw89_chip_info {bool hw_sec_hdr;bool hw_mgmt_tx_encrypt;bool hw_tkip_crypto; +bool hw_mlo_bmc_crypto;u8 rf_path_num;u8 tx_nss;u8 rx_nss;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2506,6 +2506,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .hw_sec_hdr = false, .hw_mgmt_tx_encrypt = false, .hw_tkip_crypto = false, + .hw_mlo_bmc_crypto = false, .rf_path_num = 1, .tx_nss = 1, .rx_nss = 1,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2224,6 +2224,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .hw_sec_hdr = false, .hw_mgmt_tx_encrypt = false, .hw_tkip_crypto = false, + .hw_mlo_bmc_crypto = false, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -860,6 +860,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .hw_sec_hdr = false, .hw_mgmt_tx_encrypt = false, .hw_tkip_crypto = false, + .hw_mlo_bmc_crypto = false, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -793,6 +793,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .hw_sec_hdr = false, .hw_mgmt_tx_encrypt = false, .hw_tkip_crypto = true, + .hw_mlo_bmc_crypto = false, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -3047,6 +3047,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .hw_sec_hdr = true, .hw_mgmt_tx_encrypt = true, .hw_tkip_crypto = true, + .hw_mlo_bmc_crypto = false, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -2858,6 +2858,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .hw_sec_hdr = true, .hw_mgmt_tx_encrypt = true, .hw_tkip_crypto = true, + .hw_mlo_bmc_crypto = false, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/10 wifi: rtw89: Adjust management queue mapping for [MLO, HW-1]
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Adjust mapping of management packets accordingly to send it on the second hardware band. Previously only single band is used and we plan to enable MLO, so the second band will be needed. Data packets will be steered by hardware so no related changes are required.
--- drivers/net/wireless/realtek/rtw89/core.c | 2 +- drivers/net/wireless/realtek/rtw89/txrx.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +1 -1
@@ -673,7 +673,7 @@ rtw89_core_tx_update_mgmt_info(struct rtw89_dev *rtwdev,struct sk_buff *skb = tx_req->skb;u8 qsel, ch_dma; - qsel = desc_info->hiq ?RTW89_TX_QSEL_B0_HI :RTW89_TX_QSEL_B0_MGMT ; + qsel =rtw89_core_get_qsel_mgmt (rtwdev, tx_req); ch_dma =rtw89_core_get_ch_dma (rtwdev, qsel); desc_info->qsel = qsel;
drivers/net/wireless/realtek/rtw89/txrx.h +19 -0
@@ -712,6 +712,25 @@ static inline u8 rtw89_core_get_qsel(struct rtw89_dev *rtwdev, u8 tid) } } +static inline u8 +rtw89_core_get_qsel_mgmt (struct rtw89_dev *rtwdev,struct rtw89_core_tx_request *tx_req) +{ +struct rtw89_tx_desc_info *desc_info = &tx_req->desc_info; +struct rtw89_vif_link *rtwvif_link = tx_req->rtwvif_link; + +if (desc_info->hiq) { +if (rtwvif_link->mac_idx ==RTW89_MAC_1 ) +return RTW89_TX_QSEL_B1_HI ; +else +return RTW89_TX_QSEL_B0_HI ; + } + +if (rtwvif_link->mac_idx ==RTW89_MAC_1 ) +return RTW89_TX_QSEL_B1_MGMT ; +else +return RTW89_TX_QSEL_B0_MGMT ; +} +static inline u8 rtw89_core_get_ch_dma (struct rtw89_dev *rtwdev,u8 qsel) {switch (qsel) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/10 wifi: rtw89: extend mapping from Qsel to DMA ch for MLO
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
After impending MLO support, TX Qsel would come from other HW band rather than HW-0. For example, when working on HW-1, TX release report may fill QSEL_XX_1 and cause warning "Cannot map qsel to dma: ...". So, extend the mapping to recognize multiple HW bands.
--- drivers/net/wireless/realtek/rtw89/txrx.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/wireless/realtek/rtw89/txrx.h +12 -0
@@ -738,12 +738,24 @@ static inline u8 rtw89_core_get_ch_dma(struct rtw89_dev *rtwdev, u8 qsel)rtw89_warn (rtwdev,"Cannot map qsel to dma: %d\n" , qsel); fallthrough;case RTW89_TX_QSEL_BE_0 : +case RTW89_TX_QSEL_BE_1 : +case RTW89_TX_QSEL_BE_2 : +case RTW89_TX_QSEL_BE_3 :return RTW89_TXCH_ACH0 ;case RTW89_TX_QSEL_BK_0 : +case RTW89_TX_QSEL_BK_1 : +case RTW89_TX_QSEL_BK_2 : +case RTW89_TX_QSEL_BK_3 :return RTW89_TXCH_ACH1 ;case RTW89_TX_QSEL_VI_0 : +case RTW89_TX_QSEL_VI_1 : +case RTW89_TX_QSEL_VI_2 : +case RTW89_TX_QSEL_VI_3 :return RTW89_TXCH_ACH2 ;case RTW89_TX_QSEL_VO_0 : +case RTW89_TX_QSEL_VO_1 : +case RTW89_TX_QSEL_VO_2 : +case RTW89_TX_QSEL_VO_3 :return RTW89_TXCH_ACH3 ;case RTW89_TX_QSEL_B0_MGMT :return RTW89_TXCH_CH8 ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/10 wifi: rtw89: Configure scan band when mlo_dbcc_mode changes
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Previously only the first band is used for scanning. With MLO, update scan parameters accordingly by so we can choose to scan from either band. C2H event return value reflects current scanning band, mask it out so we don't treat correct return value as fail.
--- drivers/net/wireless/realtek/rtw89/fw.c | 2 +- drivers/net/wireless/realtek/rtw89/fw.h | 1 + drivers/net/wireless/realtek/rtw89/mac.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/fw.c +1 -1
@@ -5753,7 +5753,7 @@ int rtw89_fw_h2c_scan_offload_be(struct rtw89_dev *rtwdev, RTW89_H2C_SCANOFLD_BE_OPCH_W2_PKTS_CTRL) |le32_encode_bits (0 ,RTW89_H2C_SCANOFLD_BE_OPCH_W2_SW_DEF ) | -le32_encode_bits (2 , +le32_encode_bits (rtw89_is_mlo_1_1 (rtwdev) ?1 :2 ,RTW89_H2C_SCANOFLD_BE_OPCH_W2_SS ); opch->w3 = le32_encode_bits(RTW89_SCANOFLD_PKT_NONE,
drivers/net/wireless/realtek/rtw89/fw.h +1 -0
@@ -3562,6 +3562,7 @@ struct rtw89_c2h_done_ack {#define RTW89_C2H_DONE_ACK_W2_CLASS GENMASK(7, 2)#define RTW89_C2H_DONE_ACK_W2_FUNC GENMASK(15, 8)#define RTW89_C2H_DONE_ACK_W2_H2C_RETURN GENMASK(23, 16) +#define RTW89_C2H_SCAN_DONE_ACK_RETURN GENMASK(5, 0)#define RTW89_C2H_DONE_ACK_W2_H2C_SEQ GENMASK(31, 24)#define RTW89_GET_MAC_C2H_REV_ACK_CAT (c2h) \
drivers/net/wireless/realtek/rtw89/mac.c +2 -0
@@ -5118,12 +5118,14 @@ rtw89_mac_c2h_done_ack(struct rtw89_dev *rtwdev, struct sk_buff *skb_c2h, u32 lereturn ;case H2C_FUNC_ADD_SCANOFLD_CH : cond =RTW89_SCANOFLD_WAIT_COND_ADD_CH ; + h2c_return &=RTW89_C2H_SCAN_DONE_ACK_RETURN ;break ;case H2C_FUNC_SCANOFLD : cond =RTW89_SCANOFLD_WAIT_COND_START ;break ;case H2C_FUNC_SCANOFLD_BE : cond =RTW89_SCANOFLD_BE_WAIT_COND_START ; + h2c_return &=RTW89_C2H_SCAN_DONE_ACK_RETURN ;break ; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/10 wifi: rtw89: extend join_info H2C command for MLO fields
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
The join_info H2C command is used to indicate a station is connected and tell FW to create/maintain an instance for it. Extend to fill MLO fields.
--- drivers/net/wireless/realtek/rtw89/fw.c | 26 +++++++++++++++++++++++-- drivers/net/wireless/realtek/rtw89/fw.h | 2 ++ 2 files changed, 26 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +24 -2
@@ -4007,8 +4007,9 @@ rtw89_fw_get_sta_type(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_liint rtw89_fw_h2c_join_info (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link,bool dis_conn) { -struct sk_buff *skb;u8 mac_id = rtwsta_link ? rtwsta_link->mac_id : rtwvif_link->mac_id; +struct ieee80211_vif *vif =rtwvif_link_to_vif (rtwvif_link); +bool is_mld =ieee80211_vif_is_mld (vif);u8 self_role = rtwvif_link->self_role;enum rtw89_fw_sta_type sta_type;u8 net_type = rtwvif_link->net_type;
@@ -4016,6 +4017,8 @@ int rtw89_fw_h2c_join_info(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvstruct rtw89_h2c_join *h2c;u32 len =sizeof (*h2c);bool format_v1 = false; +struct sk_buff *skb; +u8 main_mac_id;int ret;if (rtwdev->chip->chip_gen ==RTW89_CHIP_BE ) {
@@ -4058,7 +4061,26 @@ int rtw89_fw_h2c_join_info(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwv sta_type =rtw89_fw_get_sta_type (rtwdev, rtwvif_link, rtwsta_link); - h2c_v1->w1 =le32_encode_bits (sta_type,RTW89_H2C_JOININFO_W1_STA_TYPE ); +if (rtwsta_link) + main_mac_id =rtw89_sta_get_main_macid (rtwsta_link->rtwsta); +else + main_mac_id =rtw89_vif_get_main_macid (rtwvif_link->rtwvif); + + h2c_v1->w1 =le32_encode_bits (sta_type,RTW89_H2C_JOININFO_W1_STA_TYPE ) | +le32_encode_bits (is_mld,RTW89_H2C_JOININFO_W1_IS_MLD ) | +le32_encode_bits (main_mac_id,RTW89_H2C_JOININFO_W1_MAIN_MACID ) | +le32_encode_bits (RTW89_H2C_JOININFO_MLO_MODE_MLSR , +RTW89_H2C_JOININFO_W1_MLO_MODE ) | +le32_encode_bits (0 ,RTW89_H2C_JOININFO_W1_EMLSR_CAB ) | +le32_encode_bits (0 ,RTW89_H2C_JOININFO_W1_NSTR_EN ) | +le32_encode_bits (0 ,RTW89_H2C_JOININFO_W1_INIT_PWR_STATE ) | +le32_encode_bits (IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_256US , +RTW89_H2C_JOININFO_W1_EMLSR_PADDING ) | +le32_encode_bits (IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_256US , +RTW89_H2C_JOININFO_W1_EMLSR_TRANS_DELAY ) | +le32_encode_bits (0 ,RTW89_H2C_JOININFO_W2_MACID_EXT ) | +le32_encode_bits (0 ,RTW89_H2C_JOININFO_W2_MAIN_MACID_EXT ); + h2c_v1->w2 =0 ; done:
drivers/net/wireless/realtek/rtw89/fw.h +2 -0
@@ -1636,6 +1636,8 @@ struct rtw89_h2c_join_v1 {#define RTW89_H2C_JOININFO_W1_IS_MLD BIT(3)#define RTW89_H2C_JOININFO_W1_MAIN_MACID GENMASK(11, 4)#define RTW89_H2C_JOININFO_W1_MLO_MODE BIT(12) +#define RTW89_H2C_JOININFO_MLO_MODE_MLMR 0 +#define RTW89_H2C_JOININFO_MLO_MODE_MLSR 1#define RTW89_H2C_JOININFO_W1_EMLSR_CAB BIT(13)#define RTW89_H2C_JOININFO_W1_NSTR_EN BIT(14)#define RTW89_H2C_JOININFO_W1_INIT_PWR_STATE BIT(15)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/10 wifi: rtw89: add MLD capabilities declaration
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Add MLD capabilities so association requests can carry multi-link element with correct content.
--- drivers/net/wireless/realtek/rtw89/core.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +21 -1
@@ -203,6 +203,23 @@ static const struct ieee80211_iface_combination rtw89_iface_combs[] = { }, }; +static const u8 rtw89_ext_capa_sta[] = { + [2 ] =WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT , + [7 ] =WLAN_EXT_CAPA8_OPMODE_NOTIF , +}; + +static const struct wiphy_iftype_ext_capab rtw89_iftypes_ext_capa[] = { + { + .iftype =NL80211_IFTYPE_STATION , + .extended_capabilities = rtw89_ext_capa_sta, + .extended_capabilities_mask = rtw89_ext_capa_sta, + .extended_capabilities_len =sizeof (rtw89_ext_capa_sta), +/* relevant only if EHT is supported */ + .eml_capabilities =0 , + .mld_capa_and_ops =0 , + }, +}; +#define RTW89_6GHZ_SPAN_HEAD 6145#define RTW89_6GHZ_SPAN_IDX (center_freq) \ ((((int)(center_freq) - RTW89_6GHZ_SPAN_HEAD) / 5) / 2)
@@ -5316,8 +5333,11 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev)if (chip->chip_gen ==RTW89_CHIP_BE ) hw->wiphy->flags |=WIPHY_FLAG_DISABLE_WEXT ; -if (rtwdev->support_mlo) +if (rtwdev->support_mlo) { hw->wiphy->flags |=WIPHY_FLAG_SUPPORTS_MLO ; + hw->wiphy->iftype_ext_capab = rtw89_iftypes_ext_capa; + hw->wiphy->num_iftype_ext_capab =ARRAY_SIZE (rtw89_iftypes_ext_capa); + } hw->wiphy->features |=NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/10 wifi: rtw89: Fill in correct Rx link ID for MLO
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
For MLO connections, RX link ID is required to do address conversion. Fill it in by the hardware info.
--- drivers/net/wireless/realtek/rtw89/core.c | 26 +++++++++++------------ drivers/net/wireless/realtek/rtw89/core.h | 1 + 2 files changed, 14 insertions(+), 13 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +13 -13
@@ -1654,10 +1654,7 @@ static void rtw89_core_rx_process_phy_ppdu_iter(void *data,u8 evm_pos =0 ;int i; -/* FIXME: For single link, taking link on HW-0 here is okay. But, when -* enabling multiple active links, we should determine the right link. -*/ - rtwsta_link =rtw89_sta_get_link_inst (rtwsta,0 ); + rtwsta_link =rtw89_sta_get_link_inst (rtwsta, phy_ppdu->phy_idx);if (unlikely (!rtwsta_link))return ;
@@ -2182,8 +2179,10 @@ static void rtw89_vif_rx_stats_iter(void *data, u8 *mac,struct rtw89_pkt_stat *pkt_stat = &rtwdev->phystat.cur_pkt_stat;struct rtw89_rx_desc_info *desc_info = iter_data->desc_info;struct sk_buff *skb = iter_data->skb; +struct ieee80211_rx_status *rx_status =IEEE80211_SKB_RXCB (skb);struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct rtw89_rx_phy_ppdu *phy_ppdu = iter_data->phy_ppdu; +bool is_mld =ieee80211_vif_is_mld (vif);struct ieee80211_bss_conf *bss_conf;struct rtw89_vif_link *rtwvif_link;const u8 *bssid = iter_data->bssid;
@@ -2195,10 +2194,7 @@ static void rtw89_vif_rx_stats_iter(void *data, u8 *mac,rcu_read_lock (); -/* FIXME: For single link, taking link on HW-0 here is okay. But, when -* enabling multiple active links, we should determine the right link. -*/ - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,0 ); + rtwvif_link =rtw89_vif_get_link_inst (rtwvif, desc_info->bb_sel);if (unlikely (!rtwvif_link)) goto out;
@@ -2214,6 +2210,11 @@ static void rtw89_vif_rx_stats_iter(void *data, u8 *mac,if (!ether_addr_equal (bss_conf->bssid, bssid)) goto out; +if (is_mld) { + rx_status->link_valid = true; + rx_status->link_id = rtwvif_link->link_id; + } +if (ieee80211_is_beacon (hdr->frame_control)) {if (vif->type ==NL80211_IFTYPE_STATION && !test_bit (RTW89_FLAG_WOWLAN , rtwdev->flags)) {
@@ -2512,7 +2513,8 @@ static void rtw89_core_rx_process_ppdu_sts(struct rtw89_dev *rtwdev, .len = skb->len, .to_self = desc_info->addr1_match, .rate = desc_info->data_rate, - .mac_id = desc_info->mac_id}; + .mac_id = desc_info->mac_id, + .phy_idx = desc_info->bb_sel};int ret;if (desc_info->mac_info_valid) {
@@ -2623,6 +2625,7 @@ void rtw89_core_query_rxdesc_v2(struct rtw89_dev *rtwdev, desc_info->shift =le32_get_bits (rxd_s->dword0,BE_RXD_SHIFT_MASK ); desc_info->long_rxdesc =le32_get_bits (rxd_s->dword0,BE_RXD_LONG_RXD ); desc_info->pkt_type =le32_get_bits (rxd_s->dword0,BE_RXD_RPKT_TYPE_MASK ); + desc_info->bb_sel =le32_get_bits (rxd_s->dword0,BE_RXD_BB_SEL );if (desc_info->pkt_type ==RTW89_CORE_RX_TYPE_PPDU_STAT ) desc_info->mac_info_valid = true;
@@ -2695,10 +2698,7 @@ void rtw89_core_stats_sta_rx_status_iter(void *data, struct ieee80211_sta *sta)struct rtw89_sta_link *rtwsta_link;u8 mac_id = iter_data->mac_id; -/* FIXME: For single link, taking link on HW-0 here is okay. But, when -* enabling multiple active links, we should determine the right link. -*/ - rtwsta_link =rtw89_sta_get_link_inst (rtwsta,0 ); + rtwsta_link =rtw89_sta_get_link_inst (rtwsta, desc_info->bb_sel);if (unlikely (!rtwsta_link))return ;
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -798,6 +798,7 @@ struct rtw89_rx_phy_ppdu {u8 rssi[RF_PATH_MAX ];u8 mac_id;u8 chan_idx; +u8 phy_idx;u8 ie;u16 rate;u8 rpl_avg;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/10 wifi: rtw89: roc: dynamically handle link id and link instance index
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Originally, a macro, RTW89_ROC_BY_LINK_INDEX, is used to decide the link which deals with the ROC process. Before enabling MLO support, it's fine to hard-code RTW89_ROC_BY_LINK_INDEX as 0 since the link instance-0 (on HW-0) is always active. But, for the impending enablement of MLO support, tweak the leaf functions to dynamically handle ROC link instance index.
Besides, in the follow-up, ROC caller will get a designated link and will then drop RTW89_ROC_BY_LINK_INDEX.
--- drivers/net/wireless/realtek/rtw89/chan.c | 11 ++++++----- drivers/net/wireless/realtek/rtw89/chan.h | 2 +- drivers/net/wireless/realtek/rtw89/core.c | 12 +++++++----- drivers/net/wireless/realtek/rtw89/core.h | 2 ++ 4 files changed, 16 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +6 -5
@@ -189,9 +189,10 @@ void rtw89_config_entity_chandef(struct rtw89_dev *rtwdev, }void rtw89_config_roc_chandef (struct rtw89_dev *rtwdev, -enum rtw89_chanctx_idx idx, +struct rtw89_vif_link *rtwvif_link,const struct cfg80211_chan_def *chandef) { +enum rtw89_chanctx_idx idx = rtwvif_link->chanctx_idx;struct rtw89_hal *hal = &rtwdev->hal;enum rtw89_chanctx_idx cur;
@@ -205,6 +206,7 @@ void rtw89_config_roc_chandef(struct rtw89_dev *rtwdev, } hal->roc_chandef = *chandef; + hal->roc_link_index =rtw89_vif_link_inst_get_index (rtwvif_link); }else { cur =atomic_cmpxchg (&hal->roc_chanctx_idx, idx,RTW89_CHANCTX_IDLE );
@@ -339,11 +341,10 @@ const struct rtw89_chan *__rtw89_mgnt_chan_get(struct rtw89_dev *rtwdev, roc_idx =atomic_read (&hal->roc_chanctx_idx);if (roc_idx !=RTW89_CHANCTX_IDLE ) { -/* ROC is ongoing (given ROC runs on RTW89_ROC_BY_LINK_INDEX). -* If @link_index is the same as RTW89_ROC_BY_LINK_INDEX, get -* the ongoing ROC chanctx. +/* ROC is ongoing (given ROC runs on @hal->roc_link_index). +* If @link_index is the same, get the ongoing ROC chanctx. */ -if (link_index ==RTW89_ROC_BY_LINK_INDEX ) +if (link_index == hal->roc_link_index) chanctx_idx = roc_idx; }
drivers/net/wireless/realtek/rtw89/chan.h +1 -1
@@ -103,7 +103,7 @@ void rtw89_config_entity_chandef(struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx idx, const struct cfg80211_chan_def *chandef);void rtw89_config_roc_chandef (struct rtw89_dev *rtwdev, -enum rtw89_chanctx_idx idx, +struct rtw89_vif_link *rtwvif_link,const struct cfg80211_chan_def *chandef);void rtw89_entity_init (struct rtw89_dev *rtwdev);enum rtw89_entity_mode rtw89_entity_recalc (struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/core.c +7 -5
@@ -3379,6 +3379,8 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)return ; } + roc->link_id = rtwvif_link->link_id; +rtw89_chanctx_pause (rtwdev,RTW89_CHANCTX_PAUSE_REASON_ROC ); ret =rtw89_core_send_nullfunc (rtwdev, rtwvif_link, true, true);
@@ -3399,7 +3401,7 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) }cfg80211_chandef_create (&roc_chan, &roc->chan,NL80211_CHAN_NO_HT ); -rtw89_config_roc_chandef (rtwdev, rtwvif_link->chanctx_idx, &roc_chan); +rtw89_config_roc_chandef (rtwdev, rtwvif_link, &roc_chan);rtw89_set_channel (rtwdev); reg =rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr, rtwvif_link->mac_idx);
@@ -3428,10 +3430,10 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_leave_ips_by_hwflags (rtwdev);rtw89_leave_lps (rtwdev); - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,RTW89_ROC_BY_LINK_INDEX ); + rtwvif_link = rtwvif->links[roc->link_id];if (unlikely (!rtwvif_link)) { -rtw89_err (rtwdev,"roc end: find no link on HW-%u\n" , -RTW89_ROC_BY_LINK_INDEX ); +rtw89_err (rtwdev,"roc end: find no link (link id %u)\n" , + roc->link_id);return ; }
@@ -3439,7 +3441,7 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_write32_mask (rtwdev, reg,B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr); roc->state =RTW89_ROC_IDLE ; -rtw89_config_roc_chandef (rtwdev, rtwvif_link->chanctx_idx,NULL ); +rtw89_config_roc_chandef (rtwdev, rtwvif_link,NULL );rtw89_chanctx_proceed (rtwdev,NULL ); ret =rtw89_core_send_nullfunc (rtwdev, rtwvif_link, true, false);if (ret)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -3454,6 +3454,7 @@ struct rtw89_roc {enum ieee80211_roc_type type;enum rtw89_roc_state state;int duration; +unsigned int link_id; };#define RTW89_P2P_MAX_NOA_NUM 2
@@ -4851,6 +4852,7 @@ struct rtw89_hal {bool no_mcs_12_13;atomic_t roc_chanctx_idx; +u8 roc_link_index;DECLARE_BITMAP (changes,NUM_OF_RTW89_CHANCTX_CHANGES );DECLARE_BITMAP (entity_map,NUM_OF_RTW89_CHANCTX );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/10 wifi: rtw89: introduce helper to get designated link for MLO
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
A link bound to HW band 0 was previously always assumed to exist, because it's true on non-MLD connection, and MLO connection is not supported yet. Now, start to consider MLO cases and prepare to enable MLO support in the following. Add skeleton of designated link. For single-link cases, helper returns the one. For multi-link cases, priorities can be scheduled. Then, drop assumption of link bound to HW band 0.
One exception is that MCC doesn't work with MLD yet, so it still expects link on HW band 0 somewhere.
--- drivers/net/wireless/realtek/rtw89/chan.c | 12 ++----- drivers/net/wireless/realtek/rtw89/core.c | 33 ++++++++++--------- drivers/net/wireless/realtek/rtw89/core.h | 12 +++++-- drivers/net/wireless/realtek/rtw89/mac80211.c | 21 +++++++----- drivers/net/wireless/realtek/rtw89/wow.c | 3 +- 5 files changed, 43 insertions(+), 38 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +3 -9
@@ -694,19 +694,13 @@ static void rtw89_mcc_role_macid_sta_iter(void *data, struct ieee80211_sta *sta)struct rtw89_vif *target = mcc_role->rtwvif_link->rtwvif;struct rtw89_sta *rtwsta =sta_to_rtwsta (sta);struct rtw89_vif *rtwvif = rtwsta->rtwvif; -struct rtw89_dev *rtwdev = rtwsta->rtwdev; -struct rtw89_sta_link *rtwsta_link; +u8 macid;if (rtwvif != target)return ; - rtwsta_link =rtw89_sta_get_link_inst (rtwsta,0 ); -if (unlikely (!rtwsta_link)) { -rtw89_err (rtwdev,"mcc sta macid: find no link on HW-0\n" ); -return ; - } - -rtw89_mcc_role_fw_macid_bitmap_set_bit (mcc_role, rtwsta_link->mac_id); + macid =rtw89_sta_get_main_macid (rtwsta); +rtw89_mcc_role_fw_macid_bitmap_set_bit (mcc_role, macid); } static void rtw89_mcc_fill_role_macid_bitmap(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/core.c +17 -16
@@ -1133,22 +1133,20 @@ int rtw89_core_tx_write(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,struct rtw89_vif_link *rtwvif_link;int ret; -/* By default, driver writes tx via the link on HW-0. And then, -* according to links' status, HW can change tx to another link. -*/ -if (rtwsta) { - rtwsta_link =rtw89_sta_get_link_inst (rtwsta,0 ); + rtwsta_link =rtw89_get_designated_link (rtwsta);if (unlikely (!rtwsta_link)) { -rtw89_err (rtwdev,"tx: find no sta link on HW-0\n" ); +rtw89_err (rtwdev,"tx: find no sta designated link\n" );return -ENOLINK ; } - } - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,0 ); -if (unlikely (!rtwvif_link)) { -rtw89_err (rtwdev,"tx: find no vif link on HW-0\n" ); -return -ENOLINK ; + rtwvif_link = rtwsta_link->rtwvif_link; + }else { + rtwvif_link =rtw89_get_designated_link (rtwvif); +if (unlikely (!rtwvif_link)) { +rtw89_err (rtwdev,"tx: find no vif designated link\n" ); +return -ENOLINK ; + } } tx_req.skb = skb;
@@ -3147,9 +3145,9 @@ static bool rtw89_core_txq_agg_wait(struct rtw89_dev *rtwdev,if (!rtwsta)return false; - rtwsta_link =rtw89_sta_get_link_inst (rtwsta,0 ); + rtwsta_link =rtw89_get_designated_link (rtwsta);if (unlikely (!rtwsta_link)) { -rtw89_err (rtwdev,"agg wait: find no link on HW-0\n" ); +rtw89_err (rtwdev,"agg wait: find no designated link\n" );return false; }
@@ -3372,10 +3370,9 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_leave_ips_by_hwflags (rtwdev);rtw89_leave_lps (rtwdev); - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,RTW89_ROC_BY_LINK_INDEX ); + rtwvif_link =rtw89_get_designated_link (rtwvif);if (unlikely (!rtwvif_link)) { -rtw89_err (rtwdev,"roc start: find no link on HW-%u\n" , -RTW89_ROC_BY_LINK_INDEX ); +rtw89_err (rtwdev,"roc start: find no designated link\n" );return ; }
@@ -4806,6 +4803,7 @@ struct rtw89_vif_link *rtw89_vif_set_link(struct rtw89_vif *rtwvif,set_bit (index, rtwvif->links_inst_map); rtwvif->links[link_id] = rtwvif_link; +list_add_tail (&rtwvif_link->dlink_schd, &rtwvif->dlink_pool);return rtwvif_link; err:
@@ -4826,6 +4824,7 @@ void rtw89_vif_unset_link(struct rtw89_vif *rtwvif, unsigned int link_id) index =rtw89_vif_link_inst_get_index (link);clear_bit (index, rtwvif->links_inst_map); *container =NULL ; +list_del (&link->dlink_schd); } struct rtw89_sta_link *rtw89_sta_set_link(struct rtw89_sta *rtwsta,
@@ -4856,6 +4855,7 @@ struct rtw89_sta_link *rtw89_sta_set_link(struct rtw89_sta *rtwsta,set_bit (index, rtwsta->links_inst_map); rtwsta->links[link_id] = rtwsta_link; +list_add_tail (&rtwsta_link->dlink_schd, &rtwsta->dlink_pool);return rtwsta_link; err:
@@ -4876,6 +4876,7 @@ void rtw89_sta_unset_link(struct rtw89_sta *rtwsta, unsigned int link_id) index =rtw89_sta_link_inst_get_index (link);clear_bit (index, rtwsta->links_inst_map); *container =NULL ; +list_del (&link->dlink_schd); }int rtw89_core_init (struct rtw89_dev *rtwdev)
drivers/net/wireless/realtek/rtw89/core.h +10 -2
@@ -3380,6 +3380,7 @@ struct rtw89_sec_cam_entry {struct rtw89_sta_link {struct rtw89_sta *rtwsta; +struct list_head dlink_schd;unsigned int link_id;u8 mac_id;
@@ -3446,8 +3447,6 @@ enum rtw89_roc_state { RTW89_ROC_MGMT, }; -#define RTW89_ROC_BY_LINK_INDEX 0 -struct rtw89_roc {struct ieee80211_channel chan;struct wiphy_delayed_work roc_work;
@@ -3487,6 +3486,7 @@ struct rtw89_p2p_noa_setter {struct rtw89_vif_link {struct rtw89_vif *rtwvif; +struct list_head dlink_schd;unsigned int link_id;bool chanctx_assigned;/* only valid when running with chanctx_ops */
@@ -5878,6 +5878,7 @@ struct rtw89_vif {struct rtw89_roc roc;bool offchan; +struct list_head dlink_pool;u8 links_inst_valid_num;DECLARE_BITMAP (links_inst_map, __RTW89_MLD_MAX_LINK_NUM);struct rtw89_vif_link *links[IEEE80211_MLD_MAX_NUM_LINKS ];
@@ -5917,6 +5918,7 @@ struct rtw89_sta {DECLARE_BITMAP (pairwise_sec_cam_map,RTW89_MAX_SEC_CAM_NUM ); +struct list_head dlink_pool;u8 links_inst_valid_num;DECLARE_BITMAP (links_inst_map, __RTW89_MLD_MAX_LINK_NUM);struct rtw89_sta_link *links[IEEE80211_MLD_MAX_NUM_LINKS ];
@@ -6012,6 +6014,12 @@ rtw89_assoc_link_rcu_dereference(struct rtw89_dev *rtwdev, u8 macid)return rcu_dereference (rtwdev->assoc_link_on_macid[macid]); } +#define rtw89_get_designated_link (links_holder) \ +({ \ + typeof(links_holder) p = links_holder; \ + list_first_entry_or_null(&p->dlink_pool, typeof(*p->links_inst), dlink_schd); \ +}) +static inline int rtw89_hci_tx_write (struct rtw89_dev *rtwdev,struct rtw89_core_tx_request *tx_req) {
drivers/net/wireless/realtek/rtw89/mac80211.c +12 -9
@@ -187,6 +187,7 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw,if (!rtw89_rtwvif_in_list (rtwdev, rtwvif)) {list_add_tail (&rtwvif->list, &rtwdev->rtwvifs_list);INIT_LIST_HEAD (&rtwvif->mgnt_entry); +INIT_LIST_HEAD (&rtwvif->dlink_pool); }ether_addr_copy (rtwvif->mac_addr, vif->addr);
@@ -495,6 +496,8 @@ static int __rtw89_ops_sta_add(struct rtw89_dev *rtwdev,for (i =0 ; i <ARRAY_SIZE (sta->txq); i++)rtw89_core_txq_init (rtwdev, sta->txq[i]); +INIT_LIST_HEAD (&rtwsta->dlink_pool); +skb_queue_head_init (&rtwsta->roc_queue);bitmap_zero (rtwsta->pairwise_sec_cam_map,RTW89_MAX_SEC_CAM_NUM );
@@ -1019,7 +1022,7 @@ static void rtw89_ops_sta_statistics(struct ieee80211_hw *hw,struct rtw89_sta *rtwsta =sta_to_rtwsta (sta);struct rtw89_sta_link *rtwsta_link; - rtwsta_link =rtw89_sta_get_link_inst (rtwsta,0 ); + rtwsta_link =rtw89_get_designated_link (rtwsta);if (unlikely (!rtwsta_link))return ;
@@ -1154,9 +1157,9 @@ static void rtw89_ops_sw_scan_start(struct ieee80211_hw *hw,lockdep_assert_wiphy (hw->wiphy); - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,0 ); + rtwvif_link =rtw89_get_designated_link (rtwvif);if (unlikely (!rtwvif_link)) { -rtw89_err (rtwdev,"sw scan start: find no link on HW-0\n" ); +rtw89_err (rtwdev,"sw scan start: find no designated link\n" );return ; }
@@ -1174,9 +1177,9 @@ static void rtw89_ops_sw_scan_complete(struct ieee80211_hw *hw,lockdep_assert_wiphy (hw->wiphy); - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,0 ); + rtwvif_link =rtw89_get_designated_link (rtwvif);if (unlikely (!rtwvif_link)) { -rtw89_err (rtwdev,"sw scan complete: find no link on HW-0\n" ); +rtw89_err (rtwdev,"sw scan complete: find no designated link\n" );return ; }
@@ -1208,9 +1211,9 @@ static int rtw89_ops_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,if (rtwdev->scanning || rtwvif->offchan)return -EBUSY ; - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,0 ); + rtwvif_link =rtw89_get_designated_link (rtwvif);if (unlikely (!rtwvif_link)) { -rtw89_err (rtwdev,"hw scan: find no link on HW-0\n" ); +rtw89_err (rtwdev,"hw scan: find no designated link\n" );return -ENOLINK ; }
@@ -1245,9 +1248,9 @@ static void rtw89_ops_cancel_hw_scan(struct ieee80211_hw *hw,if (!rtwdev->scanning)return ; - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,0 ); + rtwvif_link =rtw89_get_designated_link (rtwvif);if (unlikely (!rtwvif_link)) { -rtw89_err (rtwdev,"cancel hw scan: find no link on HW-0\n" ); +rtw89_err (rtwdev,"cancel hw scan: find no designated link\n" );return ; }
drivers/net/wireless/realtek/rtw89/wow.c +1 -2
@@ -1086,8 +1086,7 @@ static int rtw89_wow_set_wakeups(struct rtw89_dev *rtwdev,rtw89_wow_init_pno (rtwdev, wowlan->nd_config);rtw89_for_each_rtwvif (rtwdev, rtwvif) { -/* use the link on HW-0 to do wow flow */ - rtwvif_link =rtw89_vif_get_link_inst (rtwvif,0 ); + rtwvif_link =rtw89_get_designated_link (rtwvif);if (!rtwvif_link)continue ;
Signature · 1 line
2.25.1