wifi: rtw89: apply settings to improve robustness
Ping-Ke Shih
maintainercover wifi: rtw89: apply settings to improve robustness
First two patches are to reduce/detect hardware errors. The third is to fill preamble puncturing setting for EHT along mac80211 data. The forth is to prevent events of previous scan leak to next scan request for uncertainly late event work. The last is just to avoid Coverity warnings.
Chia-Yuan Li (2):
wifi: rtw89: trigger TX stuck if FIFO full
wifi: rtw89: mac: reduce PPDU status length for WiFi 6 chips
Kuan-Chung Chen (1):
wifi: rtw89: dynamically update EHT preamble puncturing
Ping-Ke Shih (2):
wifi: rtw89: purge obsoleted scan events with software sequence number
wifi: rtw89: check path range before using in
rtw89_fw_h2c_rf_ps_info()
drivers/net/wireless/realtek/rtw89/chan.c | 47 ++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 4 + drivers/net/wireless/realtek/rtw89/fw.c | 76 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 19 +++++ drivers/net/wireless/realtek/rtw89/mac.c | 10 ++- drivers/net/wireless/realtek/rtw89/mac.h | 25 ++++++ drivers/net/wireless/realtek/rtw89/pci.c | 4 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + drivers/net/wireless/realtek/rtw89/wow.c | 2 +- 14 files changed, 189 insertions(+), 4 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/5 wifi: rtw89: trigger TX stuck if FIFO full
From: Chia-Yuan Li <[email protected]>
In order for the situation where the dispatcher blocking causes HAXIDMA to be unable to TX to be reported as a TX stuck, so that subsequent recovery can be handled.
--- drivers/net/wireless/realtek/rtw89/pci.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtw89/pci.c +4 -0
@@ -2638,6 +2638,10 @@ static void rtw89_pci_set_dbg(struct rtw89_dev *rtwdev)rtw89_write32_set (rtwdev,R_AX_PCIE_DBG_CTRL ,B_AX_ASFF_FULL_NO_STK |B_AX_EN_STUCK_DBG ); +rtw89_write32_mask (rtwdev,R_AX_PCIE_EXP_CTRL , +B_AX_EN_STUCK_DBG |B_AX_ASFF_FULL_NO_STK , +B_AX_EN_STUCK_DBG ); +if (rtwdev->chip->chip_id ==RTL8852A )rtw89_write32_set (rtwdev,R_AX_PCIE_EXP_CTRL ,B_AX_EN_CHKDSC_NO_RX_STUCK );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 1/5] wifi: rtw89: trigger TX stuck if FIFO full
Quoted 8 lines · Ping-Ke Shih
From: Chia-Yuan Li <[email protected]>
In order for the situation where the dispatcher blocking causes HAXIDMA to be unable to TX to be reported as a TX stuck, so that subsequent recovery can be handled.
Signed-off-by Chia-Yuan Li <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
5 patch(es) applied to rtw-next branch of rtw.git, thanks.
cbf510e21e0c wifi: rtw89: trigger TX stuck if FIFO full8552f2b3153e wifi: rtw89: mac: reduce PPDU status length for WiFi 6 chips b552a3ef8a3d wifi: rtw89: dynamically update EHT preamble puncturing f1000385d47b wifi: rtw89: purge obsoleted scan events with software sequence number 8b4a02773881 wifi: rtw89: check path range before using in rtw89_fw_h2c_rf_ps_info()
Ping-Ke Shih
maintainerPATCH 2/5 wifi: rtw89: mac: reduce PPDU status length for WiFi 6 chips
In reply to Ping-Ke ShihFrom: Chia-Yuan Li <[email protected]>
Since the RX counter in the PPDU status is not used, it is disabled to reduce the waste of DLE quota.
--- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +1 -1
@@ -5865,7 +5865,7 @@ int rtw89_mac_cfg_ppdu_status_ax(struct rtw89_dev *rtwdev, u8 mac_idx, bool enabrtw89_write32 (rtwdev, reg,B_AX_PPDU_STAT_RPT_EN |B_AX_APP_MAC_INFO_RPT | -B_AX_APP_RX_CNT_RPT |B_AX_APP_PLCP_HDR_RPT | +B_AX_APP_PLCP_HDR_RPT |B_AX_PPDU_STAT_RPT_CRC32 );rtw89_write32_mask (rtwdev,R_AX_HW_RPT_FWD ,B_AX_FWD_PPDU_STAT_MASK ,RTW89_PRPT_DEST_HOST );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/5 wifi: rtw89: dynamically update EHT preamble puncturing
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
When the 'Disabled Subchannel Bitmap' within the EHT Operation element is changed, mac80211 parse and pass it to the driver. The driver is then updated with this puncturing bitmap to optimize bandwidth usage and prevent interference from degrading performance across the entire channel.
--- drivers/net/wireless/realtek/rtw89/chan.c | 47 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 3 ++ drivers/net/wireless/realtek/rtw89/fw.c | 43 +++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 16 +++++++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 10 files changed, 115 insertions(+)
drivers/net/wireless/realtek/rtw89/chan.c +47 -0
@@ -129,6 +129,48 @@ void rtw89_chan_create(struct rtw89_chan *chan, u8 center_chan, u8 primary_chan, bandwidth); } +static void _rtw89_chan_update_punctured (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +const struct cfg80211_chan_def *chandef) +{ +struct ieee80211_bss_conf *bss_conf; + +if (rtwvif_link->wifi_role !=RTW89_WIFI_ROLE_STATION && + rtwvif_link->wifi_role !=RTW89_WIFI_ROLE_P2P_CLIENT ) +return ; + +rcu_read_lock (); + + bss_conf =rtw89_vif_rcu_dereference_link (rtwvif_link, true); +if (!bss_conf->eht_support) { +rcu_read_unlock (); +return ; + } + +rcu_read_unlock (); + +rtw89_chip_h2c_punctured_cmac_tbl (rtwdev, rtwvif_link, chandef->punctured); +} + +static void rtw89_chan_update_punctured (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_idx idx, +const struct cfg80211_chan_def *chandef) +{ +struct rtw89_vif_link *rtwvif_link; +struct rtw89_vif *rtwvif; +unsigned int link_id; + +rtw89_for_each_rtwvif (rtwdev, rtwvif) { +rtw89_vif_for_each_link (rtwvif, rtwvif_link, link_id) { +if (!rtwvif_link->chanctx_assigned || + rtwvif_link->chanctx_idx != idx) +continue ; + +_rtw89_chan_update_punctured (rtwdev, rtwvif_link, chandef); + } + } +} +bool rtw89_assign_entity_chan (struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx idx,const struct rtw89_chan *new)
@@ -3245,6 +3287,9 @@ void rtw89_chanctx_ops_change(struct rtw89_dev *rtwdev,rtw89_config_entity_chandef (rtwdev, idx, &ctx->def);rtw89_set_channel (rtwdev); } + +if (changed &IEEE80211_CHANCTX_CHANGE_PUNCTURING ) +rtw89_chan_update_punctured (rtwdev, idx, &ctx->def); } int rtw89_chanctx_ops_assign_vif(struct rtw89_dev *rtwdev,
@@ -3388,5 +3433,7 @@ int rtw89_chanctx_ops_reassign_vif(struct rtw89_dev *rtwdev,return ret; } +_rtw89_chan_update_punctured (rtwdev, rtwvif_link, &new_ctx->def); +return 0 ; }
drivers/net/wireless/realtek/rtw89/core.h +3 -0
@@ -3779,6 +3779,9 @@ struct rtw89_chip_ops { struct rtw89_sta_link *rtwsta_link);int (*h2c_txtime_cmac_tbl)(struct rtw89_dev *rtwdev,struct rtw89_sta_link *rtwsta_link); +int (*h2c_punctured_cmac_tbl)(struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +u16 punctured);int (*h2c_default_dmac_tbl)(struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link);
drivers/net/wireless/realtek/rtw89/fw.c +43 -0
49 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +16 -0
@@ -4736,6 +4736,9 @@ int rtw89_fw_h2c_txtime_cmac_tbl(struct rtw89_dev *rtwdev, struct rtw89_sta_link *rtwsta_link);int rtw89_fw_h2c_txtime_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_sta_link *rtwsta_link); +int rtw89_fw_h2c_punctured_cmac_tbl_g7 (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +u16 punctured);int rtw89_fw_h2c_txpath_cmac_tbl (struct rtw89_dev *rtwdev,struct rtw89_sta_link *rtwsta_link); int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,
@@ -5038,6 +5041,19 @@ int rtw89_chip_h2c_txtime_cmac_tbl(struct rtw89_dev *rtwdev,return chip->ops->h2c_txtime_cmac_tbl (rtwdev, rtwsta_link); } +static inline +int rtw89_chip_h2c_punctured_cmac_tbl (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +u16 punctured) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +if (!chip->ops->h2c_punctured_cmac_tbl) +return 0 ; + +return chip->ops->h2c_punctured_cmac_tbl (rtwdev, rtwvif_link, punctured); +} +static inline int rtw89_chip_h2c_ba_cam (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,bool valid,struct ieee80211_ampdu_params *params)
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2546,6 +2546,7 @@ static const struct rtw89_chip_ops rtw8851b_chip_ops = { .h2c_assoc_cmac_tbl = rtw89_fw_h2c_assoc_cmac_tbl, .h2c_ampdu_cmac_tbl = NULL, .h2c_txtime_cmac_tbl = rtw89_fw_h2c_txtime_cmac_tbl, + .h2c_punctured_cmac_tbl = NULL, .h2c_default_dmac_tbl = NULL, .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2151,6 +2151,7 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { .h2c_assoc_cmac_tbl = rtw89_fw_h2c_assoc_cmac_tbl, .h2c_ampdu_cmac_tbl = NULL, .h2c_txtime_cmac_tbl = rtw89_fw_h2c_txtime_cmac_tbl, + .h2c_punctured_cmac_tbl = NULL, .h2c_default_dmac_tbl = NULL, .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -851,6 +851,7 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = { .h2c_assoc_cmac_tbl = rtw89_fw_h2c_assoc_cmac_tbl, .h2c_ampdu_cmac_tbl = NULL, .h2c_txtime_cmac_tbl = rtw89_fw_h2c_txtime_cmac_tbl, + .h2c_punctured_cmac_tbl = NULL, .h2c_default_dmac_tbl = NULL, .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -717,6 +717,7 @@ static const struct rtw89_chip_ops rtw8852bt_chip_ops = { .h2c_assoc_cmac_tbl = rtw89_fw_h2c_assoc_cmac_tbl, .h2c_ampdu_cmac_tbl = NULL, .h2c_txtime_cmac_tbl = rtw89_fw_h2c_txtime_cmac_tbl, + .h2c_punctured_cmac_tbl = NULL, .h2c_default_dmac_tbl = NULL, .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2971,6 +2971,7 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .h2c_assoc_cmac_tbl = rtw89_fw_h2c_assoc_cmac_tbl, .h2c_ampdu_cmac_tbl = NULL, .h2c_txtime_cmac_tbl = rtw89_fw_h2c_txtime_cmac_tbl, + .h2c_punctured_cmac_tbl = NULL, .h2c_default_dmac_tbl = NULL, .h2c_update_beacon = rtw89_fw_h2c_update_beacon, .h2c_ba_cam = rtw89_fw_h2c_ba_cam,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -2826,6 +2826,7 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .h2c_assoc_cmac_tbl = rtw89_fw_h2c_assoc_cmac_tbl_g7, .h2c_ampdu_cmac_tbl = rtw89_fw_h2c_ampdu_cmac_tbl_g7, .h2c_txtime_cmac_tbl = rtw89_fw_h2c_txtime_cmac_tbl_g7, + .h2c_punctured_cmac_tbl = rtw89_fw_h2c_punctured_cmac_tbl_g7, .h2c_default_dmac_tbl = rtw89_fw_h2c_default_dmac_tbl_v2, .h2c_update_beacon = rtw89_fw_h2c_update_beacon_be, .h2c_ba_cam = rtw89_fw_h2c_ba_cam_v1,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/5 wifi: rtw89: purge obsoleted scan events with software sequence number
In reply to Ping-Ke ShihThe queued and obsoleted scan events can be wrongly treated as events of new scan request, causing unexpected scan result. Attach a software sequence number to scan request and its corresponding events. When a new scan request is acknowledged by firmware, purge the scan events if its sequence number is not belong to current request.
Normal case:
mac80211 event work event BH
------------- ---------- --------
scan req #1 ---->o
|
<----o <...........................o
o
|
<--------------------------+
ieee80211_scan_completed()Abnormal case (late event work):
mac80211 event work event BH
------------- ---------- --------
scan req #1 ---->o
|
<----o <...........................o
o #1 scan cancel #2 ->o
|
<----o <...........................o
o #2
| (patch to avoid this)
scan req #3 ---->o |
| |
<----o <..........|................o
| o #3
<--------------------------+
ieee80211_scan_completed()--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 31 ++++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 3 +++ drivers/net/wireless/realtek/rtw89/mac.c | 8 ++++++ drivers/net/wireless/realtek/rtw89/mac.h | 25 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/wow.c | 2 +- 6 files changed, 68 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -5574,6 +5574,7 @@ struct rtw89_hw_scan_info {bool connected;bool abort;u16 delay;/* in unit of ms */ + u8 seq: 2; };enum rtw89_phy_bb_gain_band {
drivers/net/wireless/realtek/rtw89/fw.c +30 -1
@@ -6759,6 +6759,34 @@ void rtw89_fw_c2h_work(struct wiphy *wiphy, struct wiphy_work *work) } } +void rtw89_fw_c2h_purge_obsoleted_scan_events (struct rtw89_dev *rtwdev) +{ +struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info; +struct sk_buff *skb, *tmp; +int limit; + +lockdep_assert_wiphy (rtwdev->hw->wiphy); + + limit =skb_queue_len (&rtwdev->c2h_queue); + + skb_queue_walk_safe(&rtwdev->c2h_queue, skb, tmp) { +struct rtw89_fw_c2h_attr *attr =RTW89_SKB_C2H_CB (skb); + +if (--limit <0 ) +return ; + +if (!attr->is_scan_event || attr->scan_seq == scan_info->seq) +continue ; + +rtw89_debug (rtwdev,RTW89_DBG_HW_SCAN , +"purge obsoleted scan event with seq=%d (cur=%d)\n" , + attr->scan_seq, scan_info->seq); + +skb_unlink (skb, &rtwdev->c2h_queue); +dev_kfree_skb_any (skb); + } +} +static int rtw89_fw_write_h2c_reg (struct rtw89_dev *rtwdev,struct rtw89_mac_h2c_info *info) {
@@ -8052,7 +8080,8 @@ int rtw89_hw_scan_offload(struct rtw89_dev *rtwdev, opt.opch_end = connected ?0 :RTW89_CHAN_INVALID ; } - ret = mac->scan_offload (rtwdev, &opt, rtwvif_link, false); + ret =rtw89_mac_scan_offload (rtwdev, &opt, rtwvif_link, false); + out:return ret; }
drivers/net/wireless/realtek/rtw89/fw.h +3 -0
@@ -3570,6 +3570,8 @@ struct rtw89_fw_c2h_attr {u8 class;u8 func;u16 len; + u8 is_scan_event: 1; + u8 scan_seq: 2; };static inline struct rtw89_fw_c2h_attr *RTW89_SKB_C2H_CB (struct sk_buff *skb)
@@ -4755,6 +4757,7 @@ int rtw89_fw_h2c_dctl_sec_cam_v2(struct rtw89_dev *rtwdev, struct rtw89_sta_link *rtwsta_link);void rtw89_fw_c2h_irqsafe (struct rtw89_dev *rtwdev,struct sk_buff *c2h);void rtw89_fw_c2h_work (struct wiphy *wiphy,struct wiphy_work *work); +void rtw89_fw_c2h_purge_obsoleted_scan_events (struct rtw89_dev *rtwdev); int rtw89_fw_h2c_role_maintain(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link,
drivers/net/wireless/realtek/rtw89/mac.c +8 -0
@@ -5165,6 +5165,7 @@ rtw89_mac_c2h_done_ack(struct rtw89_dev *rtwdev, struct sk_buff *skb_c2h, u32 le {/* N.B. This will run in interrupt context. */ struct rtw89_wait_info *fw_ofld_wait = &rtwdev->mac.fw_ofld_wait; +struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info;struct rtw89_wait_info *ps_wait = &rtwdev->mac.ps_wait;const struct rtw89_c2h_done_ack *c2h = (const struct rtw89_c2h_done_ack *)skb_c2h->data;
@@ -5207,9 +5208,11 @@ rtw89_mac_c2h_done_ack(struct rtw89_dev *rtwdev, struct sk_buff *skb_c2h, u32 le h2c_return &=RTW89_C2H_SCAN_DONE_ACK_RETURN ;break ;case H2C_FUNC_SCANOFLD : + scan_info->seq++; cond =RTW89_SCANOFLD_WAIT_COND_START ;break ;case H2C_FUNC_SCANOFLD_BE : + scan_info->seq++; cond =RTW89_SCANOFLD_BE_WAIT_COND_START ; h2c_return &=RTW89_C2H_SCAN_DONE_ACK_RETURN ;break ;
@@ -5706,10 +5709,15 @@ static void rtw89_mac_c2h_scanofld_rsp_atomic(struct rtw89_dev *rtwdev,const struct rtw89_c2h_scanofld *c2h = (const struct rtw89_c2h_scanofld *)skb->data;struct rtw89_wait_info *fw_ofld_wait = &rtwdev->mac.fw_ofld_wait; +struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info; +struct rtw89_fw_c2h_attr *attr =RTW89_SKB_C2H_CB (skb);struct rtw89_completion_data data = {};unsigned int cond;u8 status, reason; + attr->is_scan_event =1 ; + attr->scan_seq = scan_info->seq; + status =le32_get_bits (c2h->w2,RTW89_C2H_SCANOFLD_W2_STATUS ); reason =le32_get_bits (c2h->w2,RTW89_C2H_SCANOFLD_W2_RSN ); data.err = status !=RTW89_SCAN_STATUS_SUCCESS ;
drivers/net/wireless/realtek/rtw89/mac.h +25 -0
@@ -6,6 +6,7 @@#define __RTW89_MAC_H__#include "core.h" +#include "fw.h" #include "reg.h" #define MAC_MEM_DUMP_PAGE_SIZE_AX 0x40000
@@ -1583,4 +1584,28 @@ void rtw89_fwdl_secure_idmem_share_mode(struct rtw89_dev *rtwdev, u8 mode) return mac->fwdl_secure_idmem_share_mode(rtwdev, mode); } + +static inline +int rtw89_mac_scan_offload (struct rtw89_dev *rtwdev, +struct rtw89_scan_option *option, +struct rtw89_vif_link *rtwvif_link, +bool wowlan) +{ +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +int ret; + + ret = mac->scan_offload (rtwdev, option, rtwvif_link, wowlan); + +if (option->enable) { +/* +* At this point, new scan request is acknowledged by firmware, +* so scan events of previous scan request become obsoleted. +* Purge the queued scan events to prevent interference to +* current new request. +*/ +rtw89_fw_c2h_purge_obsoleted_scan_events (rtwdev); + } + +return ret; +}#endif
drivers/net/wireless/realtek/rtw89/wow.c +1 -1
@@ -1489,7 +1489,7 @@ static int rtw89_pno_scan_offload(struct rtw89_dev *rtwdev, bool enable) opt.opch_end =RTW89_CHAN_INVALID ; } - mac->scan_offload (rtwdev, &opt, rtwvif_link, true); +rtw89_mac_scan_offload (rtwdev, &opt, rtwvif_link, true);return 0 ; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/5 wifi: rtw89: check path range before using in rtw89_fw_h2c_rf_ps_info()
In reply to Ping-Ke ShihThe variable 'path' from rtw89_phy_get_syn_sel() as index of array could be 3, but array size is 2. Fortunately, current chip->rf_path_num is smaller or equal to 2, so it is safe. To prevent mistakes in the future, add a checking and avoid Coverity warnings.
Addresses-Coverity-ID: linux-next: 1644716 ("Out-of-bounds write")
Addresses-Coverity-ID: linux-next: 1644717 ("Out-of-bounds write")
--- drivers/net/wireless/realtek/rtw89/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/fw.c +1 -1
@@ -6153,7 +6153,7 @@ int rtw89_fw_h2c_rf_ps_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) path =rtw89_phy_get_syn_sel (rtwdev, rtwvif_link->phy_idx); val =rtw89_chip_chan_to_rf18_val (rtwdev, chan); -if (path >= chip->rf_path_num) { +if (path >= chip->rf_path_num || path >=NUM_OF_RTW89_FW_RFK_PATH ) {rtw89_err (rtwdev,"unsupported rf path (%d)\n" , path); ret = -ENOENT ; goto fail;
Signature · 1 line
2.25.1