wifi: rtw89: update H2C commands of BA CAM, TX pause and beacon
Ping-Ke Shih
maintainercover wifi: rtw89: update H2C commands of BA CAM, TX pause and beacon
Adjust and prepare H2C commands for WiFi 7 chips. BA CAM is a kind of hardware CAM that is used to record received frame and reply BA frame. TX pause H2C command is to stop transmitting to prevent send out unexpected packets when we are going to enable a firmware/hardware entry for certain station. Beacon H2C command is to tell firmware/hardware the beacon frame and its attributes.
Ping-Ke Shih (10):
wifi: rtw89: add firmware H2C command of BA CAM V1
wifi: rtw89: mac: add feature_init to initialize BA CAM V1
wifi: rtw89: add chip_ops::h2c_ba_cam() to configure BA CAM
wifi: rtw89: 8922a: update BA CAM number to 24
wifi: rtw89: fw: use struct to fill BA CAM H2C commands
wifi: rtw89: refine H2C command that pause transmitting by MAC ID
wifi: rtw89: add new H2C command to pause/sleep transmitting by MAC ID
wifi: rtw89: use struct to fill H2C command to download beacon frame
wifi: rtw89: add H2C command to download beacon frame for WiFi 7 chips
wifi: rtw89: add chip_ops::update_beacon to abstract update beacon
operation
drivers/net/wireless/realtek/rtw89/chan.c | 2 +- drivers/net/wireless/realtek/rtw89/core.c | 2 +- drivers/net/wireless/realtek/rtw89/core.h | 7 +- drivers/net/wireless/realtek/rtw89/fw.c | 329 +++++++++++++++--- drivers/net/wireless/realtek/rtw89/fw.h | 294 ++++++++-------- drivers/net/wireless/realtek/rtw89/mac.c | 26 ++ drivers/net/wireless/realtek/rtw89/mac80211.c | 6 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 4 +- 12 files changed, 477 insertions(+), 201 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/10 wifi: rtw89: add firmware H2C command of BA CAM V1
BA CAM is used to generate BA frame for received AMPDU packets. To support WiFi 7, change format from V0 to have more fields and enlarge entry number for new need.
--- drivers/net/wireless/realtek/rtw89/fw.c | 74 +++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 20 +++++++ 2 files changed, 94 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +74 -0
@@ -1609,6 +1609,80 @@ void rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext(struct rtw89_dev *rtwdev) } } +int rtw89_fw_h2c_ba_cam_v1 (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta, +bool valid,struct ieee80211_ampdu_params *params) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_vif *rtwvif = rtwsta->rtwvif; +struct rtw89_h2c_ba_cam_v1 *h2c; +u8 macid = rtwsta->mac_id; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +u8 entry_idx; +u8 bmap_size; +int ret; + + ret = valid ? +rtw89_core_acquire_sta_ba_entry (rtwdev, rtwsta, params->tid, &entry_idx) : +rtw89_core_release_sta_ba_entry (rtwdev, rtwsta, params->tid, &entry_idx); +if (ret) { +/* it still works even if we don't have static BA CAM, because +* hardware can create dynamic BA CAM automatically. +*/ +rtw89_debug (rtwdev,RTW89_DBG_TXRX , +"failed to %s entry tid=%d for h2c ba cam\n" , + valid ?"alloc" :"free" , params->tid); +return 0 ; + } + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for h2c ba cam\n" ); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_ba_cam_v1 *)skb->data; + +if (params->buf_size >512 ) + bmap_size =10 ; +else if (params->buf_size >256 ) + bmap_size =8 ; +else if (params->buf_size >64 ) + bmap_size =4 ; +else + bmap_size =0 ; + + h2c->w0 =le32_encode_bits (valid,RTW89_H2C_BA_CAM_V1_W0_VALID ) | +le32_encode_bits (1 ,RTW89_H2C_BA_CAM_V1_W0_INIT_REQ ) | +le32_encode_bits (macid,RTW89_H2C_BA_CAM_V1_W0_MACID_MASK ) | +le32_encode_bits (params->tid,RTW89_H2C_BA_CAM_V1_W0_TID_MASK ) | +le32_encode_bits (bmap_size,RTW89_H2C_BA_CAM_V1_W0_BMAP_SIZE_MASK ) | +le32_encode_bits (params->ssn,RTW89_H2C_BA_CAM_V1_W0_SSN_MASK ); + + entry_idx += chip->bacam_dynamic_num;/* std entry right after dynamic ones */ + h2c->w1 =le32_encode_bits (entry_idx,RTW89_H2C_BA_CAM_V1_W1_ENTRY_IDX_MASK ) | +le32_encode_bits (1 ,RTW89_H2C_BA_CAM_V1_W1_STD_ENTRY_EN ) | +le32_encode_bits (!!rtwvif->mac_idx,RTW89_H2C_BA_CAM_V1_W1_BAND_SEL ); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC , +H2C_CL_BA_CAM , +H2C_FUNC_MAC_BA_CAM_V1 ,0 ,1 , + 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_LOG_CFG_LEN 12int rtw89_fw_h2c_fw_log (struct rtw89_dev *rtwdev,bool enable) {
drivers/net/wireless/realtek/rtw89/fw.h +20 -0
@@ -1796,6 +1796,23 @@ static inline void SET_BA_CAM_ENTRY_IDX_V1(void *h2c, u32 val)le32p_replace_bits ((__le32 *)h2c +1 , val,GENMASK (31 ,28 )); } +struct rtw89_h2c_ba_cam_v1 { +__le32 w0; +__le32 w1; +} __packed; + +#define RTW89_H2C_BA_CAM_V1_W0_VALID BIT(0) +#define RTW89_H2C_BA_CAM_V1_W0_INIT_REQ BIT(1) +#define RTW89_H2C_BA_CAM_V1_W0_TID_MASK GENMASK(7, 4) +#define RTW89_H2C_BA_CAM_V1_W0_MACID_MASK GENMASK(15, 8) +#define RTW89_H2C_BA_CAM_V1_W0_BMAP_SIZE_MASK GENMASK(19, 16) +#define RTW89_H2C_BA_CAM_V1_W0_SSN_MASK GENMASK(31, 20) +#define RTW89_H2C_BA_CAM_V1_W1_UID_VALUE_MASK GENMASK(7, 0) +#define RTW89_H2C_BA_CAM_V1_W1_STD_ENTRY_EN BIT(8) +#define RTW89_H2C_BA_CAM_V1_W1_BAND_SEL BIT(9) +#define RTW89_H2C_BA_CAM_V1_W1_MLD_EN BIT(10) +#define RTW89_H2C_BA_CAM_V1_W1_ENTRY_IDX_MASK GENMASK(31, 24) +static inline void SET_LPS_PARM_MACID (void *h2c,u32 val) {le32p_replace_bits ((__le32 *)h2c, val,GENMASK (7 ,0 ));
@@ -3690,6 +3707,7 @@ enum rtw89_fw_ofld_h2c_func {/* CLASS 12 - BA CAM */ #define H2C_CL_BA_CAM 0xc#define H2C_FUNC_MAC_BA_CAM 0x0 +#define H2C_FUNC_MAC_BA_CAM_V1 0x1/* CLASS 14 - MCC */ #define H2C_CL_MCC 0xe
@@ -3898,6 +3916,8 @@ void rtw89_fw_release_general_pkt_list_vif(struct rtw89_dev *rtwdev,void rtw89_fw_release_general_pkt_list (struct rtw89_dev *rtwdev,bool notify_fw);int rtw89_fw_h2c_ba_cam (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,bool valid,struct ieee80211_ampdu_params *params); +int rtw89_fw_h2c_ba_cam_v1 (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta, +bool valid,struct ieee80211_ampdu_params *params);void rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext (struct rtw89_dev *rtwdev); int rtw89_fw_h2c_lps_parm(struct rtw89_dev *rtwdev,
Signature · 1 line
2.25.1
Re: [PATCH 01/10] wifi: rtw89: add firmware H2C command of BA CAM V1
Quoted 5 lines · Ping-Ke Shih
BA CAM is used to generate BA frame for received AMPDU packets. To support WiFi 7, change format from V0 to have more fields and enlarge entry number for new need.
Signed-off-by Ping-Ke Shih <[email protected]>
10 patches applied to wireless-next.git, thanks.
6f066439f9dc wifi: rtw89: add firmware H2C command of BA CAM V1 3b96833a5727 wifi: rtw89: mac: add feature_init to initialize BA CAM V1 5d461dba16fa wifi: rtw89: add chip_ops::h2c_ba_cam() to configure BA CAM 2d623151bf26 wifi: rtw89: 8922a: update BA CAM number to 24cdd368ce1ca4 wifi: rtw89: fw: use struct to fill BA CAM H2C commands e3552b37dace wifi: rtw89: refine H2C command that pause transmitting by MAC ID c313c31ff40d wifi: rtw89: add new H2C command to pause/sleep transmitting by MAC ID 69466b979a72 wifi: rtw89: use struct to fill H2C command to download beacon frame a880b9283009 wifi: rtw89: add H2C command to download beacon frame for WiFi 7 chips bcd1ae78448e wifi: rtw89: add chip_ops::update_beacon to abstract update beacon operation
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/10 wifi: rtw89: mac: add feature_init to initialize BA CAM V1
In reply to Ping-Ke ShihAdd a call of feature_init() when bringing interface up. For now, the feature is to reset BA CAM V1 that is only used by upcoming 8922A.
--- drivers/net/wireless/realtek/rtw89/fw.c | 39 ++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 11 +++++++ drivers/net/wireless/realtek/rtw89/mac.c | 26 ++++++++++++++++ 3 files changed, 76 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +39 -0
@@ -1683,6 +1683,45 @@ int rtw89_fw_h2c_ba_cam_v1(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,return ret; } +int rtw89_fw_h2c_init_ba_cam_users (struct rtw89_dev *rtwdev,u8 users, +u8 offset,u8 mac_idx) +{ +struct rtw89_h2c_ba_cam_init *h2c; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +int ret; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for h2c ba cam init\n" ); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_ba_cam_init *)skb->data; + + h2c->w0 =le32_encode_bits (users,RTW89_H2C_BA_CAM_INIT_USERS_MASK ) | +le32_encode_bits (offset,RTW89_H2C_BA_CAM_INIT_OFFSET_MASK ) | +le32_encode_bits (mac_idx,RTW89_H2C_BA_CAM_INIT_BAND_SEL ); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC , +H2C_CL_BA_CAM , +H2C_FUNC_MAC_BA_CAM_INIT ,0 ,1 , + 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_LOG_CFG_LEN 12int rtw89_fw_h2c_fw_log (struct rtw89_dev *rtwdev,bool enable) {
drivers/net/wireless/realtek/rtw89/fw.h +11 -0
@@ -1813,6 +1813,14 @@ struct rtw89_h2c_ba_cam_v1 {#define RTW89_H2C_BA_CAM_V1_W1_MLD_EN BIT(10)#define RTW89_H2C_BA_CAM_V1_W1_ENTRY_IDX_MASK GENMASK(31, 24) +struct rtw89_h2c_ba_cam_init { +__le32 w0; +} __packed; + +#define RTW89_H2C_BA_CAM_INIT_USERS_MASK GENMASK(7, 0) +#define RTW89_H2C_BA_CAM_INIT_OFFSET_MASK GENMASK(19, 12) +#define RTW89_H2C_BA_CAM_INIT_BAND_SEL BIT(24) +static inline void SET_LPS_PARM_MACID (void *h2c,u32 val) {le32p_replace_bits ((__le32 *)h2c, val,GENMASK (7 ,0 ));
@@ -3708,6 +3716,7 @@ enum rtw89_fw_ofld_h2c_func {#define H2C_CL_BA_CAM 0xc#define H2C_FUNC_MAC_BA_CAM 0x0#define H2C_FUNC_MAC_BA_CAM_V1 0x1 +#define H2C_FUNC_MAC_BA_CAM_INIT 0x2/* CLASS 14 - MCC */ #define H2C_CL_MCC 0xe
@@ -3919,6 +3928,8 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,int rtw89_fw_h2c_ba_cam_v1 (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,bool valid,struct ieee80211_ampdu_params *params);void rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext (struct rtw89_dev *rtwdev); +int rtw89_fw_h2c_init_ba_cam_users (struct rtw89_dev *rtwdev,u8 users, +u8 offset,u8 mac_idx);int rtw89_fw_h2c_lps_parm (struct rtw89_dev *rtwdev,struct rtw89_lps_parm *lps_param);
drivers/net/wireless/realtek/rtw89/mac.c +26 -0
@@ -3676,6 +3676,28 @@ static int trx_init_ax(struct rtw89_dev *rtwdev)return 0 ; } +static int rtw89_mac_feat_init (struct rtw89_dev *rtwdev) +{ +#define BACAM_1024BMP_OCC_ENTRY 4 +#define BACAM_MAX_RU_SUPPORT_B0_STA 1 +#define BACAM_MAX_RU_SUPPORT_B1_STA 1 +const struct rtw89_chip_info *chip = rtwdev->chip; +u8 users, offset; + +if (chip->bacam_ver !=RTW89_BACAM_V1 ) +return 0 ; + + offset =0 ; + users =BACAM_MAX_RU_SUPPORT_B0_STA ; +rtw89_fw_h2c_init_ba_cam_users (rtwdev, users, offset,RTW89_MAC_0 ); + + offset += users *BACAM_1024BMP_OCC_ENTRY ; + users =BACAM_MAX_RU_SUPPORT_B1_STA ; +rtw89_fw_h2c_init_ba_cam_users (rtwdev, users, offset,RTW89_MAC_1 ); + +return 0 ; +} +static void rtw89_disable_fw_watchdog (struct rtw89_dev *rtwdev) {enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;
@@ -3910,6 +3932,10 @@ int rtw89_mac_init(struct rtw89_dev *rtwdev)if (ret) goto fail; + ret =rtw89_mac_feat_init (rtwdev); +if (ret) + goto fail; +if (rtwdev->hci.ops->mac_post_init) { ret = rtwdev->hci.ops->mac_post_init (rtwdev);if (ret)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/10 wifi: rtw89: add chip_ops::h2c_ba_cam() to configure BA CAM
In reply to Ping-Ke ShihSince chips could use different version of BA CAM H2C command, add a chip_ops to abstract the operation.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 ++ drivers/net/wireless/realtek/rtw89/fw.c | 2 ++ drivers/net/wireless/realtek/rtw89/fw.h | 9 +++++++++ drivers/net/wireless/realtek/rtw89/mac80211.c | 4 ++-- 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/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 9 files changed, 20 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -3196,6 +3196,8 @@ struct rtw89_chip_ops {int (*h2c_dctl_sec_cam)(struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,struct rtw89_sta *rtwsta); +int (*h2c_ba_cam)(struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta, +bool valid,struct ieee80211_ampdu_params *params);void (*btc_set_rfe)(struct rtw89_dev *rtwdev);void (*btc_init_cfg)(struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/fw.c +2 -0
@@ -1556,6 +1556,7 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,return ret; } +EXPORT_SYMBOL (rtw89_fw_h2c_ba_cam);static int rtw89_fw_h2c_init_ba_cam_v0_ext (struct rtw89_dev *rtwdev,u8 entry_idx,u8 uid)
@@ -1682,6 +1683,7 @@ int rtw89_fw_h2c_ba_cam_v1(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,return ret; } +EXPORT_SYMBOL (rtw89_fw_h2c_ba_cam_v1);int rtw89_fw_h2c_init_ba_cam_users (struct rtw89_dev *rtwdev,u8 users,u8 offset,u8 mac_idx)
drivers/net/wireless/realtek/rtw89/fw.h +9 -0
@@ -3996,6 +3996,15 @@ static inline void rtw89_fw_h2c_init_ba_cam(struct rtw89_dev *rtwdev)rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext (rtwdev); } +static inline +int rtw89_chip_h2c_ba_cam (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta, +bool valid,struct ieee80211_ampdu_params *params) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +return chip->ops->h2c_ba_cam (rtwdev, rtwsta, valid, params); +} +/* must consider compatibility; don't insert new in the mid */ struct rtw89_fw_txpwr_byrate_entry {u8 band;
drivers/net/wireless/realtek/rtw89/mac80211.c +2 -2
@@ -673,12 +673,12 @@ static int rtw89_ops_ampdu_action(struct ieee80211_hw *hw,break ;case IEEE80211_AMPDU_RX_START :mutex_lock (&rtwdev->mutex); -rtw89_fw_h2c_ba_cam (rtwdev, rtwsta, true, params); +rtw89_chip_h2c_ba_cam (rtwdev, rtwsta, true, params);mutex_unlock (&rtwdev->mutex);break ;case IEEE80211_AMPDU_RX_STOP :mutex_lock (&rtwdev->mutex); -rtw89_fw_h2c_ba_cam (rtwdev, rtwsta, false, params); +rtw89_chip_h2c_ba_cam (rtwdev, rtwsta, false, params);mutex_unlock (&rtwdev->mutex);break ;default :
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2334,6 +2334,7 @@ static const struct rtw89_chip_ops rtw8851b_chip_ops = { .stop_sch_tx = rtw89_mac_stop_sch_tx, .resume_sch_tx = rtw89_mac_resume_sch_tx, .h2c_dctl_sec_cam = NULL, + .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8851b_btc_set_rfe, .btc_init_cfg = rtw8851b_btc_init_cfg,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2078,6 +2078,7 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { .stop_sch_tx = rtw89_mac_stop_sch_tx, .resume_sch_tx = rtw89_mac_resume_sch_tx, .h2c_dctl_sec_cam = NULL, + .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8852a_btc_set_rfe, .btc_init_cfg = rtw8852a_btc_init_cfg,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -2503,6 +2503,7 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = { .stop_sch_tx = rtw89_mac_stop_sch_tx, .resume_sch_tx = rtw89_mac_resume_sch_tx, .h2c_dctl_sec_cam = NULL, + .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8852b_btc_set_rfe, .btc_init_cfg = rtw8852b_btc_init_cfg,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2848,6 +2848,7 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .stop_sch_tx = rtw89_mac_stop_sch_tx_v1, .resume_sch_tx = rtw89_mac_resume_sch_tx_v1, .h2c_dctl_sec_cam = rtw89_fw_h2c_dctl_sec_cam_v1, + .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8852c_btc_set_rfe, .btc_init_cfg = rtw8852c_btc_init_cfg,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -614,6 +614,7 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .read_phycap = rtw8922a_read_phycap, .pwr_on_func = rtw8922a_pwr_on_func, .pwr_off_func = rtw8922a_pwr_off_func, + .h2c_ba_cam = rtw89_fw_h2c_ba_cam_v1, };const struct rtw89_chip_info rtw8922a_chip_info = {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/10 wifi: rtw89: 8922a: update BA CAM number to 24
In reply to Ping-Ke ShihThe total BA CAM number of 8922a is 32 instead of 16, and initial 8 entries are dynamic, so update the entry number to 24.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -2875,7 +2875,7 @@ struct rtw89_ba_cam_entry {#define RTW89_MAX_ADDR_CAM_NUM 128#define RTW89_MAX_BSSID_CAM_NUM 20#define RTW89_MAX_SEC_CAM_NUM 128 -#define RTW89_MAX_BA_CAM_NUM 8 +#define RTW89_MAX_BA_CAM_NUM 24#define RTW89_SEC_CAM_IN_ADDR_CAM 7struct rtw89_addr_cam_entry {
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -1
@@ -666,7 +666,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .acam_num = 128, .bcam_num = 20, .scam_num = 32, - .bacam_num = 8, + .bacam_num = 24, .bacam_dynamic_num = 8, .bacam_ver = RTW89_BACAM_V1, .ppdu_max_usr = 16,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/10 wifi: rtw89: fw: use struct to fill BA CAM H2C commands
In reply to Ping-Ke ShihThe WiFi 6 chips use these commands to create BA CAM entry when RX BA session is established, this BA CAM can record whether packets are received or not, then reply BA for current status. This patch doesn't change logic.
--- drivers/net/wireless/realtek/rtw89/fw.c | 52 ++++++++++--------- drivers/net/wireless/realtek/rtw89/fw.h | 68 ++++++------------------- 2 files changed, 44 insertions(+), 76 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +29 -23
@@ -1485,13 +1485,14 @@ int rtw89_fw_h2c_dctl_sec_cam_v1(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_fw_h2c_dctl_sec_cam_v1); -#define H2C_BA_CAM_LEN 8int rtw89_fw_h2c_ba_cam (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,bool valid,struct ieee80211_ampdu_params *params) {const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_vif *rtwvif = rtwsta->rtwvif; +struct rtw89_h2c_ba_cam *h2c;u8 macid = rtwsta->mac_id; +u32 len =sizeof (*h2c);struct sk_buff *skb;u8 entry_idx;int ret;
@@ -1509,32 +1510,34 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,return 0 ; } - skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_BA_CAM_LEN ); + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for h2c ba cam\n" );return -ENOMEM ; } -skb_put (skb,H2C_BA_CAM_LEN ); -SET_BA_CAM_MACID (skb->data, macid); +skb_put (skb, len); + h2c = (struct rtw89_h2c_ba_cam *)skb->data; + + h2c->w0 =le32_encode_bits (macid,RTW89_H2C_BA_CAM_W0_MACID );if (chip->bacam_ver ==RTW89_BACAM_V0_EXT ) -SET_BA_CAM_ENTRY_IDX_V1 (skb->data, entry_idx); + h2c->w1 |=le32_encode_bits (entry_idx,RTW89_H2C_BA_CAM_W1_ENTRY_IDX_V1 );else -SET_BA_CAM_ENTRY_IDX (skb->data, entry_idx); + h2c->w0 |=le32_encode_bits (entry_idx,RTW89_H2C_BA_CAM_W0_ENTRY_IDX );if (!valid) goto end; -SET_BA_CAM_VALID (skb->data, valid); -SET_BA_CAM_TID (skb->data, params->tid); + h2c->w0 |=le32_encode_bits (valid,RTW89_H2C_BA_CAM_W0_VALID ) | +le32_encode_bits (params->tid,RTW89_H2C_BA_CAM_W0_TID );if (params->buf_size >64 ) -SET_BA_CAM_BMAP_SIZE (skb->data,4 ); + h2c->w0 |=le32_encode_bits (4 ,RTW89_H2C_BA_CAM_W0_BMAP_SIZE );else -SET_BA_CAM_BMAP_SIZE (skb->data,0 ); + h2c->w0 |=le32_encode_bits (0 ,RTW89_H2C_BA_CAM_W0_BMAP_SIZE );/* If init req is set, hw will set the ssn */ -SET_BA_CAM_INIT_REQ (skb->data,1 ); -SET_BA_CAM_SSN (skb->data, params->ssn); + h2c->w0 |=le32_encode_bits (1 ,RTW89_H2C_BA_CAM_W0_INIT_REQ ) | +le32_encode_bits (params->ssn,RTW89_H2C_BA_CAM_W0_SSN );if (chip->bacam_ver ==RTW89_BACAM_V0_EXT ) { -SET_BA_CAM_STD_EN (skb->data,1 ); -SET_BA_CAM_BAND (skb->data, rtwvif->mac_idx); + h2c->w1 |=le32_encode_bits (1 ,RTW89_H2C_BA_CAM_W1_STD_EN ) | +le32_encode_bits (rtwvif->mac_idx,RTW89_H2C_BA_CAM_W1_BAND ); } end:
@@ -1542,7 +1545,7 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,H2C_CAT_MAC ,H2C_CL_BA_CAM ,H2C_FUNC_MAC_BA_CAM ,0 ,1 , - H2C_BA_CAM_LEN); + len); ret =rtw89_h2c_tx (rtwdev, skb, false);if (ret) {
@@ -1561,27 +1564,30 @@ EXPORT_SYMBOL(rtw89_fw_h2c_ba_cam);static int rtw89_fw_h2c_init_ba_cam_v0_ext (struct rtw89_dev *rtwdev,u8 entry_idx,u8 uid) { +struct rtw89_h2c_ba_cam *h2c; +u32 len =sizeof (*h2c);struct sk_buff *skb;int ret; - skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_BA_CAM_LEN ); + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for dynamic h2c ba cam\n" );return -ENOMEM ; } -skb_put (skb,H2C_BA_CAM_LEN ); +skb_put (skb, len); + h2c = (struct rtw89_h2c_ba_cam *)skb->data; -SET_BA_CAM_VALID (skb->data,1 ); -SET_BA_CAM_ENTRY_IDX_V1 (skb->data, entry_idx); -SET_BA_CAM_UID (skb->data, uid); -SET_BA_CAM_BAND (skb->data,0 ); -SET_BA_CAM_STD_EN (skb->data,0 ); + h2c->w0 =le32_encode_bits (1 ,RTW89_H2C_BA_CAM_W0_VALID ); + h2c->w1 =le32_encode_bits (entry_idx,RTW89_H2C_BA_CAM_W1_ENTRY_IDX_V1 ) | +le32_encode_bits (uid,RTW89_H2C_BA_CAM_W1_UID ) | +le32_encode_bits (0 ,RTW89_H2C_BA_CAM_W1_BAND ) | +le32_encode_bits (0 ,RTW89_H2C_BA_CAM_W1_STD_EN );rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C ,H2C_CAT_MAC ,H2C_CL_BA_CAM ,H2C_FUNC_MAC_BA_CAM ,0 ,1 , -H2C_BA_CAM_LEN ); + len); ret =rtw89_h2c_tx (rtwdev, skb, false);if (ret) {
drivers/net/wireless/realtek/rtw89/fw.h +15 -53
75 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/10 wifi: rtw89: refine H2C command that pause transmitting by MAC ID
In reply to Ping-Ke ShihTo reuse this function to support extended H2C command that is used by newer chip, change to use a pointer to fill pause ID and mask.
--- drivers/net/wireless/realtek/rtw89/fw.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +10 -7
@@ -2489,20 +2489,23 @@ int rtw89_fw_h2c_notify_dbcc(struct rtw89_dev *rtwdev, bool en)int rtw89_fw_h2c_macid_pause (struct rtw89_dev *rtwdev,u8 sh,u8 grp,bool pause) { -struct rtw89_fw_macid_pause_grp h2c = {{0 }}; -u8 len =sizeof (struct rtw89_fw_macid_pause_grp ); +struct rtw89_fw_macid_pause_grp *h2c; +__le32 set =cpu_to_le32 (BIT (sh)); +u8 len =sizeof (*h2c);struct sk_buff *skb;int ret; - skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_JOIN_INFO_LEN ); + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) { -rtw89_err (rtwdev,"failed to alloc skb for h2c join\n" ); +rtw89_err (rtwdev,"failed to alloc skb for h2c macid pause\n" );return -ENOMEM ; } - h2c.mask_grp[grp] =cpu_to_le32 (BIT (sh)); +skb_put (skb, len); + h2c = (struct rtw89_fw_macid_pause_grp *)skb->data; + + h2c->mask_grp[grp] = set;if (pause) - h2c.pause_grp[grp] =cpu_to_le32 (BIT (sh)); -skb_put_data (skb, &h2c, len); + h2c->pause_grp[grp] = set; rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C, H2C_CAT_MAC, H2C_CL_MAC_FW_OFLD,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/10 wifi: rtw89: add new H2C command to pause/sleep transmitting by MAC ID
In reply to Ping-Ke ShihNew H2C command is introduced to pause/sleep transmitting. That extends more bits to support more MAC ID, and currently we still configure 256 MAC ID at most.
This new command is always used by coming WiFi 7 chips, and existing chips can use old or new command because firmware still preserves the old one. Add a firmware feature flag to determine which command is adopted according to firmware version.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 35 +++++++++++++++++++---- drivers/net/wireless/realtek/rtw89/fw.h | 10 +++++++ 3 files changed, 40 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -3899,6 +3899,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_NO_DEEP_PS ,RTW89_FW_FEATURE_NO_LPS_PG ,RTW89_FW_FEATURE_BEACON_FILTER , + RTW89_FW_FEATURE_MACID_PAUSE_SLEEP, }; struct rtw89_fw_suit {
drivers/net/wireless/realtek/rtw89/fw.c +29 -6
@@ -458,6 +458,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,40 ,0 ,CRASH_TRIGGER ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,56 ,10 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,30 ,0 ,CRASH_TRIGGER ), + __CFG_FW_FEAT(RTL8922A, ge, 0, 34, 11, 0, MACID_PAUSE_SLEEP), }; static void rtw89_fw_iterate_feature_cfg(struct rtw89_fw_info *fw,
@@ -2489,27 +2490,49 @@ int rtw89_fw_h2c_notify_dbcc(struct rtw89_dev *rtwdev, bool en)int rtw89_fw_h2c_macid_pause (struct rtw89_dev *rtwdev,u8 sh,u8 grp,bool pause) { +struct rtw89_fw_macid_pause_sleep_grp *h2c_new;struct rtw89_fw_macid_pause_grp *h2c;__le32 set =cpu_to_le32 (BIT (sh)); -u8 len =sizeof (*h2c); +u8 h2c_macid_pause_id;struct sk_buff *skb; +u32 len;int ret; +if (RTW89_CHK_FW_FEATURE (MACID_PAUSE_SLEEP , &rtwdev->fw)) { + h2c_macid_pause_id =H2C_FUNC_MAC_MACID_PAUSE_SLEEP ; + len =sizeof (*h2c_new); + }else { + h2c_macid_pause_id =H2C_FUNC_MAC_MACID_PAUSE ; + len =sizeof (*h2c); + } + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for h2c macid pause\n" );return -ENOMEM ; }skb_put (skb, len); - h2c = (struct rtw89_fw_macid_pause_grp *)skb->data; - h2c->mask_grp[grp] = set; -if (pause) - h2c->pause_grp[grp] = set; +if (h2c_macid_pause_id ==H2C_FUNC_MAC_MACID_PAUSE_SLEEP ) { + h2c_new = (struct rtw89_fw_macid_pause_sleep_grp *)skb->data; + + h2c_new->n[0 ].pause_mask_grp[grp] = set; + h2c_new->n[0 ].sleep_mask_grp[grp] = set; +if (pause) { + h2c_new->n[0 ].pause_grp[grp] = set; + h2c_new->n[0 ].sleep_grp[grp] = set; + } + }else { + h2c = (struct rtw89_fw_macid_pause_grp *)skb->data; + + h2c->mask_grp[grp] = set; +if (pause) + h2c->pause_grp[grp] = set; + }rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C ,H2C_CAT_MAC ,H2C_CL_MAC_FW_OFLD , -H2C_FUNC_MAC_MACID_PAUSE ,1 ,0 , + h2c_macid_pause_id,1 ,0 , len); ret =rtw89_h2c_tx (rtwdev, skb, false);
drivers/net/wireless/realtek/rtw89/fw.h +10 -0
@@ -231,6 +231,15 @@ struct rtw89_fw_macid_pause_grp {__le32 mask_grp[4 ]; } __packed; +struct rtw89_fw_macid_pause_sleep_grp { +struct { +__le32 pause_grp[4 ]; +__le32 pause_mask_grp[4 ]; +__le32 sleep_grp[4 ]; +__le32 sleep_mask_grp[4 ]; + } __packed n[4]; +} __packed; +#define RTW89_H2C_MAX_SIZE 2048#define RTW89_CHANNEL_TIME 45#define RTW89_CHANNEL_TIME_6G 20
@@ -3659,6 +3668,7 @@ enum rtw89_fw_ofld_h2c_func {H2C_FUNC_CFG_BCNFLTR =0x1e ,H2C_FUNC_OFLD_RSSI =0x1f ,H2C_FUNC_OFLD_TP =0x20 , +H2C_FUNC_MAC_MACID_PAUSE_SLEEP =0x28 , NUM_OF_RTW89_FW_OFLD_H2C_FUNC, };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/10 wifi: rtw89: use struct to fill H2C command to download beacon frame
In reply to Ping-Ke ShihDownload beacon frame via H2C command for AP mode, and then firmware can issues beacon periodically. Originally TIM offset minus fixed 24 bytes of frame header implicitly in macro, and this patch explicitly uses ieee80211_hdrlen() to get header length, but expected to change nothing at all.
--- drivers/net/wireless/realtek/rtw89/fw.c | 36 ++++--- drivers/net/wireless/realtek/rtw89/fw.h | 123 +++++------------------- 2 files changed, 46 insertions(+), 113 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +21 -15
@@ -2277,18 +2277,20 @@ int rtw89_fw_h2c_txpath_cmac_tbl(struct rtw89_dev *rtwdev,return ret; } -#define H2C_BCN_BASE_LEN 12int rtw89_fw_h2c_update_beacon (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) { -struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif);const struct rtw89_chan *chan =rtw89_chan_get (rtwdev, rtwvif->sub_entity_idx); -struct sk_buff *skb; +struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif); +struct rtw89_h2c_bcn_upd *h2c;struct sk_buff *skb_beacon; -u16 tim_offset; +struct ieee80211_hdr *hdr; +u32 len =sizeof (*h2c); +struct sk_buff *skb;int bcn_total_len;u16 beacon_rate; +u16 tim_offset;void *noa_data;u8 noa_len;int ret;
@@ -2314,23 +2316,27 @@ int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,skb_put_data (skb_beacon, noa_data, noa_len); } - bcn_total_len =H2C_BCN_BASE_LEN + skb_beacon->len; + hdr = (struct ieee80211_hdr *)skb_beacon; + tim_offset -=ieee80211_hdrlen (hdr->frame_control); + + bcn_total_len = len + skb_beacon->len; skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, bcn_total_len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for fw dl\n" );dev_kfree_skb_any (skb_beacon);return -ENOMEM ; } -skb_put (skb,H2C_BCN_BASE_LEN ); - -SET_BCN_UPD_PORT (skb->data, rtwvif->port); -SET_BCN_UPD_MBSSID (skb->data,0 ); -SET_BCN_UPD_BAND (skb->data, rtwvif->mac_idx); -SET_BCN_UPD_GRP_IE_OFST (skb->data, tim_offset); -SET_BCN_UPD_MACID (skb->data, rtwvif->mac_id); -SET_BCN_UPD_SSN_SEL (skb->data,RTW89_MGMT_HW_SSN_SEL ); -SET_BCN_UPD_SSN_MODE (skb->data,RTW89_MGMT_HW_SEQ_MODE ); -SET_BCN_UPD_RATE (skb->data, beacon_rate); +skb_put (skb, len); + h2c = (struct rtw89_h2c_bcn_upd *)skb->data; + + h2c->w0 =le32_encode_bits (rtwvif->port,RTW89_H2C_BCN_UPD_W0_PORT ) | +le32_encode_bits (0 ,RTW89_H2C_BCN_UPD_W0_MBSSID ) | +le32_encode_bits (rtwvif->mac_idx,RTW89_H2C_BCN_UPD_W0_BAND ) | +le32_encode_bits (tim_offset |BIT (7 ),RTW89_H2C_BCN_UPD_W0_GRP_IE_OFST ); + h2c->w1 =le32_encode_bits (rtwvif->mac_id,RTW89_H2C_BCN_UPD_W1_MACID ) | +le32_encode_bits (RTW89_MGMT_HW_SSN_SEL ,RTW89_H2C_BCN_UPD_W1_SSN_SEL ) | +le32_encode_bits (RTW89_MGMT_HW_SEQ_MODE ,RTW89_H2C_BCN_UPD_W1_SSN_MODE ) | +le32_encode_bits (beacon_rate,RTW89_H2C_BCN_UPD_W1_RATE );skb_put_data (skb, skb_beacon->data, skb_beacon->len);dev_kfree_skb_any (skb_beacon);
drivers/net/wireless/realtek/rtw89/fw.h +25 -98
130 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/10 wifi: rtw89: add H2C command to download beacon frame for WiFi 7 chips
In reply to Ping-Ke ShihThe firmware of coming WiFi 7 chips can support more AP functions, like virtual AP, so extend format of download beacon frame to configure them. Currently rtw89 only enables AP mode as old chips, so leave new fields zeros.
--- drivers/net/wireless/realtek/rtw89/fw.c | 82 +++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 51 +++++++++++++++ 2 files changed, 133 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +82 -0
@@ -2356,6 +2356,88 @@ int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,return 0 ; } +int rtw89_fw_h2c_update_beacon_be (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif) +{ +const struct rtw89_chan *chan =rtw89_chan_get (rtwdev,RTW89_SUB_ENTITY_0 ); +struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif); +struct rtw89_h2c_bcn_upd_be *h2c; +struct sk_buff *skb_beacon; +struct ieee80211_hdr *hdr; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +int bcn_total_len; +u16 beacon_rate; +u16 tim_offset; +void *noa_data; +u8 noa_len; +int ret; + +if (vif->p2p) + beacon_rate =RTW89_HW_RATE_OFDM6 ; +else if (chan->band_type ==RTW89_BAND_2G ) + beacon_rate =RTW89_HW_RATE_CCK1 ; +else + beacon_rate =RTW89_HW_RATE_OFDM6 ; + + skb_beacon =ieee80211_beacon_get_tim (rtwdev->hw, vif, &tim_offset, +NULL ,0 ); +if (!skb_beacon) { +rtw89_err (rtwdev,"failed to get beacon skb\n" ); +return -ENOMEM ; + } + + noa_len =rtw89_p2p_noa_fetch (rtwvif, &noa_data); +if (noa_len && + (noa_len <=skb_tailroom (skb_beacon) || +pskb_expand_head (skb_beacon,0 , noa_len,GFP_KERNEL ) ==0 )) { +skb_put_data (skb_beacon, noa_data, noa_len); + } + + hdr = (struct ieee80211_hdr *)skb_beacon; + tim_offset -=ieee80211_hdrlen (hdr->frame_control); + + bcn_total_len = len + skb_beacon->len; + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, bcn_total_len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for fw dl\n" ); +dev_kfree_skb_any (skb_beacon); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_bcn_upd_be *)skb->data; + + h2c->w0 =le32_encode_bits (rtwvif->port,RTW89_H2C_BCN_UPD_BE_W0_PORT ) | +le32_encode_bits (0 ,RTW89_H2C_BCN_UPD_BE_W0_MBSSID ) | +le32_encode_bits (rtwvif->mac_idx,RTW89_H2C_BCN_UPD_BE_W0_BAND ) | +le32_encode_bits (tim_offset |BIT (7 ),RTW89_H2C_BCN_UPD_BE_W0_GRP_IE_OFST ); + h2c->w1 =le32_encode_bits (rtwvif->mac_id,RTW89_H2C_BCN_UPD_BE_W1_MACID ) | +le32_encode_bits (RTW89_MGMT_HW_SSN_SEL ,RTW89_H2C_BCN_UPD_BE_W1_SSN_SEL ) | +le32_encode_bits (RTW89_MGMT_HW_SEQ_MODE ,RTW89_H2C_BCN_UPD_BE_W1_SSN_MODE ) | +le32_encode_bits (beacon_rate,RTW89_H2C_BCN_UPD_BE_W1_RATE ); + +skb_put_data (skb, skb_beacon->data, skb_beacon->len); +dev_kfree_skb_any (skb_beacon); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC ,H2C_CL_MAC_FR_EXCHG , +H2C_FUNC_MAC_BCN_UPD_BE ,0 ,1 , + bcn_total_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_ROLE_MAINTAIN_LEN 4 int rtw89_fw_h2c_role_maintain(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif,
drivers/net/wireless/realtek/rtw89/fw.h +51 -0
69 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/10 wifi: rtw89: add chip_ops::update_beacon to abstract update beacon operation
In reply to Ping-Ke ShihSince coming WiFi 7 and existing chips use different update_beacon() format, add to abstract selection of H2C command.
--- drivers/net/wireless/realtek/rtw89/chan.c | 2 +- drivers/net/wireless/realtek/rtw89/core.c | 2 +- drivers/net/wireless/realtek/rtw89/core.h | 2 ++ drivers/net/wireless/realtek/rtw89/fw.c | 2 ++ drivers/net/wireless/realtek/rtw89/fw.h | 8 ++++++++ drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- 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/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 11 files changed, 20 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +1 -1
@@ -1494,7 +1494,7 @@ static void rtw89_mcc_handle_beacon_noa(struct rtw89_dev *rtwdev, bool enable)if (!rtwvif_go->chanctx_assigned)return ; -rtw89_fw_h2c_update_beacon (rtwdev, rtwvif_go); +rtw89_chip_h2c_update_beacon (rtwdev, rtwvif_go); }static void rtw89_mcc_start_beacon_noa (struct rtw89_dev *rtwdev)
drivers/net/wireless/realtek/rtw89/core.c +1 -1
@@ -3879,7 +3879,7 @@ void rtw89_core_update_beacon_work(struct work_struct *work) rtwdev = rtwvif->rtwdev;mutex_lock (&rtwdev->mutex); -rtw89_fw_h2c_update_beacon (rtwdev, rtwvif); +rtw89_chip_h2c_update_beacon (rtwdev, rtwvif);mutex_unlock (&rtwdev->mutex); }
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -3196,6 +3196,8 @@ struct rtw89_chip_ops {int (*h2c_dctl_sec_cam)(struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,struct rtw89_sta *rtwsta); +int (*h2c_update_beacon)(struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif);int (*h2c_ba_cam)(struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,bool valid,struct ieee80211_ampdu_params *params);
drivers/net/wireless/realtek/rtw89/fw.c +2 -0
@@ -2355,6 +2355,7 @@ int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,return 0 ; } +EXPORT_SYMBOL (rtw89_fw_h2c_update_beacon);int rtw89_fw_h2c_update_beacon_be (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif)
@@ -2437,6 +2438,7 @@ int rtw89_fw_h2c_update_beacon_be(struct rtw89_dev *rtwdev,return ret; } +EXPORT_SYMBOL (rtw89_fw_h2c_update_beacon_be);#define H2C_ROLE_MAINTAIN_LEN 4 int rtw89_fw_h2c_role_maintain(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/fw.h +8 -0
@@ -3946,6 +3946,14 @@ static inline void rtw89_fw_h2c_init_ba_cam(struct rtw89_dev *rtwdev)rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext (rtwdev); } +static inline int rtw89_chip_h2c_update_beacon (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +return chip->ops->h2c_update_beacon (rtwdev, rtwvif); +} +static inline int rtw89_chip_h2c_ba_cam (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,bool valid,struct ieee80211_ampdu_params *params)
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -1
@@ -452,7 +452,7 @@ static void rtw89_ops_bss_info_changed(struct ieee80211_hw *hw, }if (changed &BSS_CHANGED_BEACON ) -rtw89_fw_h2c_update_beacon (rtwdev, rtwvif); +rtw89_chip_h2c_update_beacon (rtwdev, rtwvif);if (changed &BSS_CHANGED_ERP_SLOT )rtw89_conf_tx (rtwdev, rtwvif);
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2334,6 +2334,7 @@ static const struct rtw89_chip_ops rtw8851b_chip_ops = { .stop_sch_tx = rtw89_mac_stop_sch_tx, .resume_sch_tx = rtw89_mac_resume_sch_tx, .h2c_dctl_sec_cam = NULL, + .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8851b_btc_set_rfe,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2078,6 +2078,7 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { .stop_sch_tx = rtw89_mac_stop_sch_tx, .resume_sch_tx = rtw89_mac_resume_sch_tx, .h2c_dctl_sec_cam = NULL, + .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8852a_btc_set_rfe,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -2503,6 +2503,7 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = { .stop_sch_tx = rtw89_mac_stop_sch_tx, .resume_sch_tx = rtw89_mac_resume_sch_tx, .h2c_dctl_sec_cam = NULL, + .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8852b_btc_set_rfe,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2848,6 +2848,7 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .stop_sch_tx = rtw89_mac_stop_sch_tx_v1, .resume_sch_tx = rtw89_mac_resume_sch_tx_v1, .h2c_dctl_sec_cam = rtw89_fw_h2c_dctl_sec_cam_v1, + .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8852c_btc_set_rfe,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -614,6 +614,7 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .read_phycap = rtw8922a_read_phycap, .pwr_on_func = rtw8922a_pwr_on_func, .pwr_off_func = rtw8922a_pwr_off_func, + .h2c_update_beacon = rtw89_fw_h2c_update_beacon_be, .h2c_ba_cam = rtw89_fw_h2c_ba_cam_v1, };
Signature · 1 line
2.25.1