rtw89: fix HW scan and complement some functions
Ping-Ke Shih
maintainerPATCH 2/6 rtw89: fix null vif pointer when hw_scan fails
In reply to Ping-Ke ShihFrom: Po Hao Huang <[email protected]>
Add this check to avoid crash by dereferencing a null pointer. When hwscan fails due to no memory or dma failure, the scan flag in ieee80211_local is cleared. So mac80211 determine that it's not hw_scan then calls sw_scan_complete() with null vif, which is also freed during the fail.
--- drivers/net/wireless/realtek/rtw89/core.c | 5 ++++- drivers/net/wireless/realtek/rtw89/fw.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +4 -1
@@ -2875,7 +2875,10 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif,void rtw89_core_scan_complete (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif,bool hw_scan) { -struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv; +struct rtw89_vif *rtwvif = vif ? (struct rtw89_vif *)vif->drv_priv :NULL ; + +if (!rtwvif) +return ;ether_addr_copy (rtwvif->mac_addr, vif->addr);rtw89_fw_h2c_cam (rtwdev, rtwvif,NULL ,NULL );
drivers/net/wireless/realtek/rtw89/fw.c +2 -2
@@ -2257,7 +2257,7 @@ static int rtw89_hw_scan_add_chan_list(struct rtw89_dev *rtwdev,list_add_tail (&ch_info->list, &chan_list); off_chan_time += ch_info->period; } -rtw89_fw_h2c_scan_list_offload (rtwdev, list_len, &chan_list); + ret =rtw89_fw_h2c_scan_list_offload (rtwdev, list_len, &chan_list); out:list_for_each_entry_safe (ch_info, tmp, &chan_list, list) {
@@ -2368,7 +2368,7 @@ int rtw89_hw_scan_offload(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,if (ret) goto out; } -rtw89_fw_h2c_scan_offload (rtwdev, &opt, rtwvif); + ret =rtw89_fw_h2c_scan_offload (rtwdev, &opt, rtwvif); out:return ret; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/6 rtw89: fix channel inconsistency during hw_scan
In reply to Ping-Ke ShihFrom: Po Hao Huang <[email protected]>
Previously channel maintained by driver could be different from the ones hardware actually is. Restore these variables back to prevent unexpected behavior.
--- drivers/net/wireless/realtek/rtw89/core.c | 2 +- drivers/net/wireless/realtek/rtw89/fw.c | 20 ++++++++++++++----- drivers/net/wireless/realtek/rtw89/fw.h | 5 +---- drivers/net/wireless/realtek/rtw89/mac.c | 15 ++++++++------ drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- 5 files changed, 27 insertions(+), 17 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +1 -1
@@ -1608,7 +1608,7 @@ static void rtw89_core_update_rx_status(struct rtw89_dev *rtwdev,if (rtwdev->scanning &&RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) { -u8 chan = hal->current_channel; +u8 chan = hal->current_primary_channel;u8 band = hal->current_band_type;enum nl80211_band nl_band;
drivers/net/wireless/realtek/rtw89/fw.c +15 -5
@@ -2339,6 +2339,9 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, rtwvif->scan_req =NULL ; rtwvif->scan_ies =NULL ; rtwdev->scan_info.scanning_vif =NULL ; + +if (rtwvif->net_type !=RTW89_NET_TYPE_NO_LINK ) +rtw89_store_op_chan (rtwdev, false); }void rtw89_hw_scan_abort (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif)
@@ -2370,15 +2373,22 @@ int rtw89_hw_scan_offload(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,return ret; } -void rtw89_store_op_chan (struct rtw89_dev *rtwdev) +void rtw89_store_op_chan (struct rtw89_dev *rtwdev,bool backup) {struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info;struct rtw89_hal *hal = &rtwdev->hal; - scan_info->op_pri_ch = hal->current_primary_channel; - scan_info->op_chan = hal->current_channel; - scan_info->op_bw = hal->current_band_width; - scan_info->op_band = hal->current_band_type; +if (backup) { + scan_info->op_pri_ch = hal->current_primary_channel; + scan_info->op_chan = hal->current_channel; + scan_info->op_bw = hal->current_band_width; + scan_info->op_band = hal->current_band_type; + }else { + hal->current_primary_channel = scan_info->op_pri_ch; + hal->current_channel = scan_info->op_chan; + hal->current_band_width = scan_info->op_bw; + hal->current_band_type = scan_info->op_band; + } }#define H2C_FW_CPU_EXCEPTION_LEN 4
drivers/net/wireless/realtek/rtw89/fw.h +1 -4
@@ -2633,17 +2633,14 @@ int rtw89_fw_msg_reg(struct rtw89_dev *rtwdev, struct rtw89_mac_c2h_info *c2h_info);int rtw89_fw_h2c_fw_log (struct rtw89_dev *rtwdev,bool enable);void rtw89_fw_st_dbg_dump (struct rtw89_dev *rtwdev); -void rtw89_store_op_chan (struct rtw89_dev *rtwdev); +void rtw89_store_op_chan (struct rtw89_dev *rtwdev,bool backup);void rtw89_hw_scan_start (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif,struct ieee80211_scan_request *req);void rtw89_hw_scan_complete (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif,bool aborted);int rtw89_hw_scan_offload (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif,bool enable); -void rtw89_hw_scan_status_report (struct rtw89_dev *rtwdev,struct sk_buff *skb); -void rtw89_hw_scan_chan_switch (struct rtw89_dev *rtwdev,struct sk_buff *skb);void rtw89_hw_scan_abort (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif); -void rtw89_store_op_chan (struct rtw89_dev *rtwdev);int rtw89_fw_h2c_trigger_cpu_exception (struct rtw89_dev *rtwdev);#endif
drivers/net/wireless/realtek/rtw89/mac.c +9 -6
@@ -3681,17 +3681,20 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *c2h,rtw89_hw_scan_complete (rtwdev, vif, false);break ;case RTW89_SCAN_ENTER_CH_NOTIFY : -if (rtw89_is_op_chan (rtwdev, band, chan)) + hal->prev_band_type = hal->current_band_type; + hal->current_band_type = band; + hal->prev_primary_channel = hal->current_primary_channel; + hal->current_primary_channel = chan; + hal->current_channel = chan; + hal->current_band_width =RTW89_CHANNEL_WIDTH_20 ; +if (rtw89_is_op_chan (rtwdev, band, chan)) { +rtw89_store_op_chan (rtwdev, false);ieee80211_wake_queues (rtwdev->hw); + }break ;default :return ; } - - hal->prev_band_type = hal->current_band_type; - hal->prev_primary_channel = hal->current_channel; - hal->current_channel = chan; - hal->current_band_type = band; } static void
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -1
@@ -350,7 +350,7 @@ static void rtw89_ops_bss_info_changed(struct ieee80211_hw *hw,rtw89_phy_set_bss_color (rtwdev, vif);rtw89_chip_cfg_txpwr_ul_tb_offset (rtwdev, vif);rtw89_mac_port_update (rtwdev, rtwvif); -rtw89_store_op_chan (rtwdev); +rtw89_store_op_chan (rtwdev, true); }else {/* Abort ongoing scan if cancel_scan isn't issued * when disconnected by peer
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/6 rtw89: pci: handle hardware watchdog timeout interrupt status
In reply to Ping-Ke ShihThis watchdog timeout status bit indicates hardware gets wrong, so run SER L2 flow that calls mac80211 to restart hardware.
--- drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/pci.c | 9 ++++++--- drivers/net/wireless/realtek/rtw89/pci.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -666,6 +666,7 @@ enum mac_ax_err_info {MAC_AX_ERR_L2_ERR_APB_BBRF_TO_RX4281 =0x2360 ,MAC_AX_ERR_L2_ERR_APB_BBRF_TO_OTHERS =0x2370 ,MAC_AX_ERR_L2_RESET_DONE =0x2400 , +MAC_AX_ERR_L2_ERR_WDT_TIMEOUT_INT =0x2599 ,MAC_AX_ERR_CPU_EXCEPTION =0x3000 ,MAC_AX_ERR_ASSERTION =0x4000 , MAC_AX_GET_ERR_MAX,
drivers/net/wireless/realtek/rtw89/pci.c +6 -3
@@ -738,6 +738,9 @@ static irqreturn_t rtw89_pci_interrupt_threadfn(int irq, void *dev)if (unlikely (isrs.halt_c2h_isrs &B_AX_HALT_C2H_INT_EN ))rtw89_ser_notify (rtwdev,rtw89_mac_get_err_status (rtwdev)); +if (unlikely (isrs.halt_c2h_isrs &B_AX_WDT_TIMEOUT_INT_EN )) +rtw89_ser_notify (rtwdev,MAC_AX_ERR_L2_ERR_WDT_TIMEOUT_INT ); +if (unlikely (rtwpci->under_recovery)) goto enable_intr;
@@ -3126,7 +3129,7 @@ static void rtw89_pci_recovery_intr_mask_v1(struct rtw89_dev *rtwdev)struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; rtwpci->ind_intrs =B_AX_HS0ISR_IND_INT_EN ; - rtwpci->halt_c2h_intrs =B_AX_HALT_C2H_INT_EN ; + rtwpci->halt_c2h_intrs =B_AX_HALT_C2H_INT_EN |B_AX_WDT_TIMEOUT_INT_EN ; rtwpci->intrs[0 ] =0 ; rtwpci->intrs[1 ] =0 ; }
@@ -3138,7 +3141,7 @@ static void rtw89_pci_default_intr_mask_v1(struct rtw89_dev *rtwdev) rtwpci->ind_intrs =B_AX_HCI_AXIDMA_INT_EN |B_AX_HS1ISR_IND_INT_EN |B_AX_HS0ISR_IND_INT_EN ; - rtwpci->halt_c2h_intrs =B_AX_HALT_C2H_INT_EN ; + rtwpci->halt_c2h_intrs =B_AX_HALT_C2H_INT_EN |B_AX_WDT_TIMEOUT_INT_EN ; rtwpci->intrs[0 ] =B_AX_TXDMA_STUCK_INT_EN |B_AX_RXDMA_INT_EN | B_AX_RXP1DMA_INT_EN |
@@ -3155,7 +3158,7 @@ static void rtw89_pci_low_power_intr_mask_v1(struct rtw89_dev *rtwdev) rtwpci->ind_intrs =B_AX_HS1ISR_IND_INT_EN |B_AX_HS0ISR_IND_INT_EN ; - rtwpci->halt_c2h_intrs =B_AX_HALT_C2H_INT_EN ; + rtwpci->halt_c2h_intrs =B_AX_HALT_C2H_INT_EN |B_AX_WDT_TIMEOUT_INT_EN ; rtwpci->intrs[0 ] =0 ; rtwpci->intrs[1 ] =B_AX_GPIO18_INT_EN ; }
drivers/net/wireless/realtek/rtw89/pci.h +1 -0
@@ -94,6 +94,7 @@/* Interrupts */ #define R_AX_HIMR0 0x01A0 +#define B_AX_WDT_TIMEOUT_INT_EN BIT(22)#define B_AX_HALT_C2H_INT_EN BIT(21)#define R_AX_HISR0 0x01A4
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainercover rtw89: fix HW scan and complement some functions
Patches in this patchset don't have functional dependency, but I submit them together to prevent merge conflict.
Fix some bugs related HW scan by first two patches. Third patch is to handle more one SER event to recover firmware and hardware. Forth patch is to re-calibrate RX DCK if thermal value is changed, and then we can keep RF performance as expectation.
Since 8852CE can support 6GHz band, add SAR 6GHz frequency ranges by fifth patch.
The last patch is to fix BSSID mask setting introduced by 8852CE chip, and I do support of multiple BSSID as well.
Ping-Ke Shih (3):
rtw89: pci: handle hardware watchdog timeout interrupt status
rtw89: 8852c: rfk: re-calibrate RX DCK once thermal changes a lot
rtw89: support MULTI_BSSID and correct BSSID mask of H2C
Po Hao Huang (2):
rtw89: fix channel inconsistency during hw_scan
rtw89: fix null vif pointer when hw_scan fails
Zong-Zhe Yang (1):
rtw89: sar: adjust and support SAR on 6GHz band
drivers/net/wireless/realtek/rtw89/cam.c | 9 ++ drivers/net/wireless/realtek/rtw89/cam.h | 5 + drivers/net/wireless/realtek/rtw89/core.c | 8 +- drivers/net/wireless/realtek/rtw89/core.h | 24 ++- drivers/net/wireless/realtek/rtw89/debug.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 24 ++- drivers/net/wireless/realtek/rtw89/fw.h | 5 +- drivers/net/wireless/realtek/rtw89/mac.c | 15 +- drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- drivers/net/wireless/realtek/rtw89/pci.c | 9 +- drivers/net/wireless/realtek/rtw89/pci.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + .../net/wireless/realtek/rtw89/rtw8852c_rfk.c | 27 ++++ .../net/wireless/realtek/rtw89/rtw8852c_rfk.h | 1 + drivers/net/wireless/realtek/rtw89/sar.c | 140 +++++++++++++++--- 16 files changed, 230 insertions(+), 43 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/6 rtw89: 8852c: rfk: re-calibrate RX DCK once thermal changes a lot
RX DCK is receiver DC calibration. To keep good RF performance, do this calibration again if the delta of thermal value from the last calibration is more than 8.
--- drivers/net/wireless/realtek/rtw89/core.h | 5 ++++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + .../net/wireless/realtek/rtw89/rtw8852c_rfk.c | 27 +++++++++++++++++++ .../net/wireless/realtek/rtw89/rtw8852c_rfk.h | 1 + 4 files changed, 34 insertions(+)
drivers/net/wireless/realtek/rtw89/core.h +5 -0
@@ -2646,6 +2646,10 @@ struct rtw89_lck_info {u8 thermal[RF_PATH_MAX ]; }; +struct rtw89_rx_dck_info { +u8 thermal[RF_PATH_MAX ]; +}; +struct rtw89_iqk_info {bool lok_cor_fail[RTW89_IQK_CHS_NR ][RTW89_IQK_PATH_NR ];bool lok_fin_fail[RTW89_IQK_CHS_NR ][RTW89_IQK_PATH_NR ];
@@ -3125,6 +3129,7 @@ struct rtw89_dev {struct rtw89_dpk_info dpk;struct rtw89_mcc_info mcc;struct rtw89_lck_info lck; +struct rtw89_rx_dck_info rx_dck;bool is_tssi_mode[RF_PATH_MAX ];bool is_bt_iqk_timeout;
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -1861,6 +1861,7 @@ static void rtw8852c_rfk_track(struct rtw89_dev *rtwdev) {rtw8852c_dpk_track (rtwdev);rtw8852c_lck_track (rtwdev); +rtw8852c_rx_dck_track (rtwdev); } static u32 rtw8852c_bb_cal_txpwr_ref(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c +27 -0
@@ -3864,6 +3864,7 @@ void rtw8852c_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)void rtw8852c_rx_dck (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy,bool is_afe) { +struct rtw89_rx_dck_info *rx_dck = &rtwdev->rx_dck;u8 path, kpath;u32 rf_reg5;
@@ -3883,6 +3884,7 @@ void rtw8852c_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy, bool is_artw89_write_rf (rtwdev, path,RR_RSV1 ,RR_RSV1_RST ,0x0 );rtw89_write_rf (rtwdev, path,RR_MOD ,RR_MOD_MASK ,RR_MOD_V_RX );_set_rx_dck (rtwdev, phy, path, is_afe); + rx_dck->thermal[path] =ewma_thermal_read (&rtwdev->phystat.avg_thermal[path]);rtw89_write_rf (rtwdev, path,RR_RSV1 ,RFREG_MASK , rf_reg5);if (rtwdev->is_tssi_mode[path])
@@ -3891,6 +3893,31 @@ void rtw8852c_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy, bool is_a } } +#define RTW8852C_RX_DCK_TH 8 + +void rtw8852c_rx_dck_track (struct rtw89_dev *rtwdev) +{ +struct rtw89_rx_dck_info *rx_dck = &rtwdev->rx_dck; +u8 cur_thermal; +int delta; +int path; + +for (path =0 ; path <RF_PATH_NUM_8852C ; path++) { + cur_thermal = +ewma_thermal_read (&rtwdev->phystat.avg_thermal[path]); + delta =abs ((int )cur_thermal - rx_dck->thermal[path]); + +rtw89_debug (rtwdev,RTW89_DBG_RFK_TRACK , +"[RX_DCK] path=%d current thermal=0x%x delta=0x%x\n" , + path, cur_thermal, delta); + +if (delta >=RTW8852C_RX_DCK_TH ) { +rtw8852c_rx_dck (rtwdev,RTW89_PHY_0 , false); +return ; + } + } +} +void rtw8852c_dpk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) {u32 tx_en;
drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h +1 -0
@@ -12,6 +12,7 @@ void rtw8852c_rck(struct rtw89_dev *rtwdev);void rtw8852c_dack (struct rtw89_dev *rtwdev);void rtw8852c_iqk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx);void rtw8852c_rx_dck (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx,bool is_afe); +void rtw8852c_rx_dck_track (struct rtw89_dev *rtwdev);void rtw8852c_dpk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy);void rtw8852c_dpk_track (struct rtw89_dev *rtwdev);void rtw8852c_tssi (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/6 rtw89: support MULTI_BSSID and correct BSSID mask of H2C
In reply to Ping-Ke ShihThe BSSID mask of H2C is used to match BSSID of receiving packets. Normally, we set six bits BSSID mask to exactly match BSSID of packets sent by target AP. After we support multiple BSSID, it could connect a nontransmitted BSSID, so we can only match first five bytes of BSSID. That means we could possibly receive other AP's packets if only the last byte of BSSID is different from target AP.
--- drivers/net/wireless/realtek/rtw89/cam.c | 9 +++++++++ drivers/net/wireless/realtek/rtw89/cam.h | 5 +++++ drivers/net/wireless/realtek/rtw89/core.c | 1 + 3 files changed, 15 insertions(+)
drivers/net/wireless/realtek/rtw89/cam.c +9 -0
@@ -599,14 +599,23 @@ int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)int rtw89_cam_fill_bssid_cam_info (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,u8 *cmd) { +#define BSSID_MATCH_ALL GENMASK(5, 0) +#define BSSID_MATCH_5_BYTES GENMASK(4, 0)struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif);struct rtw89_bssid_cam_entry *bssid_cam = &rtwvif->bssid_cam;u8 bss_color = vif->bss_conf.he_bss_color.color; +u8 bss_mask; + +if (vif->bss_conf.nontransmitted) + bss_mask =BSSID_MATCH_5_BYTES ; +else + bss_mask =BSSID_MATCH_ALL ;FWCMD_SET_ADDR_BSSID_IDX (cmd, bssid_cam->bssid_cam_idx);FWCMD_SET_ADDR_BSSID_OFFSET (cmd, bssid_cam->offset);FWCMD_SET_ADDR_BSSID_LEN (cmd, bssid_cam->len);FWCMD_SET_ADDR_BSSID_VALID (cmd, bssid_cam->valid); +FWCMD_SET_ADDR_BSSID_MASK (cmd, bss_mask);FWCMD_SET_ADDR_BSSID_BB_SEL (cmd, bssid_cam->phy_idx);FWCMD_SET_ADDR_BSSID_BSS_COLOR (cmd, bss_color);
drivers/net/wireless/realtek/rtw89/cam.h +5 -0
@@ -309,6 +309,11 @@ static inline void FWCMD_SET_ADDR_BSSID_BB_SEL(void *cmd, u32 value)le32p_replace_bits ((__le32 *)(cmd) +13 , value,BIT (1 )); } +static inline void FWCMD_SET_ADDR_BSSID_MASK (void *cmd,u32 value) +{ +le32p_replace_bits ((__le32 *)(cmd) +13 , value,GENMASK (7 ,2 )); +} +static inline void FWCMD_SET_ADDR_BSSID_BSS_COLOR (void *cmd,u32 value) {le32p_replace_bits ((__le32 *)(cmd) +13 , value,GENMASK (13 ,8 ));
drivers/net/wireless/realtek/rtw89/core.c +1 -0
@@ -3011,6 +3011,7 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev)ieee80211_hw_set (hw,SUPPORTS_PS );ieee80211_hw_set (hw,SUPPORTS_DYNAMIC_PS );ieee80211_hw_set (hw,SINGLE_SCAN_ON_ALL_BANDS ); +ieee80211_hw_set (hw,SUPPORTS_MULTI_BSSID ); hw->wiphy->interface_modes =BIT (NL80211_IFTYPE_STATION ) |BIT (NL80211_IFTYPE_AP );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/6 rtw89: sar: adjust and support SAR on 6GHz band
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Since SAR is more expected to follow U-NII bands to plan subbands, division of 6GHz band is quite different from defined enum of subbands which is used by PHY in most cases. It's hard and painful if we want to keep using the same enum on SAR. So, we introduce another enum for SAR subbands and adjust SAR flow to use it.
Besides, since 6GHz SAR subbands won't be divided with edge alignment, some cases will span two SAR subbands. For these cases, we describe them within an array of rtw89_sar_span and take the smaller one between SAR settings of the two subbands.
--- drivers/net/wireless/realtek/rtw89/core.h | 19 ++- drivers/net/wireless/realtek/rtw89/debug.h | 1 + drivers/net/wireless/realtek/rtw89/sar.c | 140 ++++++++++++++++++--- 3 files changed, 140 insertions(+), 20 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +17 -2
@@ -2550,9 +2550,24 @@ enum rtw89_sar_sources { RTW89_SAR_SOURCE_NR, }; +enum rtw89_sar_subband { +RTW89_SAR_2GHZ_SUBBAND , +RTW89_SAR_5GHZ_SUBBAND_1_2 ,/* U-NII-1 and U-NII-2 */ +RTW89_SAR_5GHZ_SUBBAND_2_E ,/* U-NII-2-Extended */ +RTW89_SAR_5GHZ_SUBBAND_3 ,/* U-NII-3 */ +RTW89_SAR_6GHZ_SUBBAND_5_L ,/* U-NII-5 lower part */ +RTW89_SAR_6GHZ_SUBBAND_5_H ,/* U-NII-5 higher part */ +RTW89_SAR_6GHZ_SUBBAND_6 ,/* U-NII-6 */ +RTW89_SAR_6GHZ_SUBBAND_7_L ,/* U-NII-7 lower part */ +RTW89_SAR_6GHZ_SUBBAND_7_H ,/* U-NII-7 higher part */ +RTW89_SAR_6GHZ_SUBBAND_8 ,/* U-NII-8 */ + +RTW89_SAR_SUBBAND_NR , +}; +struct rtw89_sar_cfg_common { -bool set[RTW89_SUBBAND_NR ]; -s32 cfg[RTW89_SUBBAND_NR ]; +bool set[RTW89_SAR_SUBBAND_NR ]; +s32 cfg[RTW89_SAR_SUBBAND_NR ]; };struct rtw89_sar_info {
drivers/net/wireless/realtek/rtw89/debug.h +1 -0
@@ -24,6 +24,7 @@ enum rtw89_debug_mask {RTW89_DBG_BTC =BIT (13 ),RTW89_DBG_BF =BIT (14 ),RTW89_DBG_HW_SCAN =BIT (15 ), + RTW89_DBG_SAR = BIT(16), }; enum rtw89_debug_mac_reg_sel {
drivers/net/wireless/realtek/rtw89/sar.c +122 -18
180 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 6/6] rtw89: support MULTI_BSSID and correct BSSID mask of H2C
In reply to Ping-Ke ShihQuoted 19 lines · Ping-Ke Shih
The BSSID mask of H2C is used to match BSSID of receiving packets. Normally, we set six bits BSSID mask to exactly match BSSID of packets sent by target AP. After we support multiple BSSID, it could connect a nontransmitted BSSID, so we can only match first five bytes of BSSID. That means we could possibly receive other AP's packets if only the last byte of BSSID is different from target AP.
Signed-off-by Ping-Ke Shih <[email protected]>--- drivers/net/wireless/realtek/rtw89/cam.c | 9 +++++++++ drivers/net/wireless/realtek/rtw89/cam.h | 5 +++++ drivers/net/wireless/realtek/rtw89/core.c | 1 + 3 files changed, 15 insertions(+)drivers/net/wireless/realtek/rtw89/cam.c +0
-0
drivers/net/wireless/realtek/rtw89/cam.c int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) · line 603
Quoted 5 lines
drivers/net/wireless/realtek/rtw89/cam.c +2
-0@@ -599,14 +599,23 @@ int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)int rtw89_cam_fill_bssid_cam_info (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,u8 *cmd) { +#define BSSID_MATCH_ALL GENMASK(5, 0) +#define BSSID_MATCH_5_BYTES GENMASK(4, 0)
Please define these elsewhere, like in the beginning of the file or something. And please add RTW89_ prefix.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 1/6] rtw89: fix channel inconsistency during hw_scan
In reply to Ping-Ke ShihQuoted 8 lines · Ping-Ke Shih
From: Po Hao Huang <[email protected]>
Previously channel maintained by driver could be different from the ones hardware actually is. Restore these variables back to prevent unexpected behavior.
Signed-off-by Po Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
5 patches applied to wireless-next.git, thanks.
28000f7baa9c rtw89: fix channel inconsistency during hw_scan 6d7d1fef3f18 rtw89: fix null vif pointer when hw_scan fails 768992eb92ec rtw89: pci: handle hardware watchdog timeout interrupt status e3d365ff0b6c rtw89: 8852c: rfk: re-calibrate RX DCK once thermal changes a lot 425671f03b4e rtw89: sar: adjust and support SAR on 6GHz band
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches