wifi: rtw89: correct BA CAM allocation
Ping-Ke Shih
maintainerv2 cover wifi: rtw89: correct BA CAM allocation
BA CAM is a global hardware resource, but we incorrectly see it as a per-station resource. In station mode, it works well, but it will be wrong if AP mode or multiple vif(s) in the future.
Therefore, move bitmap of BA_CAM to struct rtw89_dev::rtw89_cam_info.
v2: fix compiler warning reported by kernel test robot
Ping-Ke Shih (3):
wifi: rtw89: 8852c: declare correct BA CAM number
wifi: rtw89: 8852c: initialize and correct BA CAM content
wifi: rtw89: correct BA CAM allocation
drivers/net/wireless/realtek/rtw89/core.c | 60 ++++++++++++----- drivers/net/wireless/realtek/rtw89/core.h | 19 ++++-- drivers/net/wireless/realtek/rtw89/debug.c | 27 ++++++++ drivers/net/wireless/realtek/rtw89/fw.c | 66 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 9 +++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 3 + drivers/net/wireless/realtek/rtw89/ser.c | 8 ++- 8 files changed, 166 insertions(+), 29 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/3 wifi: rtw89: 8852c: declare correct BA CAM number
8852A has 2 BA CAM entries, but 8852C has 8 entries. Add a field to discriminate their differences.
--- drivers/net/wireless/realtek/rtw89/core.c | 14 +++++++++----- drivers/net/wireless/realtek/rtw89/core.h | 14 ++++++++------ drivers/net/wireless/realtek/rtw89/fw.c | 4 ++-- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + 5 files changed, 21 insertions(+), 13 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +9 -5
@@ -2266,13 +2266,15 @@ void rtw89_core_release_all_bits_map(unsigned long *addr, unsigned int nbits)bitmap_zero (addr, nbits); } -int rtw89_core_acquire_sta_ba_entry (struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx) +int rtw89_core_acquire_sta_ba_entry (struct rtw89_dev *rtwdev, +struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx) { +const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_ba_cam_entry *entry;u8 idx; - idx =rtw89_core_acquire_bit_map (rtwsta->ba_cam_map,RTW89_BA_CAM_NUM ); -if (idx ==RTW89_BA_CAM_NUM ) { + idx =rtw89_core_acquire_bit_map (rtwsta->ba_cam_map, chip->bacam_num); +if (idx == chip->bacam_num) {/* allocate a static BA CAM to tid=0, so replace the existing * one if BA CAM is full. Hardware will process the original tid * automatically.
@@ -2290,12 +2292,14 @@ int rtw89_core_acquire_sta_ba_entry(struct rtw89_sta *rtwsta, u8 tid, u8 *cam_idreturn 0 ; } -int rtw89_core_release_sta_ba_entry (struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx) +int rtw89_core_release_sta_ba_entry (struct rtw89_dev *rtwdev, +struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx) { +const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_ba_cam_entry *entry;int i; -for (i =0 ; i <RTW89_BA_CAM_NUM ; i++) { +for (i =0 ; i < chip->bacam_num; i++) {if (!test_bit (i, rtwsta->ba_cam_map))continue ;
drivers/net/wireless/realtek/rtw89/core.h +8 -6
@@ -1915,8 +1915,6 @@ struct rtw89_ra_report {DECLARE_EWMA (rssi,10 ,16 ); -#define RTW89_BA_CAM_NUM 2 -struct rtw89_ba_cam_entry {u8 tid; };
@@ -1924,6 +1922,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_SEC_CAM_IN_ADDR_CAM 7struct rtw89_addr_cam_entry {
@@ -1988,8 +1987,8 @@ struct rtw89_sta {bool cctl_tx_retry_limit; u32 data_tx_cnt_lmt:6; -DECLARE_BITMAP (ba_cam_map,RTW89_BA_CAM_NUM ); -struct rtw89_ba_cam_entry ba_cam_entry[RTW89_BA_CAM_NUM ]; +DECLARE_BITMAP (ba_cam_map,RTW89_MAX_BA_CAM_NUM ); +struct rtw89_ba_cam_entry ba_cam_entry[RTW89_MAX_BA_CAM_NUM ]; };struct rtw89_efuse {
@@ -2393,6 +2392,7 @@ struct rtw89_chip_info {u8 acam_num;u8 bcam_num;u8 scam_num; +u8 bacam_num;u8 sec_ctrl_efuse_size;u32 physical_efuse_size;
@@ -3910,8 +3910,10 @@ void rtw89_set_channel(struct rtw89_dev *rtwdev);u8 rtw89_core_acquire_bit_map (unsigned long *addr,unsigned long size);void rtw89_core_release_bit_map (unsigned long *addr,u8 bit);void rtw89_core_release_all_bits_map (unsigned long *addr,unsigned int nbits); -int rtw89_core_acquire_sta_ba_entry (struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx); -int rtw89_core_release_sta_ba_entry (struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx); +int rtw89_core_acquire_sta_ba_entry (struct rtw89_dev *rtwdev, +struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx); +int rtw89_core_release_sta_ba_entry (struct rtw89_dev *rtwdev, +struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx);void rtw89_vif_type_mapping (struct ieee80211_vif *vif,bool assoc);int rtw89_chip_info_setup (struct rtw89_dev *rtwdev);bool rtw89_ra_report_to_bitrate (struct rtw89_dev *rtwdev,u8 rpt_rate,u16 *bitrate);
drivers/net/wireless/realtek/rtw89/fw.c +2 -2
@@ -644,8 +644,8 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,int ret; ret = valid ? -rtw89_core_acquire_sta_ba_entry (rtwsta, params->tid, &entry_idx) : -rtw89_core_release_sta_ba_entry (rtwsta, params->tid, &entry_idx); +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.
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2125,6 +2125,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .acam_num = 128, .bcam_num = 10, .scam_num = 128, + .bacam_num = 2, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216, .logical_efuse_size = 1536,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2972,6 +2972,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .acam_num = 128, .bcam_num = 20, .scam_num = 128, + .bacam_num = 8, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216, .logical_efuse_size = 2048,
Signature · 1 line
2.25.1
Re: [PATCH v2 1/3] wifi: rtw89: 8852c: declare correct BA CAM number
Quoted 4 lines · Ping-Ke Shih
8852A has 2 BA CAM entries, but 8852C has 8 entries. Add a field to discriminate their differences.
Signed-off-by Ping-Ke Shih <[email protected]>
3 patches applied to wireless-next.git, thanks.
2def73563318 wifi: rtw89: 8852c: declare correct BA CAM number 8b1b4730b025 wifi: rtw89: 8852c: initialize and correct BA CAM content 08aa80777be9 wifi: rtw89: correct BA CAM allocation
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 v2 2/3 wifi: rtw89: 8852c: initialize and correct BA CAM content
In reply to Ping-Ke ShihThe bacam_v1 must do additional initialization, and H2C content of BA CAM is also different. So, correct them accordingly.
--- drivers/net/wireless/realtek/rtw89/core.c | 1 + drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/fw.c | 62 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 9 +++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 + 6 files changed, 77 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +1 -0
@@ -2898,6 +2898,7 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)rtw89_btc_ntfy_radio_state (rtwdev,BTC_RFCTRL_WL_ON );rtw89_fw_h2c_fw_log (rtwdev, rtwdev->fw.fw_log_enable); +rtw89_fw_h2c_init_ba_cam (rtwdev);return 0 ; }
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -2393,6 +2393,8 @@ struct rtw89_chip_info {u8 bcam_num;u8 scam_num;u8 bacam_num; +u8 bacam_dynamic_num; +bool bacam_v1;u8 sec_ctrl_efuse_size;u32 physical_efuse_size;
drivers/net/wireless/realtek/rtw89/fw.c +61 -1
86 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +9 -0
@@ -2623,6 +2623,7 @@ void rtw89_fw_free_all_early_h2c(struct rtw89_dev *rtwdev);int rtw89_fw_h2c_general_pkt (struct rtw89_dev *rtwdev,u8 macid);int rtw89_fw_h2c_ba_cam (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,bool valid,struct ieee80211_ampdu_params *params); +void rtw89_fw_h2c_init_ba_cam_v1 (struct rtw89_dev *rtwdev);int rtw89_fw_h2c_lps_parm (struct rtw89_dev *rtwdev,struct rtw89_lps_parm *lps_param);
@@ -2643,4 +2644,12 @@ int rtw89_hw_scan_offload(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,void rtw89_hw_scan_abort (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif);int rtw89_fw_h2c_trigger_cpu_exception (struct rtw89_dev *rtwdev); +static inline void rtw89_fw_h2c_init_ba_cam (struct rtw89_dev *rtwdev) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +if (chip->bacam_v1) +rtw89_fw_h2c_init_ba_cam_v1 (rtwdev); +} +#endif
drivers/net/wireless/realtek/rtw89/rtw8852a.c +2 -0
@@ -2126,6 +2126,8 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .bcam_num = 10, .scam_num = 128, .bacam_num = 2, + .bacam_dynamic_num = 4, + .bacam_v1 = false, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216, .logical_efuse_size = 1536,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +2 -0
@@ -2973,6 +2973,8 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .bcam_num = 20, .scam_num = 128, .bacam_num = 8, + .bacam_dynamic_num = 8, + .bacam_v1 = true, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216, .logical_efuse_size = 2048,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/3 wifi: rtw89: correct BA CAM allocation
In reply to Ping-Ke ShihBA CAM entries are global resource of hardware, so move the bitmap and instances to rtw89_cam_info, and then use link list from rtw89_sta to these instances.
To check the allocation, add ba_cam to debugfs:
map:
mac_id: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
addr_cam: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
bssid_cam: 01 00 00 00 00 00 00 00
sec_cam: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ba_cam: 03 00 00 00 00 00 00 00
VIF [0] 94:08:53:8e:ef:21
bssid_cam_idx=0
addr_cam_idx=0
-> bssid_cam_idx=0
sec_cam_bitmap=00 00 00 00 00 00 00 00
STA [0] 38:78:62:8b:cb:c6
addr_cam_idx=0
-> bssid_cam_idx=0
sec_cam_bitmap=00 00 00 00 00 00 00 00
ba_cam tid[6]=0, tid[1]=1
--- drivers/net/wireless/realtek/rtw89/core.c | 51 +++++++++++++++------- drivers/net/wireless/realtek/rtw89/core.h | 7 +-- drivers/net/wireless/realtek/rtw89/debug.c | 27 ++++++++++++ drivers/net/wireless/realtek/rtw89/ser.c | 8 +++- 4 files changed, 73 insertions(+), 20 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +36 -15
@@ -2270,23 +2270,42 @@ int rtw89_core_acquire_sta_ba_entry(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta, u8 tid, u8 *cam_idx) { const struct rtw89_chip_info *chip = rtwdev->chip; -struct rtw89_ba_cam_entry *entry; +struct rtw89_cam_info *cam_info = &rtwdev->cam_info; +struct rtw89_ba_cam_entry *entry =NULL , *tmp;u8 idx; +int i; + +lockdep_assert_held (&rtwdev->mutex); - idx =rtw89_core_acquire_bit_map (rtwsta->ba_cam_map, chip->bacam_num); + idx =rtw89_core_acquire_bit_map (cam_info->ba_cam_map, chip->bacam_num);if (idx == chip->bacam_num) { -/* allocate a static BA CAM to tid=0, so replace the existing +/* allocate a static BA CAM to tid=0/5, so replace the existing * one if BA CAM is full. Hardware will process the original tid * automatically. */ -if (tid !=0 ) +if (tid !=0 && tid !=5 )return -ENOSPC ; - idx =0 ; +for_each_set_bit (i, cam_info->ba_cam_map, chip->bacam_num) { + tmp = &cam_info->ba_cam_entry[i]; +if (tmp->tid ==0 || tmp->tid ==5 ) +continue ; + + idx = i; + entry = tmp; +list_del (&entry->list); +break ; + } + +if (!entry) +return -ENOSPC ; + }else { + entry = &cam_info->ba_cam_entry[idx]; } - entry = &rtwsta->ba_cam_entry[idx]; entry->tid = tid; +list_add_tail (&entry->list, &rtwsta->ba_cam_list); + *cam_idx = idx;return 0 ;
@@ -2295,20 +2314,21 @@ int rtw89_core_acquire_sta_ba_entry(struct rtw89_dev *rtwdev,int rtw89_core_release_sta_ba_entry (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,u8 tid,u8 *cam_idx) { -const struct rtw89_chip_info *chip = rtwdev->chip; -struct rtw89_ba_cam_entry *entry; -int i; +struct rtw89_cam_info *cam_info = &rtwdev->cam_info; +struct rtw89_ba_cam_entry *entry =NULL , *tmp; +u8 idx; -for (i =0 ; i < chip->bacam_num; i++) { -if (!test_bit (i, rtwsta->ba_cam_map)) -continue ; +lockdep_assert_held (&rtwdev->mutex); - entry = &rtwsta->ba_cam_entry[i]; +list_for_each_entry_safe (entry, tmp, &rtwsta->ba_cam_list, list) {if (entry->tid != tid)continue ; -rtw89_core_release_bit_map (rtwsta->ba_cam_map, i); - *cam_idx = i; + idx = entry - cam_info->ba_cam_entry; +list_del (&entry->list); + +rtw89_core_release_bit_map (cam_info->ba_cam_map, idx); + *cam_idx = idx;return 0 ; }
@@ -2371,6 +2391,7 @@ int rtw89_core_sta_add(struct rtw89_dev *rtwdev, rtwsta->rtwvif = rtwvif; rtwsta->prev_rssi =0 ; +INIT_LIST_HEAD (&rtwsta->ba_cam_list);for (i =0 ; i <ARRAY_SIZE (sta->txq); i++)rtw89_core_txq_init (rtwdev, sta->txq[i]);
drivers/net/wireless/realtek/rtw89/core.h +4 -3
@@ -1916,6 +1916,7 @@ struct rtw89_ra_report {DECLARE_EWMA (rssi,10 ,16 );struct rtw89_ba_cam_entry { +struct list_head list;u8 tid; };
@@ -1978,6 +1979,7 @@ struct rtw89_sta {__le32 htc_template;struct rtw89_addr_cam_entry addr_cam;/* AP mode or TDLS peer only */ struct rtw89_bssid_cam_entry bssid_cam;/* TDLS peer only */ +struct list_head ba_cam_list;bool use_cfg_mask;struct cfg80211_bitrate_mask mask;
@@ -1986,9 +1988,6 @@ struct rtw89_sta { u32 ampdu_max_time:4;bool cctl_tx_retry_limit; u32 data_tx_cnt_lmt:6; - -DECLARE_BITMAP (ba_cam_map,RTW89_MAX_BA_CAM_NUM ); -struct rtw89_ba_cam_entry ba_cam_entry[RTW89_MAX_BA_CAM_NUM ]; };struct rtw89_efuse {
@@ -2560,6 +2559,8 @@ struct rtw89_cam_info {DECLARE_BITMAP (addr_cam_map,RTW89_MAX_ADDR_CAM_NUM );DECLARE_BITMAP (bssid_cam_map,RTW89_MAX_BSSID_CAM_NUM );DECLARE_BITMAP (sec_cam_map,RTW89_MAX_SEC_CAM_NUM ); +DECLARE_BITMAP (ba_cam_map,RTW89_MAX_BA_CAM_NUM ); +struct rtw89_ba_cam_entry ba_cam_entry[RTW89_MAX_BA_CAM_NUM ]; };enum rtw89_sar_sources {
drivers/net/wireless/realtek/rtw89/debug.c +27 -0
@@ -2433,6 +2433,26 @@ void rtw89_vif_ids_get_iter(void *data, u8 *mac, struct ieee80211_vif *vif)rtw89_dump_addr_cam (m, &rtwvif->addr_cam); } +static void rtw89_dump_ba_cam (struct seq_file *m,struct rtw89_sta *rtwsta) +{ +struct rtw89_vif *rtwvif = rtwsta->rtwvif; +struct rtw89_dev *rtwdev = rtwvif->rtwdev; +struct rtw89_ba_cam_entry *entry; +bool first = true; + +list_for_each_entry (entry, &rtwsta->ba_cam_list, list) { +if (first) { +seq_puts (m,"\tba_cam " ); + first = false; + }else { +seq_puts (m,", " ); + } +seq_printf (m,"tid[%u]=%d" , entry->tid, + (int )(entry - rtwdev->cam_info.ba_cam_entry)); + } +seq_puts (m,"\n" ); +} +static void rtw89_sta_ids_get_iter (void *data,struct ieee80211_sta *sta) {struct rtw89_sta *rtwsta = (struct rtw89_sta *)sta->drv_priv;
@@ -2441,6 +2461,7 @@ static void rtw89_sta_ids_get_iter(void *data, struct ieee80211_sta *sta)seq_printf (m,"STA [%d] %pM %s\n" , rtwsta->mac_id, sta->addr, sta->tdls ?"(TDLS)" :"" );rtw89_dump_addr_cam (m, &rtwsta->addr_cam); +rtw89_dump_ba_cam (m, rtwsta); }static int rtw89_debug_priv_stations_get (struct seq_file *m,void *v)
@@ -2449,6 +2470,8 @@ static int rtw89_debug_priv_stations_get(struct seq_file *m, void *v)struct rtw89_dev *rtwdev = debugfs_priv->rtwdev;struct rtw89_cam_info *cam_info = &rtwdev->cam_info; +mutex_lock (&rtwdev->mutex); +seq_puts (m,"map:\n" );seq_printf (m,"\tmac_id: %*ph\n" , (int )sizeof (rtwdev->mac_id_map), rtwdev->mac_id_map);
@@ -2458,12 +2481,16 @@ static int rtw89_debug_priv_stations_get(struct seq_file *m, void *v) cam_info->bssid_cam_map);seq_printf (m,"\tsec_cam: %*ph\n" , (int )sizeof (cam_info->sec_cam_map), cam_info->sec_cam_map); +seq_printf (m,"\tba_cam: %*ph\n" , (int )sizeof (cam_info->ba_cam_map), + cam_info->ba_cam_map);ieee80211_iterate_active_interfaces_atomic (rtwdev->hw,IEEE80211_IFACE_ITER_NORMAL , rtw89_vif_ids_get_iter, m);ieee80211_iterate_stations_atomic (rtwdev->hw, rtw89_sta_ids_get_iter, m); +mutex_unlock (&rtwdev->mutex); +return 0 ; }
drivers/net/wireless/realtek/rtw89/ser.c +6 -2
@@ -298,7 +298,7 @@ static void ser_reset_vif(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) rtwvif->trigger = false; } -static void ser_sta_deinit_addr_cam_iter (void *data,struct ieee80211_sta *sta) +static void ser_sta_deinit_cam_iter (void *data,struct ieee80211_sta *sta) {struct rtw89_vif *rtwvif = (struct rtw89_vif *)data;struct rtw89_dev *rtwdev = rtwvif->rtwdev;
@@ -308,15 +308,19 @@ static void ser_sta_deinit_addr_cam_iter(void *data, struct ieee80211_sta *sta)rtw89_cam_deinit_addr_cam (rtwdev, &rtwsta->addr_cam);if (sta->tdls)rtw89_cam_deinit_bssid_cam (rtwdev, &rtwsta->bssid_cam); + +INIT_LIST_HEAD (&rtwsta->ba_cam_list); }static void ser_deinit_cam (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) {ieee80211_iterate_stations_atomic (rtwdev->hw, - ser_sta_deinit_addr_cam_iter, + ser_sta_deinit_cam_iter, rtwvif);rtw89_cam_deinit (rtwdev, rtwvif); + +bitmap_zero (rtwdev->cam_info.ba_cam_map,RTW89_MAX_BA_CAM_NUM ); }static void ser_reset_mac_binding (struct rtw89_dev *rtwdev)
Signature · 1 line
2.25.1