rtw88: use const pointer of chip_info and fix hw_scan misbehavior
Ping-Ke Shih
maintainerv2 cover rtw88: use const pointer of chip_info and fix hw_scan misbehavior
Patch 1~3 is to fix hw_scan misbehavior, and the final patch is fix smatch warning.
v2: shink patchset from 5 to 4 patches, because the first patch is based on
another patch that get merged into wireless.git. So, the patch is postponed.
Chih-Kang Chang (2):
rtw88: fix stopping queues in wrong timing when HW scan
rtw88: fix store OP channel info timing when HW scan
Po-Hao Huang (1):
rtw88: 8822c: extend supported probe request size
Zong-Zhe Yang (1):
rtw88: phy: fix warning of possible buffer overflow
drivers/net/wireless/realtek/rtw88/fw.c | 36 +++++++++++++++---- drivers/net/wireless/realtek/rtw88/fw.h | 19 +++++++++- drivers/net/wireless/realtek/rtw88/mac80211.c | 5 ++- drivers/net/wireless/realtek/rtw88/main.c | 21 ++++++++++- drivers/net/wireless/realtek/rtw88/main.h | 4 ++- drivers/net/wireless/realtek/rtw88/phy.c | 21 +++++------ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 3 +- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 3 +- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 3 +- 10 files changed, 90 insertions(+), 28 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/4 rtw88: 8822c: extend supported probe request size
From: Po-Hao Huang <[email protected]>
Some WSC IEs require size larger than we current supports. Extend size to fit those demands. Separate the registered scan IE length by IC so settings can be independent.
Since old firmware uses fewer page number, define a firmware feature to be compatible with various firmware version.
--- drivers/net/wireless/realtek/rtw88/fw.c | 15 +++++++++---- drivers/net/wireless/realtek/rtw88/fw.h | 18 +++++++++++++++- drivers/net/wireless/realtek/rtw88/main.c | 21 ++++++++++++++++++- drivers/net/wireless/realtek/rtw88/main.h | 4 +++- drivers/net/wireless/realtek/rtw88/rtw8723d.c | 3 ++- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 ++- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 3 ++- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 3 ++- 8 files changed, 59 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +11 -4
@@ -1844,13 +1844,20 @@ static int _rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev, u8 num_probes,struct rtw_chip_info *chip = rtwdev->chip;struct sk_buff *skb, *tmp;u8 page_offset =1 , *buf, page_size = chip->page_size; -u8 pages = page_offset + num_probes *RTW_PROBE_PG_CNT ;u16 pg_addr = rtwdev->fifo.rsvd_h2c_info_addr, loc;u16 buf_offset = page_size * page_offset;u8 tx_desc_sz = chip->tx_pkt_desc_sz; +u8 page_cnt, pages;unsigned int pkt_len;int ret; +if (rtw_fw_feature_ext_check (&rtwdev->fw,FW_FEATURE_EXT_OLD_PAGE_NUM )) + page_cnt =RTW_OLD_PROBE_PG_CNT ; +else + page_cnt =RTW_PROBE_PG_CNT ; + + pages = page_offset + num_probes * page_cnt; + buf =kzalloc (page_size * pages,GFP_KERNEL );if (!buf)return -ENOMEM ;
@@ -1859,7 +1866,7 @@ static int _rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev, u8 num_probes, skb_queue_walk_safe(probe_req_list, skb, tmp) {skb_unlink (skb, probe_req_list);rtw_fill_rsvd_page_desc (rtwdev, skb,RSVD_PROBE_REQ ); -if (skb->len > page_size *RTW_PROBE_PG_CNT ) { +if (skb->len > page_size * page_cnt) { ret = -EINVAL ; goto out; }
@@ -1869,8 +1876,8 @@ static int _rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev, u8 num_probes, loc = pg_addr - rtwdev->fifo.rsvd_boundary + page_offset;__rtw_fw_update_pkt (rtwdev,RTW_PACKET_PROBE_REQ , pkt_len, loc); - buf_offset +=RTW_PROBE_PG_CNT * page_size; - page_offset +=RTW_PROBE_PG_CNT ; + buf_offset += page_cnt * page_size; + page_offset += page_cnt;kfree_skb (skb); }
drivers/net/wireless/realtek/rtw88/fw.h +17 -1
@@ -41,7 +41,8 @@#define RTW_EX_CH_INFO_HDR_SIZE 2#define RTW_SCAN_WIDTH 0#define RTW_PRI_CH_IDX 1 -#define RTW_PROBE_PG_CNT 2 +#define RTW_OLD_PROBE_PG_CNT 2 +#define RTW_PROBE_PG_CNT 4enum rtw_c2h_cmd_id {C2H_CCX_TX_RPT =0x03 ,
@@ -120,6 +121,10 @@ enum rtw_fw_feature { FW_FEATURE_MAX = BIT(31), }; +enum rtw_fw_feature_ext { +FW_FEATURE_EXT_OLD_PAGE_NUM =BIT (0 ), +}; +enum rtw_beacon_filter_offload_mode {BCN_FILTER_OFFLOAD_MODE_0 =0 ,BCN_FILTER_OFFLOAD_MODE_1 ,
@@ -323,6 +328,11 @@ struct rtw_fw_hdr_legacy {__le32 rsvd5; } __packed; +#define RTW_FW_VER_CODE (ver, sub_ver, idx) \ + (((ver) << 16) | ((sub_ver) << 8) | (idx)) +#define RTW_FW_SUIT_VER_CODE (s) \ + RTW_FW_VER_CODE((s).version, (s).sub_version, (s).sub_index) +/* C2H */ #define GET_CCX_REPORT_SEQNUM_V0 (c2h_payload) (c2h_payload[6] & 0xfc)#define GET_CCX_REPORT_STATUS_V0 (c2h_payload) (c2h_payload[0] & 0xc0)
@@ -770,6 +780,12 @@ static inline bool rtw_fw_feature_check(struct rtw_fw_state *fw,return !!(fw->feature & feature); } +static inline bool rtw_fw_feature_ext_check (struct rtw_fw_state *fw, +enum rtw_fw_feature_ext feature) +{ +return !!(fw->feature_ext & feature); +} +void rtw_fw_c2h_cmd_rx_irqsafe (struct rtw_dev *rtwdev,u32 pkt_offset,struct sk_buff *skb);void rtw_fw_c2h_cmd_handle (struct rtw_dev *rtwdev,struct sk_buff *skb);
drivers/net/wireless/realtek/rtw88/main.c +20 -1
@@ -1552,6 +1552,21 @@ static void rtw_init_vht_cap(struct rtw_dev *rtwdev, vht_cap->vht_mcs.tx_highest = highest; } +static u16 rtw_get_max_scan_ie_len (struct rtw_dev *rtwdev) +{ +u16 len; + + len = rtwdev->chip->max_scan_ie_len; + +if (!rtw_fw_feature_check (&rtwdev->fw,FW_FEATURE_SCAN_OFFLOAD ) && + rtwdev->chip->id ==RTW_CHIP_TYPE_8822C ) + len =IEEE80211_MAX_DATA_LEN ; +else if (rtw_fw_feature_ext_check (&rtwdev->fw,FW_FEATURE_EXT_OLD_PAGE_NUM )) + len -=RTW_OLD_PROBE_PG_CNT *TX_PAGE_SIZE ; + +return len; +} +static void rtw_set_supported_band (struct ieee80211_hw *hw,struct rtw_chip_info *chip) {
@@ -1631,6 +1646,10 @@ static void __update_firmware_feature(struct rtw_dev *rtwdev, feature =le32_to_cpu (fw_hdr->feature); fw->feature = feature &FW_FEATURE_SIG ? feature :0 ; + +if (rtwdev->chip->id ==RTW_CHIP_TYPE_8822C && +RTW_FW_SUIT_VER_CODE (rtwdev->fw) <RTW_FW_VER_CODE (9 ,9 ,13 )) + fw->feature_ext |=FW_FEATURE_EXT_OLD_PAGE_NUM ; } static void __update_firmware_info(struct rtw_dev *rtwdev,
@@ -2132,7 +2151,7 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) hw->wiphy->features |=NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR ; hw->wiphy->max_scan_ssids =RTW_SCAN_MAX_SSIDS ; - hw->wiphy->max_scan_ie_len =RTW_SCAN_MAX_IE_LEN ; + hw->wiphy->max_scan_ie_len =rtw_get_max_scan_ie_len (rtwdev);wiphy_ext_feature_set (hw->wiphy,NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 );wiphy_ext_feature_set (hw->wiphy,NL80211_EXT_FEATURE_SCAN_RANDOM_SN );
drivers/net/wireless/realtek/rtw88/main.h +3 -1
@@ -22,7 +22,6 @@#define MAX_PG_CAM_BACKUP_NUM 8#define RTW_SCAN_MAX_SSIDS 4 -#define RTW_SCAN_MAX_IE_LEN 128#define RTW_MAX_PATTERN_NUM 12#define RTW_MAX_PATTERN_MASK_SIZE 16
@@ -33,6 +32,7 @@#define RFREG_MASK 0xfffff#define INV_RF_DATA 0xffffffff#define TX_PAGE_SIZE_SHIFT 7 +#define TX_PAGE_SIZE (1 << TX_PAGE_SIZE_SHIFT)#define RTW_CHANNEL_WIDTH_MAX 3#define RTW_RF_PATH_MAX 4
@@ -1232,6 +1232,7 @@ struct rtw_chip_info {const char *wow_fw_name;const struct wiphy_wowlan_support *wowlan_stub;const u8 max_sched_scan_ssids; +const u16 max_scan_ie_len;/* for 8821c set channel */ u32 ch_param[3 ];
@@ -1856,6 +1857,7 @@ struct rtw_fw_state {u8 sub_index;u16 h2c_version;u32 feature; +u32 feature_ext; };enum rtw_sar_sources {
drivers/net/wireless/realtek/rtw88/rtw8723d.c +2 -1
@@ -2720,7 +2720,7 @@ const struct rtw_chip_info rtw8723d_hw_spec = { .max_power_index = 0x3f, .csi_buf_pg_num = 0, .band = RTW_BAND_2G, - .page_size = 128, + .page_size = TX_PAGE_SIZE, .dig_min = 0x20, .ht_supported = true, .vht_supported = false,
@@ -2748,6 +2748,7 @@ const struct rtw_chip_info rtw8723d_hw_spec = { .pwr_track_tbl = &rtw8723d_rtw_pwr_track_tbl, .iqk_threshold = 8, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, + .max_scan_ie_len = IEEE80211_MAX_DATA_LEN, .coex_para_ver = 0x2007022f, .bt_desired_ver = 0x2f,
drivers/net/wireless/realtek/rtw88/rtw8821c.c +2 -1
@@ -1896,7 +1896,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .max_power_index = 0x3f, .csi_buf_pg_num = 0, .band = RTW_BAND_2G | RTW_BAND_5G, - .page_size = 128, + .page_size = TX_PAGE_SIZE, .dig_min = 0x1c, .ht_supported = true, .vht_supported = true,
@@ -1924,6 +1924,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .bfer_su_max_num = 2, .bfer_mu_max_num = 1, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, + .max_scan_ie_len = IEEE80211_MAX_DATA_LEN, .coex_para_ver = 0x19092746, .bt_desired_ver = 0x46,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +2 -1
@@ -2517,7 +2517,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .max_power_index = 0x3f, .csi_buf_pg_num = 0, .band = RTW_BAND_2G | RTW_BAND_5G, - .page_size = 128, + .page_size = TX_PAGE_SIZE, .dig_min = 0x1c, .ht_supported = true, .vht_supported = true,
@@ -2549,6 +2549,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .l2h_th_ini_cs = 10 + EDCCA_IGI_BASE, .l2h_th_ini_ad = -14 + EDCCA_IGI_BASE, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, + .max_scan_ie_len = IEEE80211_MAX_DATA_LEN, .coex_para_ver = 0x20070206, .bt_desired_ver = 0x6,
drivers/net/wireless/realtek/rtw88/rtw8822c.c +2 -1
@@ -5330,7 +5330,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = { .max_power_index = 0x7f, .csi_buf_pg_num = 50, .band = RTW_BAND_2G | RTW_BAND_5G, - .page_size = 128, + .page_size = TX_PAGE_SIZE, .dig_min = 0x20, .default_1ss_tx_path = BB_PATH_A, .path_div_supported = true,
@@ -5375,6 +5375,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = { .wowlan_stub = &rtw_wowlan_stub_8822c, .max_sched_scan_ssids = 4, #endif + .max_scan_ie_len = (RTW_PROBE_PG_CNT - 1) * TX_PAGE_SIZE, .coex_para_ver = 0x22020720, .bt_desired_ver = 0x20, .scbd_support = true,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 2/4 rtw88: fix stopping queues in wrong timing when HW scan
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
HW scan need to start queues after switch to OP channel, and stop queues before leaving op channel. However, in original code, driver will start queues after switch to OP channel, but stop queues until switch to OP channel next time, that will cause packets transmitted in wrong channel. So we fix the stop queues timing.
--- drivers/net/wireless/realtek/rtw88/fw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/fw.c +6 -1
@@ -2227,7 +2227,12 @@ void rtw_hw_scan_chan_switch(struct rtw_dev *rtwdev, struct sk_buff *skb) chan_type =COEX_SWITCH_TO_24G_NOFORSCAN ;rtw_coex_switchband_notify (rtwdev, chan_type); } -if (rtw_is_op_chan (rtwdev, chan)) +/* The channel of C2H RTW_SCAN_NOTIFY_ID_PRESWITCH is next +* channel that hardware will switch. We need to stop queue +* if next channel is non-op channel. +*/ +if (!rtw_is_op_chan (rtwdev, chan) && +rtw_is_op_chan (rtwdev, hal->current_channel))ieee80211_stop_queues (rtwdev->hw); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/4 rtw88: fix store OP channel info timing when HW scan
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
The original timing that store OP channel info is after associated. However, HW scan might happen before associated without backing to OP channel, that will cause authentication or association fail. Therefore, we modify the timing of storing OP channel info.
--- drivers/net/wireless/realtek/rtw88/fw.c | 14 ++++++++++++-- drivers/net/wireless/realtek/rtw88/fw.h | 1 + drivers/net/wireless/realtek/rtw88/mac80211.c | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +12 -2
@@ -2087,7 +2087,7 @@ 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 ) { +if (chan) { hal->current_channel = chan; hal->current_band_type = chan >14 ?RTW_BAND_5G :RTW_BAND_2G ; }
@@ -2131,6 +2131,7 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, bool enable) {struct rtw_vif *rtwvif = vif ? (struct rtw_vif *)vif->drv_priv :NULL ; +struct rtw_hw_scan_info *scan_info = &rtwdev->scan_info;struct rtw_ch_switch_option cs_option = {0 };struct rtw_chan_list chan_list = {0 };int ret =0 ;
@@ -2139,7 +2140,7 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,return -EINVAL ; cs_option.switch_en = enable; - cs_option.back_op_en = rtwvif->net_type ==RTW_NET_MGD_LINKED ; + cs_option.back_op_en = scan_info->op_chan !=0 ;if (enable) { ret =rtw_hw_scan_prehandle (rtwdev, rtwvif, &chan_list);if (ret)
@@ -2188,6 +2189,15 @@ void rtw_store_op_chan(struct rtw_dev *rtwdev) scan_info->op_pri_ch_idx = hal->current_primary_channel_index; } +void rtw_clear_op_chan (struct rtw_dev *rtwdev) +{ +struct rtw_hw_scan_info *scan_info = &rtwdev->scan_info; + + scan_info->op_chan =0 ; + scan_info->op_bw =0 ; + scan_info->op_pri_ch_idx =0 ; +} +static bool rtw_is_op_chan (struct rtw_dev *rtwdev,u8 channel) {struct rtw_hw_scan_info *scan_info = &rtwdev->scan_info;
drivers/net/wireless/realtek/rtw88/fw.h +1 -0
@@ -848,6 +848,7 @@ int rtw_fw_dump_fifo(struct rtw_dev *rtwdev, u8 fifo_sel, u32 addr, u32 size,void rtw_fw_scan_notify (struct rtw_dev *rtwdev,bool start);void rtw_fw_adaptivity (struct rtw_dev *rtwdev);void rtw_store_op_chan (struct rtw_dev *rtwdev); +void rtw_clear_op_chan (struct rtw_dev *rtwdev);void rtw_hw_scan_start (struct rtw_dev *rtwdev,struct ieee80211_vif *vif,struct ieee80211_scan_request *req); void rtw_hw_scan_complete(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
drivers/net/wireless/realtek/rtw88/mac80211.c +4 -1
@@ -377,7 +377,6 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,rtw_coex_media_status_notify (rtwdev, vif->cfg.assoc);if (rtw_bf_support)rtw_bf_assoc (rtwdev, vif, conf); -rtw_store_op_chan (rtwdev); }else {rtw_leave_lps (rtwdev);rtw_bf_disassoc (rtwdev, vif, conf);
@@ -395,6 +394,10 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,if (changed &BSS_CHANGED_BSSID ) {ether_addr_copy (rtwvif->bssid, conf->bssid); config |=PORT_SET_BSSID ; +if (is_zero_ether_addr (rtwvif->bssid)) +rtw_clear_op_chan (rtwdev); +else +rtw_store_op_chan (rtwdev); }if (changed &BSS_CHANGED_BEACON_INT ) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 4/4 rtw88: phy: fix warning of possible buffer overflow
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
reported by smatch
phy.c:854 rtw_phy_linear_2_db() error: buffer overflow 'db_invert_table[i]' 8 <= 8 (assuming for loop doesn't break)
However, it seems to be a false alarm because we prevent it originally via
if (linear >= db_invert_table[11][7])
return 96; /* maximum 96 dB */Still, we adjust the code to be more readable and avoid smatch warning.
--- drivers/net/wireless/realtek/rtw88/phy.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
drivers/net/wireless/realtek/rtw88/phy.c +8 -13
@@ -816,23 +816,18 @@ static u8 rtw_phy_linear_2_db(u64 linear)u8 j;u32 dB; -if (linear >= db_invert_table[11 ][7 ]) -return 96 ;/* maximum 96 dB */ -for (i =0 ; i <12 ; i++) { -if (i <=2 && (linear <<FRAC_BITS ) <= db_invert_table[i][7 ]) -break ; -else if (i >2 && linear <= db_invert_table[i][7 ]) -break ; +for (j =0 ; j <8 ; j++) { +if (i <=2 && (linear <<FRAC_BITS ) <= db_invert_table[i][j]) + goto cnt; +else if (i >2 && linear <= db_invert_table[i][j]) + goto cnt; + } } -for (j =0 ; j <8 ; j++) { -if (i <=2 && (linear <<FRAC_BITS ) <= db_invert_table[i][j]) -break ; -else if (i >2 && linear <= db_invert_table[i][j]) -break ; - } +return 96 ;/* maximum 96 dB */ +cnt:if (j ==0 && i ==0 ) goto end;
Signature · 1 line
2.25.1