wifi: rtw89: correct settings for multiple VIFs
Ping-Ke Shih
maintainercover wifi: rtw89: correct settings for multiple VIFs
Initially, this driver only considers single VIF, so something can't work well when we are going to support multiple VIFs. This patchset is to consider more about multiple VIFs, and add missing things during single VIF development.
Po-Hao Huang (4):
wifi: rtw89: add mac TSF sync function
wifi: rtw89: stop mac port function when stop_ap()
wifi: rtw89: fix unsuccessful interface_add flow
wifi: rtw89: add join info upon create interface
drivers/net/wireless/realtek/rtw89/mac.c | 64 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/mac.h | 3 + drivers/net/wireless/realtek/rtw89/mac80211.c | 3 + drivers/net/wireless/realtek/rtw89/reg.h | 17 +++++ 4 files changed, 84 insertions(+), 3 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/4 wifi: rtw89: add mac TSF sync function
From: Po-Hao Huang <[email protected]>
If the interface is in AP/P2P GO mode, we adjust the TSF with random offset to avoid TBTT of different vifs to overlap and collide. For every new interface added, we adjust the value and resync for all interfaces.
--- drivers/net/wireless/realtek/rtw89/mac.c | 44 ++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/mac.h | 2 ++ drivers/net/wireless/realtek/rtw89/reg.h | 17 +++++++++ 3 files changed, 63 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +44 -0
@@ -3913,6 +3913,49 @@ static void rtw89_mac_port_cfg_tbtt_shift(struct rtw89_dev *rtwdev, B_AX_TBTT_SHIFT_OFST_MASK, val); } +static void rtw89_mac_port_tsf_sync (struct rtw89_dev *rtwdev, +struct rtw89_vif *rtwvif, +struct rtw89_vif *rtwvif_src,u8 offset, +int *n_offset) +{ +u32 val, reg; + +if (rtwvif->net_type !=RTW89_NET_TYPE_AP_MODE || rtwvif == rtwvif_src) +return ; + +/* adjust offset randomly to avoid beacon conflict */ + offset = offset - offset /4 +get_random_u32 () % (offset /2 ); + val =RTW89_PORT_OFFSET_MS_TO_32US ((*n_offset)++, offset); + reg =rtw89_mac_reg_by_idx (R_AX_PORT0_TSF_SYNC + rtwvif->port *4 , + rtwvif->mac_idx); + +rtw89_write32_mask (rtwdev, reg,B_AX_SYNC_PORT_SRC , rtwvif_src->port); +rtw89_write32_mask (rtwdev, reg,B_AX_SYNC_PORT_OFFSET_VAL , val); +rtw89_write32_set (rtwdev, reg,B_AX_SYNC_NOW ); +} + +static void rtw89_mac_port_tsf_resync_all (struct rtw89_dev *rtwdev) +{ +struct rtw89_vif *src =NULL , *tmp; +u8 offset =100 , vif_aps =0 ; +int n_offset =1 ; + +rtw89_for_each_rtwvif (rtwdev, tmp) { +if (!src || tmp->net_type ==RTW89_NET_TYPE_INFRA ) + src = tmp; +if (tmp->net_type ==RTW89_NET_TYPE_AP_MODE ) + vif_aps++; + } + +if (vif_aps ==0 ) +return ; + + offset /= (vif_aps +1 ); + +rtw89_for_each_rtwvif (rtwdev, tmp) +rtw89_mac_port_tsf_sync (rtwdev, tmp, src, offset, &n_offset); +} +int rtw89_mac_vif_init (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) {int ret;
@@ -3991,6 +4034,7 @@ int rtw89_mac_port_update(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_mac_port_cfg_bss_color (rtwdev, rtwvif);rtw89_mac_port_cfg_mbssid (rtwdev, rtwvif);rtw89_mac_port_cfg_func_en (rtwdev, rtwvif); +rtw89_mac_port_tsf_resync_all (rtwdev);fsleep (BCN_ERLY_SET_DLY );rtw89_mac_port_cfg_bcn_early (rtwdev, rtwvif);
drivers/net/wireless/realtek/rtw89/mac.h +2 -0
@@ -168,6 +168,8 @@ enum rtw89_mac_ax_l0_to_l1_event { MAC_AX_L0_TO_L1_EVENT_MAX = 15, }; +#define RTW89_PORT_OFFSET_MS_TO_32US (n, shift_ms) ((n) * (shift_ms) * 1000 / 32) +enum rtw89_mac_dbg_port_sel {/* CMAC 0 related */ RTW89_DBG_PORT_SEL_PTCL_C0 =0 ,
drivers/net/wireless/realtek/rtw89/reg.h +17 -0
@@ -2048,6 +2048,23 @@#define B_AX_PTCL_TOP_ERR_IND BIT(1)#define B_AX_SCHEDULE_TOP_ERR_IND BIT(0) +#define R_AX_PORT0_TSF_SYNC 0xC2A0 +#define R_AX_PORT0_TSF_SYNC_C1 0xE2A0 +#define R_AX_PORT1_TSF_SYNC 0xC2A4 +#define R_AX_PORT1_TSF_SYNC_C1 0xE2A4 +#define R_AX_PORT2_TSF_SYNC 0xC2A8 +#define R_AX_PORT2_TSF_SYNC_C1 0xE2A8 +#define R_AX_PORT3_TSF_SYNC 0xC2AC +#define R_AX_PORT3_TSF_SYNC_C1 0xE2AC +#define R_AX_PORT4_TSF_SYNC 0xC2B0 +#define R_AX_PORT4_TSF_SYNC_C1 0xE2B0 +#define B_AX_SYNC_NOW BIT(30) +#define B_AX_SYNC_ONCE BIT(29) +#define B_AX_SYNC_AUTO BIT(28) +#define B_AX_SYNC_PORT_SRC GENMASK(26, 24) +#define B_AX_SYNC_PORT_OFFSET_SIGN BIT(18) +#define B_AX_SYNC_PORT_OFFSET_VAL GENMASK(17, 0) +#define R_AX_MACID_SLEEP_0 0xC2C0#define R_AX_MACID_SLEEP_0_C1 0xE2C0#define B_AX_MACID31_0_SLEEP_SH 0
Signature · 1 line
2.25.1
Re: [PATCH 1/4] wifi: rtw89: add mac TSF sync function
Quoted 9 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
If the interface is in AP/P2P GO mode, we adjust the TSF with random offset to avoid TBTT of different vifs to overlap and collide. For every new interface added, we adjust the value and resync for all interfaces.
Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
4 patches applied to wireless-next.git, thanks.
fb2b8cec81d7 wifi: rtw89: add mac TSF sync function d592b9f74264 wifi: rtw89: stop mac port function when stop_ap() 8fc5d4338620 wifi: rtw89: fix unsuccessful interface_add flow a0e78d5c6082 wifi: rtw89: add join info upon create interface
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/4 wifi: rtw89: stop mac port function when stop_ap()
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Disable hardware beacon related functions when ap stops. So hardware won't transmit beacons while interface is already removed.
--- drivers/net/wireless/realtek/rtw89/mac.c | 16 +++++++++++++--- drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/mac80211.c | 1 + 3 files changed, 15 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +13 -3
@@ -3877,11 +3877,16 @@ static void rtw89_mac_port_cfg_hiq_drop(struct rtw89_dev *rtwdev, }static void rtw89_mac_port_cfg_func_en (struct rtw89_dev *rtwdev, -struct rtw89_vif *rtwvif) +struct rtw89_vif *rtwvif,bool enable) {const struct rtw89_port_reg *p = &rtw_port_base; -rtw89_write32_port_set (rtwdev, rtwvif, p->port_cfg,B_AX_PORT_FUNC_EN ); +if (enable) +rtw89_write32_port_set (rtwdev, rtwvif, p->port_cfg, +B_AX_PORT_FUNC_EN ); +else +rtw89_write32_port_clr (rtwdev, rtwvif, p->port_cfg, +B_AX_PORT_FUNC_EN ); } static void rtw89_mac_port_cfg_bcn_early(struct rtw89_dev *rtwdev,
@@ -4033,7 +4038,7 @@ int rtw89_mac_port_update(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_mac_port_cfg_tbtt_shift (rtwdev, rtwvif);rtw89_mac_port_cfg_bss_color (rtwdev, rtwvif);rtw89_mac_port_cfg_mbssid (rtwdev, rtwvif); -rtw89_mac_port_cfg_func_en (rtwdev, rtwvif); +rtw89_mac_port_cfg_func_en (rtwdev, rtwvif, true);rtw89_mac_port_tsf_resync_all (rtwdev);fsleep (BCN_ERLY_SET_DLY );rtw89_mac_port_cfg_bcn_early (rtwdev, rtwvif);
@@ -4085,6 +4090,11 @@ void rtw89_mac_set_he_obss_narrow_bw_ru(struct rtw89_dev *rtwdev,rtw89_write32_set (rtwdev, reg,B_AX_RXTRIG_RU26_DIS ); } +void rtw89_mac_stop_ap (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) +{ +rtw89_mac_port_cfg_func_en (rtwdev, rtwvif, false); +} +int rtw89_mac_add_vif (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) {int ret;
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -908,6 +908,7 @@ int rtw89_mac_add_vif(struct rtw89_dev *rtwdev, struct rtw89_vif *vif);int rtw89_mac_port_update (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif);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);int rtw89_mac_remove_vif (struct rtw89_dev *rtwdev,struct rtw89_vif *vif);void rtw89_mac_disable_cpu (struct rtw89_dev *rtwdev);int rtw89_mac_enable_cpu (struct rtw89_dev *rtwdev,u8 boot_reason,bool dlfw);
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -0
@@ -454,6 +454,7 @@ void rtw89_ops_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv;mutex_lock (&rtwdev->mutex); +rtw89_mac_stop_ap (rtwdev, rtwvif);rtw89_fw_h2c_assoc_cmac_tbl (rtwdev, vif,NULL );rtw89_fw_h2c_join_info (rtwdev, rtwvif,NULL , true);mutex_unlock (&rtwdev->mutex);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/4 wifi: rtw89: fix unsuccessful interface_add flow
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Remove according vifs from list if we couldn't set this interface up. Otherwise the rtwvif_list could contain unreferenced objects.
--- drivers/net/wireless/realtek/rtw89/mac80211.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/realtek/rtw89/mac80211.c +2 -0
@@ -125,6 +125,7 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw, RTW89_PORT_NUM);if (rtwvif->port ==RTW89_PORT_NUM ) { ret = -ENOSPC ; +list_del_init (&rtwvif->list); goto out; }
@@ -138,6 +139,7 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw, ret =rtw89_mac_add_vif (rtwdev, rtwvif);if (ret) {rtw89_core_release_bit_map (rtwdev->hw_port, rtwvif->port); +list_del_init (&rtwvif->list); goto out; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/4 wifi: rtw89: add join info upon create interface
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
To support multiple vifs, fw need more information of each role. Send this info to make things work as expected.
--- drivers/net/wireless/realtek/rtw89/mac.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +4 -0
@@ -3980,6 +3980,10 @@ int rtw89_mac_vif_init(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)if (ret)return ret; + ret =rtw89_fw_h2c_join_info (rtwdev, rtwvif,NULL , true); +if (ret) +return ret; + ret =rtw89_cam_init (rtwdev, rtwvif);if (ret)return ret;
Signature · 1 line
2.25.1