rtw88: add HT MPDU density value for each chip
Ping-Ke Shih
maintainerPATCH 1/3 rtw88: add HT MPDU density value for each chip
From: Chih-Kang Chang <[email protected]>
Each chip have best ampdu density value, the correct setting can improve throughput performance.
--- drivers/net/wireless/realtek/rtw88/main.c | 3 ++- 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, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/main.c +2 -1
@@ -1461,6 +1461,7 @@ static void rtw_init_ht_cap(struct rtw_dev *rtwdev, struct ieee80211_sta_ht_cap *ht_cap) {struct rtw_efuse *efuse = &rtwdev->efuse; +struct rtw_chip_info *chip = rtwdev->chip; ht_cap->ht_supported = true; ht_cap->cap =0 ;
@@ -1478,7 +1479,7 @@ static void rtw_init_ht_cap(struct rtw_dev *rtwdev,IEEE80211_HT_CAP_DSSSCCK40 |IEEE80211_HT_CAP_SGI_40 ; ht_cap->ampdu_factor =IEEE80211_HT_MAX_AMPDU_64K ; - ht_cap->ampdu_density =IEEE80211_HT_MPDU_DENSITY_16 ; + ht_cap->ampdu_density = chip->ampdu_density; ht_cap->mcs.tx_params =IEEE80211_HT_MCS_TX_DEFINED ;if (efuse->hw_cap.nss >1 ) { ht_cap->mcs.rx_mask[0 ] =0xFF ;
drivers/net/wireless/realtek/rtw88/main.h +1 -0
@@ -1179,6 +1179,7 @@ struct rtw_chip_info {bool rx_ldpc;bool tx_stbc;u8 max_power_index; +u8 ampdu_density;u16 fw_fifo_addr[RTW_FW_FIFO_MAX ];const struct rtw_fwcd_segs *fwcd_segs;
drivers/net/wireless/realtek/rtw88/rtw8723d.c +1 -0
@@ -2747,6 +2747,7 @@ struct rtw_chip_info rtw8723d_hw_spec = { .rx_ldpc = false, .pwr_track_tbl = &rtw8723d_rtw_pwr_track_tbl, .iqk_threshold = 8, + .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, .coex_para_ver = 0x2007022f, .bt_desired_ver = 0x2f,
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -0
@@ -1923,6 +1923,7 @@ struct rtw_chip_info rtw8821c_hw_spec = { .iqk_threshold = 8, .bfer_su_max_num = 2, .bfer_mu_max_num = 1, + .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, .coex_para_ver = 0x19092746, .bt_desired_ver = 0x46,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +1 -0
@@ -2548,6 +2548,7 @@ struct rtw_chip_info rtw8822b_hw_spec = { .edcca_th = rtw8822b_edcca_th, .l2h_th_ini_cs = 10 + EDCCA_IGI_BASE, .l2h_th_ini_ad = -14 + EDCCA_IGI_BASE, + .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, .coex_para_ver = 0x20070206, .bt_desired_ver = 0x6,
drivers/net/wireless/realtek/rtw88/rtw8822c.c +1 -0
@@ -5368,6 +5368,7 @@ struct rtw_chip_info rtw8822c_hw_spec = { .edcca_th = rtw8822c_edcca_th, .l2h_th_ini_cs = 60, .l2h_th_ini_ad = 45, + .ampdu_density =IEEE80211_HT_MPDU_DENSITY_2 , #ifdef CONFIG_PM .wow_fw_name = "rtw88/rtw8822c_wow_fw.bin",
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 2/3 rtw88: fix not disabling beacon filter after disconnection
From: Chih-Kang Chang <[email protected]>
Correct the judgment to let beacon filter disable after disconnection.
--- drivers/net/wireless/realtek/rtw88/fw.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/fw.c +5 -1
@@ -649,7 +649,7 @@ void rtw_fw_beacon_filter_config(struct rtw_dev *rtwdev, bool connect,s32 threshold = bss_conf->cqm_rssi_thold + rssi_offset;u8 h2c_pkt[H2C_PKT_SIZE ] = {0 }; -if (!rtw_fw_feature_check (&rtwdev->fw,FW_FEATURE_BCN_FILTER ) || !si) +if (!rtw_fw_feature_check (&rtwdev->fw,FW_FEATURE_BCN_FILTER ))return ;if (!connect) {
@@ -659,6 +659,10 @@ void rtw_fw_beacon_filter_config(struct rtw_dev *rtwdev, bool connect,return ; } + +if (!si) +return ; +SET_H2C_CMD_ID_CLASS (h2c_pkt,H2C_CMD_BCN_FILTER_OFFLOAD_P0 );ether_addr_copy (&h2c_pkt[1 ], bss_conf->bssid);rtw_fw_send_h2c_command (rtwdev, h2c_pkt);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/3 rtw88: fix hw scan may cause disconnect issue
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
After scan aborts we still receive some hw scan c2h packets, and processing these c2h commands will change current channel. If device already connect to other AP, driver will set wrong op channel due to current channel changed. The disconnection happens when hw scan back to wrong op channel that device can't receive beacon from AP. To fix this issue, we ignore the late c2h if we are not scanning, and set current channel back to op channel after scan to align the FW behavior.
--- drivers/net/wireless/realtek/rtw88/fw.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/fw.c +11 -1
@@ -2056,7 +2056,10 @@ void rtw_hw_scan_complete(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,struct cfg80211_scan_info info = { .aborted = aborted, }; +struct rtw_hw_scan_info *scan_info = &rtwdev->scan_info; +struct rtw_hal *hal = &rtwdev->hal;struct rtw_vif *rtwvif; +u8 chan = scan_info->op_chan;if (!vif)return ;
@@ -2066,10 +2069,14 @@ void rtw_hw_scan_complete(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,rtw_core_scan_complete (rtwdev, vif, true); + rtwvif = (struct rtw_vif *)vif->drv_priv; +if (rtwvif->net_type ==RTW_NET_MGD_LINKED ) { + hal->current_channel = chan; + hal->current_band_type = chan >14 ?RTW_BAND_5G :RTW_BAND_2G ; + }ieee80211_wake_queues (rtwdev->hw);ieee80211_scan_completed (rtwdev->hw, &info); - rtwvif = (struct rtw_vif *)vif->drv_priv; rtwvif->scan_req =NULL ; rtwvif->scan_ies =NULL ; rtwdev->scan_info.scanning_vif =NULL ;
@@ -2178,6 +2185,9 @@ void rtw_hw_scan_chan_switch(struct rtw_dev *rtwdev, struct sk_buff *skb)enum rtw_scan_notify_id id;u8 chan, status; +if (!test_bit (RTW_FLAG_SCANNING , rtwdev->flags)) +return ; + c2h =get_c2h_from_skb (skb); chan =GET_CHAN_SWITCH_CENTRAL_CH (c2h->payload); id =GET_CHAN_SWITCH_ID (c2h->payload);
Signature · 1 line
2.25.1
Quoted 7 lines · Ping-Ke Shih
From: Chih-Kang Chang <[email protected]>
Each chip have best ampdu density value, the correct setting can improve throughput performance.
Signed-off-by Chih-Kang Chang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
3 patches applied to wireless-next.git, thanks.
1d6d131d5049 rtw88: add HT MPDU density value for each chip 02ee806843bd rtw88: fix not disabling beacon filter after disconnection 5b3fd8fd7ceb rtw88: fix hw scan may cause disconnect issue
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches