wifi: rtw88: support single channel concurrency
Ping-Ke Shih
maintainerv2 cover wifi: rtw88: support single channel concurrency
To support SCC (1 STA + 1 AP), we need to deal some hardware things:
1. AP mode only can work on hardware port 0
2. adjust and enlarge reserved pages for two VIFs
Other things are to coordinate two VIFs work well to prevent interference with each other, like scan thing.
v2:
- use rtw_dbg() instead of rtw_info() for switching port. (patch 2/8)
- Don't reject scan when operating AP mode, so remove the limitation from patch 4/8 and add patch 7/8 to handle it.
Due to hardware limitation, we can't sending beacon and do scan at the same time, so it could lose some packets or AP's clients get disconnected.
Po-Hao Huang (8):
wifi: rtw88: add bitmap for dynamic port settings
wifi: rtw88: add port switch for AP mode
wifi: rtw88: 8822c: extend reserved page number
wifi: rtw88: disallow PS during AP mode
wifi: rtw88: refine reserved page flow for AP mode
wifi: rtw88: prevent scan abort with other VIFs
wifi: rtw88: handle station mode concurrent scan with AP mode
wifi: rtw88: 8822c: add iface combination
drivers/net/wireless/realtek/rtw88/fw.c | 20 ++- drivers/net/wireless/realtek/rtw88/fw.h | 2 +- drivers/net/wireless/realtek/rtw88/mac.c | 2 +- drivers/net/wireless/realtek/rtw88/mac80211.c | 40 ++++- drivers/net/wireless/realtek/rtw88/main.c | 146 +++++++++++++++++- drivers/net/wireless/realtek/rtw88/main.h | 15 ++ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + 10 files changed, 217 insertions(+), 12 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/8 wifi: rtw88: add bitmap for dynamic port settings
From: Po-Hao Huang <[email protected]>
In order to support multiple interfaces, multiple port settings will be required. Current code always uses port 0 and should be changed. Declare a bitmap with size equal to hardware port number to record the current usage.
---
v2: no change
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 13 ++++++++++--- drivers/net/wireless/realtek/rtw88/main.c | 1 + drivers/net/wireless/realtek/rtw88/main.h | 10 ++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw88/mac80211.c +10 -3
@@ -155,25 +155,30 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw,struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;enum rtw_net_type net_type;u32 config =0 ; -u8 port =0 ; +u8 port;u8 bcn_ctrl =0 ;if (rtw_fw_feature_check (&rtwdev->fw,FW_FEATURE_BCN_FILTER )) vif->driver_flags |=IEEE80211_VIF_BEACON_FILTER |IEEE80211_VIF_SUPPORTS_CQM_RSSI ; - rtwvif->port = port; rtwvif->stats.tx_unicast =0 ; rtwvif->stats.rx_unicast =0 ; rtwvif->stats.tx_cnt =0 ; rtwvif->stats.rx_cnt =0 ; rtwvif->scan_req =NULL ;memset (&rtwvif->bfee,0 ,sizeof (struct rtw_bfee )); - rtwvif->conf = &rtw_vif_port[port];rtw_txq_init (rtwdev, vif->txq);INIT_LIST_HEAD (&rtwvif->rsvd_page_list);mutex_lock (&rtwdev->mutex); + port =find_first_zero_bit (rtwdev->hw_port,RTW_PORT_NUM ); +if (port >=RTW_PORT_NUM ) +return -EINVAL ; +set_bit (port, rtwdev->hw_port); + + rtwvif->port = port; + rtwvif->conf = &rtw_vif_port[port];rtw_leave_lps_deep (rtwdev);switch (vif->type) {
@@ -195,6 +200,7 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw,break ;default :WARN_ON (1 ); +clear_bit (rtwvif->port, rtwdev->hw_port);mutex_unlock (&rtwdev->mutex);return -EINVAL ; }
@@ -236,6 +242,7 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw, rtwvif->bcn_ctrl =0 ; config |=PORT_SET_BCN_CTRL ;rtw_vif_port_config (rtwdev, rtwvif, config); +clear_bit (rtwvif->port, rtwdev->hw_port);mutex_unlock (&rtwdev->mutex); }
drivers/net/wireless/realtek/rtw88/main.c +1 -0
@@ -610,6 +610,7 @@ static void __fw_recovery_work(struct rtw_dev *rtwdev)rcu_read_unlock ();rtw_iterate_stas_atomic (rtwdev, rtw_reset_sta_iter, rtwdev);rtw_iterate_vifs_atomic (rtwdev, rtw_reset_vif_iter, rtwdev); +bitmap_zero (rtwdev->hw_port,RTW_PORT_NUM );rtw_enter_ips (rtwdev); }
drivers/net/wireless/realtek/rtw88/main.h +10 -0
@@ -395,6 +395,15 @@ enum rtw_snr {RTW_SNR_NUM }; +enum rtw_port { +RTW_PORT_0 =0 , +RTW_PORT_1 =1 , +RTW_PORT_2 =2 , +RTW_PORT_3 =3 , +RTW_PORT_4 =4 , +RTW_PORT_NUM +}; +enum rtw_wow_flags {RTW_WOW_FLAG_EN_MAGIC_PKT ,RTW_WOW_FLAG_EN_REKEY_PKT ,
@@ -2036,6 +2045,7 @@ struct rtw_dev {u8 sta_cnt;u32 rts_threshold; +DECLARE_BITMAP (hw_port,RTW_PORT_NUM );DECLARE_BITMAP (mac_id_map,RTW_MAX_MAC_ID_NUM );DECLARE_BITMAP (flags,NUM_OF_RTW_FLAGS );
Signature · 1 line
2.25.1
Re: [PATCH v2 1/8] wifi: rtw88: add bitmap for dynamic port settings
Quoted 9 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
In order to support multiple interfaces, multiple port settings will be required. Current code always uses port 0 and should be changed. Declare a bitmap with size equal to hardware port number to record the current usage.
Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
8 patches applied to wireless-next.git, thanks.
f0e741e4ddbc wifi: rtw88: add bitmap for dynamic port settings ccf73f6e69c0 wifi: rtw88: add port switch for AP mode ffa71c547779 wifi: rtw88: 8822c: extend reserved page number 5ec69129f195 wifi: rtw88: disallow PS during AP mode 982f4a2004f7 wifi: rtw88: refine reserved page flow for AP mode a1b8015da57a wifi: rtw88: prevent scan abort with other VIFs 96fbb84de4ff wifi: rtw88: handle station mode concurrent scan with AP mode d16836cdcc3b wifi: rtw88: 8822c: add iface combination
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/8 wifi: rtw88: add port switch for AP mode
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Switch port settings if AP mode does not start on port 0 because of hardware limitation. For some ICs, beacons on ports other than zero could misbehave and do not issue properly, to fix this we change AP VIFs to port zero when multiple interfaces is active.
---
v2: use rtw_dbg() instead to show message of switching port
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 1 + drivers/net/wireless/realtek/rtw88/main.c | 79 +++++++++++++++++++ drivers/net/wireless/realtek/rtw88/main.h | 1 + 3 files changed, 81 insertions(+)
drivers/net/wireless/realtek/rtw88/mac80211.c +1 -0
@@ -212,6 +212,7 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw, rtwvif->bcn_ctrl = bcn_ctrl; config |=PORT_SET_BCN_CTRL ;rtw_vif_port_config (rtwdev, rtwvif, config); +rtw_core_port_switch (rtwdev, vif);mutex_unlock (&rtwdev->mutex);
drivers/net/wireless/realtek/rtw88/main.c +79 -0
85 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/main.h +1 -0
@@ -2198,4 +2198,5 @@ void rtw_set_txrx_1ss(struct rtw_dev *rtwdev, bool config_1ss);void rtw_update_channel (struct rtw_dev *rtwdev,u8 center_channel,u8 primary_channel,enum rtw_supported_band band,enum rtw_bandwidth bandwidth); +void rtw_core_port_switch (struct rtw_dev *rtwdev,struct ieee80211_vif *vif);#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/8 wifi: rtw88: 8822c: extend reserved page number
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Extend 8822c's reserved page number to accommodate additional required pages. Reserved page is an area of memory in the FIFO dedicated for special purposes. Previously only one interface is supported so 8 pages should suffice, extend it so we can support 2 interfaces concurrently.
---
v2: no change
--- drivers/net/wireless/realtek/rtw88/mac.c | 2 +- drivers/net/wireless/realtek/rtw88/main.h | 1 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + 6 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/mac.c +1 -1
@@ -1119,7 +1119,7 @@ static int set_trx_fifo_info(struct rtw_dev *rtwdev)u8 csi_buf_pg_num = chip->csi_buf_pg_num;/* config rsvd page num */ - fifo->rsvd_drv_pg_num =8 ; + fifo->rsvd_drv_pg_num = chip->rsvd_drv_pg_num; fifo->txff_pg_num = chip->txff_size >>7 ;if (rtw_chip_wcpu_11n (rtwdev)) fifo->rsvd_pg_num = fifo->rsvd_drv_pg_num;
drivers/net/wireless/realtek/rtw88/main.h +1 -0
@@ -1177,6 +1177,7 @@ struct rtw_chip_info {u32 txff_size;u32 rxff_size;u32 fw_rxff_size; +u16 rsvd_drv_pg_num;u8 band;u8 page_size;u8 csi_buf_pg_num;
drivers/net/wireless/realtek/rtw88/rtw8723d.c +1 -0
@@ -2743,6 +2743,7 @@ const struct rtw_chip_info rtw8723d_hw_spec = { .ptct_efuse_size = 96 + 1, .txff_size = 32768, .rxff_size = 16384, + .rsvd_drv_pg_num = 8, .txgi_factor = 1, .is_pwr_by_rate_dec = true, .max_power_index = 0x3f,
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -0
@@ -1920,6 +1920,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .ptct_efuse_size = 96, .txff_size = 65536, .rxff_size = 16384, + .rsvd_drv_pg_num = 8, .txgi_factor = 1, .is_pwr_by_rate_dec = true, .max_power_index = 0x3f,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +1 -0
@@ -2540,6 +2540,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .txff_size = 262144, .rxff_size = 24576, .fw_rxff_size = 12288, + .rsvd_drv_pg_num = 8, .txgi_factor = 1, .is_pwr_by_rate_dec = true, .max_power_index = 0x3f,
drivers/net/wireless/realtek/rtw88/rtw8822c.c +1 -0
@@ -5358,6 +5358,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = { .txff_size = 262144, .rxff_size = 24576, .fw_rxff_size = 12288, + .rsvd_drv_pg_num = 16, .txgi_factor = 2, .is_pwr_by_rate_dec = false, .max_power_index = 0x7f,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 4/8 wifi: rtw88: disallow PS during AP mode
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Firmware can't support PS mode during AP mode, so disallow this case.
---
v2: don't reject doing scan, and change the subject as well.
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 13 +++++++++++++ drivers/net/wireless/realtek/rtw88/main.c | 2 +- drivers/net/wireless/realtek/rtw88/main.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/mac80211.c +13 -0
@@ -449,12 +449,24 @@ static int rtw_ops_start_ap(struct ieee80211_hw *hw,const struct rtw_chip_info *chip = rtwdev->chip;mutex_lock (&rtwdev->mutex); + rtwdev->ap_active = true; chip->ops->phy_calibration (rtwdev);mutex_unlock (&rtwdev->mutex);return 0 ; } +static void rtw_ops_stop_ap (struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_bss_conf *link_conf) +{ +struct rtw_dev *rtwdev = hw->priv; + +mutex_lock (&rtwdev->mutex); + rtwdev->ap_active = false; +mutex_unlock (&rtwdev->mutex); +} + static int rtw_ops_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, unsigned int link_id, u16 ac,
@@ -916,6 +928,7 @@ const struct ieee80211_ops rtw_ops = { .configure_filter = rtw_ops_configure_filter, .bss_info_changed = rtw_ops_bss_info_changed, .start_ap = rtw_ops_start_ap, + .stop_ap = rtw_ops_stop_ap, .conf_tx = rtw_ops_conf_tx, .sta_add = rtw_ops_sta_add, .sta_remove = rtw_ops_sta_remove,
drivers/net/wireless/realtek/rtw88/main.c +1 -1
@@ -257,7 +257,7 @@ static void rtw_watch_dog_work(struct work_struct *work)* threshold. */ if (rtwdev->ps_enabled && data.rtwvif && !ps_active && - !rtwdev->beacon_loss) + !rtwdev->beacon_loss && !rtwdev->ap_active)rtw_enter_lps (rtwdev, data.rtwvif->port); rtwdev->watch_dog_cnt++;
drivers/net/wireless/realtek/rtw88/main.h +1 -0
@@ -2058,6 +2058,7 @@ struct rtw_dev {bool need_rfk;struct completion fw_scan_density; +bool ap_active;/* hci related data, must be last */ u8 priv[]__aligned(sizeof(void *)) ;
Signature · 1 line
2.25.1