wifi: rtw89: more finetune on MCC feature
Ping-Ke Shih
maintainercover wifi: rtw89: more finetune on MCC feature
To be better user experience during scanning on MCC, consider PD (packet detection) and DIG (dynamic initial gain), and add second connection channel as back OP channel to firmware.
Chih-Kang Chang (9):
wifi: rtw89: mcc: add H2C command to support different PD level in MCC
wifi: rtw89: add DIG suspend/resume flow when scan and connection
wifi: rtw89: mcc: enlarge GO NoA duration to cover channel switching
time
wifi: rtw89: mcc: when MCC stop forcing to stay at GO role
wifi: rtw89: extend HW scan of WiFi 7 chips for extra OP chan when
concurrency
wifi: rtw89: mcc: solve GO's TBTT change and TBTT too close to NoA
issue
wifi: rtw89: check LPS H2C command complete by C2H reg instead of done
ack
wifi: rtw89: update SER L2 type default value
wifi: rtw89: tweak tx wake notify matching condition
Zong-Zhe Yang (5):
wifi: rtw89: introduce fw feature group and redefine CRASH_TRIGGER
wifi: rtw89: 8852bt: configure FW version for SCAN_OFFLOAD_EXTRA_OP
feature
wifi: rtw89: 8852bt: implement RFK multi-channel handling and support
chanctx up to 2
wifi: rtw89: 8852b: configure FW version for SCAN_OFFLOAD_EXTRA_OP
feature
wifi: rtw89: 8852b: implement RFK multi-channel handling and support
chanctx up to 2
drivers/net/wireless/realtek/rtw89/chan.c | 187 +++++++++++++-- drivers/net/wireless/realtek/rtw89/chan.h | 15 ++ drivers/net/wireless/realtek/rtw89/core.c | 24 +- drivers/net/wireless/realtek/rtw89/core.h | 28 ++- drivers/net/wireless/realtek/rtw89/debug.c | 2 +- drivers/net/wireless/realtek/rtw89/fw.c | 225 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/fw.h | 39 ++- drivers/net/wireless/realtek/rtw89/mac.c | 11 +- drivers/net/wireless/realtek/rtw89/mac80211.c | 5 + drivers/net/wireless/realtek/rtw89/phy.c | 222 +++++++++++++++-- drivers/net/wireless/realtek/rtw89/phy.h | 2 + drivers/net/wireless/realtek/rtw89/ps.c | 28 ++- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 12 +- .../net/wireless/realtek/rtw89/rtw8852b_rfk.c | 77 ++++-- .../net/wireless/realtek/rtw89/rtw8852b_rfk.h | 3 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 12 +- .../wireless/realtek/rtw89/rtw8852bt_rfk.c | 69 ++++-- .../wireless/realtek/rtw89/rtw8852bt_rfk.h | 3 + drivers/net/wireless/realtek/rtw89/wow.c | 2 +- 19 files changed, 829 insertions(+), 137 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/14 wifi: rtw89: mcc: add H2C command to support different PD level in MCC
From: Chih-Kang Chang <[email protected]>
Packet detection(PD) lower bound is the threshold for sensing packet, and it is dynamically calculated based on RSSI. In MCC, the two interfaces have different RSSI values, so it is necessary to set different values to ensure packets can be received. Therefore, add H2C command to let firmware to switch PD lower bound when MCC mode.
--- drivers/net/wireless/realtek/rtw89/chan.c | 25 ++++ drivers/net/wireless/realtek/rtw89/chan.h | 5 + drivers/net/wireless/realtek/rtw89/fw.c | 53 +++++++ drivers/net/wireless/realtek/rtw89/fw.h | 25 ++++ drivers/net/wireless/realtek/rtw89/phy.c | 172 +++++++++++++++++++--- 5 files changed, 257 insertions(+), 23 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +25 -0
@@ -2371,6 +2371,7 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev,rtw89_chanctx_notify (rtwdev,RTW89_CHANCTX_STATE_MCC_STOP );rtw89_mcc_stop_beacon_noa (rtwdev); +rtw89_fw_h2c_mcc_dig (rtwdev,RTW89_CHANCTX_0 ,0 ,0 , false);rtw89_mcc_prepare (rtwdev, false); }
@@ -2622,6 +2623,30 @@ static void rtw89_mcc_update_limit(struct rtw89_dev *rtwdev)rtw89_iterate_mcc_roles (rtwdev, rtw89_mcc_upd_lmt_iterator,NULL ); } +static int rtw89_mcc_get_links_iterator (struct rtw89_dev *rtwdev, +struct rtw89_mcc_role *mcc_role, +unsigned int ordered_idx, +void *data) +{ +struct rtw89_mcc_links_info *info = data; + + info->links[ordered_idx] = mcc_role->rtwvif_link; +return 0 ; +} + +void rtw89_mcc_get_links (struct rtw89_dev *rtwdev,struct rtw89_mcc_links_info *info) +{ +enum rtw89_entity_mode mode; + +memset (info,0 ,sizeof (*info)); + + mode =rtw89_get_entity_mode (rtwdev); +if (unlikely (mode !=RTW89_ENTITY_MODE_MCC )) +return ; + +rtw89_iterate_mcc_roles (rtwdev, rtw89_mcc_get_links_iterator, info); +} +void rtw89_chanctx_work (struct wiphy *wiphy,struct wiphy_work *work) { struct rtw89_dev *rtwdev = container_of(work, struct rtw89_dev,
drivers/net/wireless/realtek/rtw89/chan.h +5 -0
@@ -178,6 +178,11 @@ const struct rtw89_chan *__rtw89_mgnt_chan_get(struct rtw89_dev *rtwdev,#define rtw89_mgnt_chan_get (rtwdev, link_index) \ __rtw89_mgnt_chan_get(rtwdev, __func__, link_index) +struct rtw89_mcc_links_info { +struct rtw89_vif_link *links[NUM_OF_RTW89_MCC_ROLES ]; +}; + +void rtw89_mcc_get_links (struct rtw89_dev *rtwdev,struct rtw89_mcc_links_info *info);void rtw89_mcc_prepare_done_work (struct wiphy *wiphy,struct wiphy_work *work); int rtw89_chanctx_ops_add(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/fw.c +53 -0
59 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +25 -0
@@ -4341,6 +4341,7 @@ enum rtw89_mrc_h2c_func {#define H2C_FUNC_OUTSRC_RA_MACIDCFG 0x0#define H2C_CL_OUTSRC_DM 0x2 +#define H2C_FUNC_FW_MCC_DIG 0x6#define H2C_FUNC_FW_LPS_CH_INFO 0xb#define H2C_FUNC_FW_LPS_ML_CMN_INFO 0xe
@@ -4378,6 +4379,27 @@ struct rtw89_fw_h2c_rf_get_mccch_v0 {__le32 current_band_type; } __packed; +struct rtw89_h2c_mcc_dig { +__le32 w0; +__le32 w1; +__le32 w2; +} __packed; + +#define RTW89_H2C_MCC_DIG_W0_REG_CNT GENMASK(7, 0) +#define RTW89_H2C_MCC_DIG_W0_DM_EN BIT(8) +#define RTW89_H2C_MCC_DIG_W0_IDX GENMASK(10, 9) +#define RTW89_H2C_MCC_DIG_W0_SET BIT(11) +#define RTW89_H2C_MCC_DIG_W0_PHY0_EN BIT(12) +#define RTW89_H2C_MCC_DIG_W0_PHY1_EN BIT(13) +#define RTW89_H2C_MCC_DIG_W0_CENTER_CH GENMASK(23, 16) +#define RTW89_H2C_MCC_DIG_W0_BAND_TYPE GENMASK(31, 24) +#define RTW89_H2C_MCC_DIG_W1_ADDR_LSB GENMASK(7, 0) +#define RTW89_H2C_MCC_DIG_W1_ADDR_MSB GENMASK(15, 8) +#define RTW89_H2C_MCC_DIG_W1_BMASK_LSB GENMASK(23, 16) +#define RTW89_H2C_MCC_DIG_W1_BMASK_MSB GENMASK(31, 24) +#define RTW89_H2C_MCC_DIG_W2_VAL_LSB GENMASK(7, 0) +#define RTW89_H2C_MCC_DIG_W2_VAL_MSB GENMASK(15, 8) +#define NUM_OF_RTW89_FW_RFK_PATH 2#define NUM_OF_RTW89_FW_RFK_TBL 3
@@ -4774,6 +4796,9 @@ int rtw89_fw_h2c_rf_ntfy_mcc(struct rtw89_dev *rtwdev);int rtw89_fw_h2c_rf_ps_info (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif);int rtw89_fw_h2c_rf_pre_ntfy (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx); +int rtw89_fw_h2c_mcc_dig (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_idx chanctx_idx, +u8 mcc_role_idx,u8 pd_val,bool en);int rtw89_fw_h2c_rf_tssi (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx,const struct rtw89_chan *chan,enum rtw89_tssi_mode tssi_mode); int rtw89_fw_h2c_rf_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,
drivers/net/wireless/realtek/rtw89/phy.c +149 -23
225 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/14] wifi: rtw89: mcc: add H2C command to support different PD level in MCC
Quoted 10 lines · Ping-Ke Shih
From: Chih-Kang Chang <[email protected]>
Packet detection(PD) lower bound is the threshold for sensing packet, and it is dynamically calculated based on RSSI. In MCC, the two interfaces have different RSSI values, so it is necessary to set different values to ensure packets can be received. Therefore, add H2C command to let firmware to switch PD lower bound when MCC mode.
Signed-off-by Chih-Kang Chang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
14 patch(es) applied to rtw-next branch of rtw.git, thanks.
ad22869bc5a6 wifi: rtw89: mcc: add H2C command to support different PD level in MCC 9126020ab03c wifi: rtw89: add DIG suspend/resume flow when scan and connection 025e39032df5 wifi: rtw89: mcc: enlarge GO NoA duration to cover channel switching time 6332feafe37f wifi: rtw89: mcc: when MCC stop forcing to stay at GO role d0b87d9eaf76 wifi: rtw89: extend HW scan of WiFi 7 chips for extra OP chan when concurrency 83f84f263420 wifi: rtw89: mcc: solve GO's TBTT change and TBTT too close to NoA issue 65093fab65cb wifi: rtw89: check LPS H2C command complete by C2H reg instead of done ack 5693bdd58de4 wifi: rtw89: introduce fw feature group and redefine CRASH_TRIGGER e044f5d40f49 wifi: rtw89: update SER L2 type default value094bb62c580d wifi: rtw89: tweak tx wake notify matching condition868676662b08 wifi: rtw89: 8852bt: configure FW version for SCAN_OFFLOAD_EXTRA_OP feature 21911ad80512 wifi: rtw89: 8852bt: implement RFK multi-channel handling and support chanctx up to 2 504937dbaddb wifi: rtw89: 8852b: configure FW version for SCAN_OFFLOAD_EXTRA_OP feature cefcf74ae026 wifi: rtw89: 8852b: implement RFK multi-channel handling and support chanctx up to 2
Ping-Ke Shih
maintainerPATCH 2/14 wifi: rtw89: add DIG suspend/resume flow when scan and connection
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
The PD lower bound set after one interface is connected, If second interface needs to connect, packets might not be detected because the PD lower bound is too high. Therefore, a DIG suspend/resume flow is added to decrease the PD lower bound during scanning or connection, and the original PD level is resumed afterward.
--- drivers/net/wireless/realtek/rtw89/chan.c | 4 ++ drivers/net/wireless/realtek/rtw89/core.c | 2 + drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/fw.c | 2 + drivers/net/wireless/realtek/rtw89/phy.c | 50 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/phy.h | 2 + 6 files changed, 62 insertions(+)
drivers/net/wireless/realtek/rtw89/chan.c +4 -0
@@ -7,6 +7,7 @@#include "debug.h" #include "fw.h" #include "mac.h" +#include "phy.h" #include "ps.h" #include "sar.h" #include "util.h"
@@ -2281,6 +2282,7 @@ static int rtw89_mcc_start(struct rtw89_dev *rtwdev)rtw89_chanctx_notify (rtwdev,RTW89_CHANCTX_STATE_MCC_START );rtw89_mcc_start_beacon_noa (rtwdev); +rtw89_phy_dig_suspend (rtwdev);rtw89_mcc_prepare (rtwdev, true);return 0 ;
@@ -2372,6 +2374,7 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev,rtw89_mcc_stop_beacon_noa (rtwdev);rtw89_fw_h2c_mcc_dig (rtwdev,RTW89_CHANCTX_0 ,0 ,0 , false); +rtw89_phy_dig_resume (rtwdev, true);rtw89_mcc_prepare (rtwdev, false); }
@@ -2715,6 +2718,7 @@ void rtw89_queue_chanctx_change(struct rtw89_dev *rtwdev,return ;case RTW89_ENTITY_MODE_MCC_PREPARE : delay =ieee80211_tu_to_usec (RTW89_CHANCTX_TIME_MCC_PREPARE ); +rtw89_phy_dig_suspend (rtwdev);break ;case RTW89_ENTITY_MODE_MCC : delay =ieee80211_tu_to_usec (RTW89_CHANCTX_TIME_MCC );
drivers/net/wireless/realtek/rtw89/core.c +2 -0
@@ -4082,6 +4082,7 @@ int rtw89_core_sta_link_add(struct rtw89_dev *rtwdev, &rtwsta_link->tx_retry);rtw89_mac_set_tx_retry_limit (rtwdev, rtwsta_link, false,60 ); } +rtw89_phy_dig_suspend (rtwdev); }else if (vif->type ==NL80211_IFTYPE_AP || sta->tdls) { ret =rtw89_mac_set_macid_pause (rtwdev, rtwsta_link->mac_id, false);if (ret) {
@@ -4270,6 +4271,7 @@ int rtw89_core_sta_link_assoc(struct rtw89_dev *rtwdev,if (vif->p2p)rtw89_mac_set_tx_retry_limit (rtwdev, rtwsta_link, false, rtwsta_link->tx_retry); +rtw89_phy_dig_resume (rtwdev, false); }rtw89_assoc_link_set (rtwsta_link);
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -5243,8 +5243,10 @@ struct rtw89_dig_info {s8 tia_gain_a[TIA_GAIN_NUM ];s8 tia_gain_g[TIA_GAIN_NUM ];s8 *tia_gain; +u32 bak_dig;bool is_linked_pre;bool bypass_dig; +bool pause_dig; };enum rtw89_multi_cfo_mode {
drivers/net/wireless/realtek/rtw89/fw.c +2 -0
@@ -7798,6 +7798,7 @@ int rtw89_hw_scan_start(struct rtw89_dev *rtwdev,rtw89_write32_mask (rtwdev, reg,B_AX_RX_FLTR_CFG_MASK , rx_fltr);rtw89_chanctx_pause (rtwdev, &pause_parm); +rtw89_phy_dig_suspend (rtwdev);if (mode ==RTW89_ENTITY_MODE_MCC )rtw89_hw_scan_update_beacon_noa (rtwdev, req);
@@ -7831,6 +7832,7 @@ static int rtw89_hw_scan_complete_cb(struct rtw89_dev *rtwdev, void *data)ieee80211_wake_queues (rtwdev->hw);rtw89_mac_port_cfg_rx_sync (rtwdev, rtwvif_link, true);rtw89_mac_enable_beacon_for_ap_vifs (rtwdev, true); +rtw89_phy_dig_resume (rtwdev, true);rtw89_hw_scan_cleanup (rtwdev, rtwvif_link);
drivers/net/wireless/realtek/rtw89/phy.c +50 -0
68 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/phy.h +2 -0
@@ -1010,6 +1010,8 @@ void rtw89_phy_set_phy_regs(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u32 val);void rtw89_phy_dig_reset (struct rtw89_dev *rtwdev,struct rtw89_bb_ctx *bb);void rtw89_phy_dig (struct rtw89_dev *rtwdev); +void rtw89_phy_dig_suspend (struct rtw89_dev *rtwdev); +void rtw89_phy_dig_resume (struct rtw89_dev *rtwdev,bool restore);void rtw89_phy_tx_path_div_track (struct rtw89_dev *rtwdev);void rtw89_phy_antdiv_parse (struct rtw89_dev *rtwdev,struct rtw89_rx_phy_ppdu *phy_ppdu);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/14 wifi: rtw89: mcc: enlarge GO NoA duration to cover channel switching time
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
MCC require time to switch channel when changing timeslot. If GC TX nulldata 0 while GO is switching channel, GO can't receive it. Therefore, enlarge the GO NoA duration to cover the channel switching time.
However, the enlarged NoA duration might cause GC's timeslot less than minimum of RX beacon time. Therefore, adjust strict and anchor pattern condition to avoid it.
--- drivers/net/wireless/realtek/rtw89/chan.c | 7 ++++--- drivers/net/wireless/realtek/rtw89/chan.h | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +4 -3
@@ -1116,7 +1116,7 @@ static int __rtw89_mcc_calc_pattern_strict(struct rtw89_dev *rtwdev,struct rtw89_mcc_role *ref = &mcc->role_ref;struct rtw89_mcc_role *aux = &mcc->role_aux;struct rtw89_mcc_config *config = &mcc->config; -u16 min_tob =RTW89_MCC_EARLY_RX_BCN_TIME ; +u16 min_tob =RTW89_MCC_EARLY_RX_BCN_TIME +RTW89_MCC_SWITCH_CH_TIME ;u16 min_toa =RTW89_MCC_MIN_RX_BCN_TIME ;u16 bcn_ofst = config->beacon_offset;s16 upper_toa_ref, lower_toa_ref;
@@ -1272,11 +1272,11 @@ static int __rtw89_mcc_calc_pattern_anchor(struct rtw89_dev *rtwdev,u16 bcn_ofst = config->beacon_offset;bool small_bcn_ofst; -if (bcn_ofst <RTW89_MCC_MIN_RX_BCN_TIME ) +if (bcn_ofst <RTW89_MCC_MIN_RX_BCN_WITH_SWITCH_CH_TIME ) small_bcn_ofst = true;else if (bcn_ofst < aux->duration - aux->limit.max_toa) small_bcn_ofst = true; -else if (mcc_intvl - bcn_ofst <RTW89_MCC_MIN_RX_BCN_TIME ) +else if (mcc_intvl - bcn_ofst <RTW89_MCC_MIN_RX_BCN_WITH_SWITCH_CH_TIME ) small_bcn_ofst = false;else return -EPERM ;
@@ -2171,6 +2171,7 @@ static void rtw89_mcc_handle_beacon_noa(struct rtw89_dev *rtwdev, bool enable)rtw89_p2p_noa_renew (rtwvif_go);if (enable) { + duration +=RTW89_MCC_SWITCH_CH_TIME ; noa_desc.start_time =cpu_to_le32 (start_time); noa_desc.interval =cpu_to_le32 (ieee80211_tu_to_usec (interval)); noa_desc.duration =cpu_to_le32 (ieee80211_tu_to_usec (duration));
drivers/net/wireless/realtek/rtw89/chan.h +4 -0
@@ -18,6 +18,7 @@#define RTW89_MCC_EARLY_RX_BCN_TIME 5#define RTW89_MCC_MIN_RX_BCN_TIME 10#define RTW89_MCC_DFLT_BCN_OFST_TIME 40 +#define RTW89_MCC_SWITCH_CH_TIME 3#define RTW89_MCC_PROBE_TIMEOUT 100#define RTW89_MCC_PROBE_MAX_TRIES 3
@@ -28,6 +29,9 @@#define RTW89_MCC_MIN_STA_DURATION \ (RTW89_MCC_EARLY_RX_BCN_TIME + RTW89_MCC_MIN_RX_BCN_TIME) +#define RTW89_MCC_MIN_RX_BCN_WITH_SWITCH_CH_TIME \ + (RTW89_MCC_MIN_RX_BCN_TIME + RTW89_MCC_SWITCH_CH_TIME) +#define RTW89_MCC_DFLT_GROUP 0#define RTW89_MCC_NEXT_GROUP (cur) (((cur) + 1) % 4)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/14 wifi: rtw89: mcc: when MCC stop forcing to stay at GO role
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
MCC stop might triggered by scan, and need to force to stay at GO role to keep TX beacon. Also, AX chips need to TX more 3 beacons to ensure GC can receive once NoA beacon before scan when GC in courtesy mode. BE chips no needs to TX 3 more beacon because it can TX beacon every 200TU during scan, even GC in courtesy mode can receive beacon every 600TU.
--- drivers/net/wireless/realtek/rtw89/chan.c | 8 ++++++++ drivers/net/wireless/realtek/rtw89/core.h | 3 ++- drivers/net/wireless/realtek/rtw89/fw.c | 21 ++++++++++++++++++--- drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/wow.c | 2 +- 5 files changed, 30 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +8 -0
@@ -2336,9 +2336,11 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev,struct rtw89_hal *hal = &rtwdev->hal;struct rtw89_mcc_info *mcc = &rtwdev->mcc;struct rtw89_mcc_role *ref = &mcc->role_ref; +struct rtw89_mcc_role *aux = &mcc->role_aux;struct rtw89_mcc_stop_sel sel = { .hint.target = pause ? pause->trigger :NULL , }; +bool rsn_scan;int ret;if (!pause) {
@@ -2346,6 +2348,12 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev,bitmap_zero (hal->changes,NUM_OF_RTW89_CHANCTX_CHANGES ); } + rsn_scan = pause && pause->rsn ==RTW89_CHANCTX_PAUSE_REASON_HW_SCAN ; +if (rsn_scan && ref->is_go) + sel.hint.target = ref->rtwvif_link; +else if (rsn_scan && aux->is_go) + sel.hint.target = aux->rtwvif_link; +/* by default, stop at ref */ rtw89_iterate_mcc_roles (rtwdev, rtw89_mcc_stop_sel_iterator, &sel);if (!sel.filled)
drivers/net/wireless/realtek/rtw89/core.h +2 -1
@@ -3860,7 +3860,7 @@ struct rtw89_scan_option {u16 slow_pd;u16 norm_cy;u8 opch_end; -u16 delay; +u16 delay;/* in unit of ms */ u64 prohib_chan;enum rtw89_phy_idx band;enum rtw89_scan_be_operation operation;
@@ -5549,6 +5549,7 @@ struct rtw89_hw_scan_info {struct rtw89_hw_scan_extra_op extra_op;bool connected;bool abort; +u16 delay;/* in unit of ms */ };enum rtw89_phy_bb_gain_band {
drivers/net/wireless/realtek/rtw89/fw.c +18 -3
@@ -5583,7 +5583,6 @@ int rtw89_fw_h2c_scan_list_offload_be(struct rtw89_dev *rtwdev, int ch_num,return 0 ; } -#define RTW89_SCAN_DELAY_TSF_UNIT 1000000 int rtw89_fw_h2c_scan_offload_ax(struct rtw89_dev *rtwdev, struct rtw89_scan_option *option, struct rtw89_vif_link *rtwvif_link,
@@ -5615,7 +5614,7 @@ int rtw89_fw_h2c_scan_offload_ax(struct rtw89_dev *rtwdev, scan_mode =RTW89_SCAN_IMMEDIATE ; }else { scan_mode =RTW89_SCAN_DELAY ; - tsf += (u64 )option->delay *RTW89_SCAN_DELAY_TSF_UNIT ; + tsf += (u64 )option->delay *1000 ; } }
@@ -5781,7 +5780,7 @@ int rtw89_fw_h2c_scan_offload_be(struct rtw89_dev *rtwdev, RTW89_H2C_SCANOFLD_BE_W4_PROBE_5G) |le32_encode_bits (probe_id[NL80211_BAND_6GHZ ],RTW89_H2C_SCANOFLD_BE_W4_PROBE_6G ) | -le32_encode_bits (option->delay,RTW89_H2C_SCANOFLD_BE_W4_DELAY_START ); +le32_encode_bits (option->delay /1000 ,RTW89_H2C_SCANOFLD_BE_W4_DELAY_START ); h2c->w5 =le32_encode_bits (option->mlo_mode,RTW89_H2C_SCANOFLD_BE_W5_MLO_MODE );
@@ -6826,6 +6825,7 @@ static void rtw89_hw_scan_cleanup(struct rtw89_dev *rtwdev, scan_info->scanning_vif =NULL ; scan_info->abort = false; scan_info->connected = false; + scan_info->delay =0 ; } static bool rtw89_is_6ghz_wildcard_probe_req(struct rtw89_dev *rtwdev,
@@ -7628,9 +7628,22 @@ static void rtw89_hw_scan_update_link_beacon_noa(struct rtw89_dev *rtwdev, u16 tu) {struct ieee80211_p2p_noa_desc noa_desc = {}; +struct ieee80211_bss_conf *bss_conf; +u16 beacon_int;u64 tsf;int ret; +rcu_read_lock (); + + bss_conf =rtw89_vif_rcu_dereference_link (rtwvif_link, true); + beacon_int = bss_conf->beacon_int; + +rcu_read_unlock (); + + tu += beacon_int *3 ; +if (rtwdev->chip->chip_gen ==RTW89_CHIP_AX ) + rtwdev->scan_info.delay =ieee80211_tu_to_usec (beacon_int *3 ) /1000 ; + ret =rtw89_mac_port_get_tsf (rtwdev, rtwvif_link, &tsf);if (ret) {rtw89_warn (rtwdev,"%s: failed to get tsf\n" , __func__);
@@ -7770,6 +7783,7 @@ int rtw89_hw_scan_start(struct rtw89_dev *rtwdev, rtwdev->scan_info.connected =rtw89_is_any_vif_connected_or_connecting (rtwdev); rtwdev->scan_info.scanning_vif = rtwvif_link; rtwdev->scan_info.abort = false; + rtwdev->scan_info.delay =0 ; rtwvif->scan_ies = &scan_req->ies; rtwvif->scan_req = req;
@@ -7912,6 +7926,7 @@ int rtw89_hw_scan_offload(struct rtw89_dev *rtwdev, connected = rtwdev->scan_info.connected; opt.enable = enable; opt.target_ch_mode = connected; + opt.delay = rtwdev->scan_info.delay;if (enable) { ret = mac->add_chan_list (rtwdev, rtwvif_link);if (ret)
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -5049,6 +5049,7 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,if (rtwvif_link && rtwvif->scan_req && !list_empty (&rtwdev->scan_info.chan_list)) { + rtwdev->scan_info.delay =0 ; ret =rtw89_hw_scan_offload (rtwdev, rtwvif_link, true);if (ret) {rtw89_hw_scan_abort (rtwdev, rtwvif_link);
drivers/net/wireless/realtek/rtw89/wow.c +1 -1
@@ -1477,7 +1477,7 @@ static int rtw89_pno_scan_offload(struct rtw89_dev *rtwdev, bool enable) opt.enable = enable; opt.repeat =RTW89_SCAN_NORMAL ; opt.norm_pd =max (interval,1 ) *10 ;/* in unit of 100ms */ - opt.delay =max (rtw_wow->nd_config->delay,1 ); + opt.delay =max (rtw_wow->nd_config->delay,1 ) *1000 ;if (rtwdev->chip->chip_gen ==RTW89_CHIP_BE ) { opt.operation = enable ?RTW89_SCAN_OP_START :RTW89_SCAN_OP_STOP ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/14 wifi: rtw89: extend HW scan of WiFi 7 chips for extra OP chan when concurrency
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
HW scan of WiFi 7 chips supports multiple op channel configurations. When concurrency, fill two channels info to HW scan to avoid packet lost.
However, the OP chan timing is arranged by FW, and the actual stay period depends on AP. It's hard to calculate total scan time for once NoA in advance. Therefore, change the scan back to GO OP channel every 200TU and TX beacon to ensure GC doesn't beacon loss. Additionally, add a period NoA with large duration to ensure GC doesn't TX packet during GO scanning and can still listen beacon at TBTT to update the new NoA info after scan complete.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/fw.c | 88 ++++++++++++++++++----- drivers/net/wireless/realtek/rtw89/fw.h | 1 + 3 files changed, 73 insertions(+), 18 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -5538,7 +5538,9 @@ struct rtw89_early_h2c {struct rtw89_hw_scan_extra_op {bool set;u8 macid; +u8 port;struct rtw89_chan chan; +struct rtw89_vif_link *rtwvif_link; };struct rtw89_hw_scan_info {
drivers/net/wireless/realtek/rtw89/fw.c +70 -18
213 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +1 -0
@@ -2817,6 +2817,7 @@ struct rtw89_h2c_scanofld_be_opch {#define RTW89_H2C_SCANOFLD_BE_OPCH_W2_PKTS_CTRL GENMASK(7, 0)#define RTW89_H2C_SCANOFLD_BE_OPCH_W2_SW_DEF GENMASK(15, 8)#define RTW89_H2C_SCANOFLD_BE_OPCH_W2_SS GENMASK(18, 16) +#define RTW89_H2C_SCANOFLD_BE_OPCH_W2_TXBCN BIT(19)#define RTW89_H2C_SCANOFLD_BE_OPCH_W3_PKT0 GENMASK(7, 0)#define RTW89_H2C_SCANOFLD_BE_OPCH_W3_PKT1 GENMASK(15, 8)#define RTW89_H2C_SCANOFLD_BE_OPCH_W3_PKT2 GENMASK(23, 16)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/14 wifi: rtw89: mcc: solve GO's TBTT change and TBTT too close to NoA issue
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
For some implementation acting as GO under MCC(GO+STA), the GO's TBTT might change after STA roams to another AP. This could result the new GO beacon TX at the STA timeslot of GC+STA, causing GC beacon loss. Therefore, if the GC detects beacon loss, it will pause MCC and remain on the GO side for 100 TU to detect the new TBTT beacon.
Additionally, some implementation acting as GO under MCC might TX beacon too close to the NoA period. The GC calculates timeslot pattern the TOB (time offset behind) or TOA(time offset ahead) less than the minimum RX beacon time, which leads to beacon loss. Therefore, disable the beacon filter in this case. Then, if the GO's TBTT changed, the pattern TOB/TOA greater than the minimum RX beacon time, the beacon filter should be retriggered during MCC update.
Moreover, if the beacon filter is disabled initially but the GO timeslot change, causing QoS null data detection fail, also pause MCC to detect new TBTT beacon.
--- drivers/net/wireless/realtek/rtw89/chan.c | 143 ++++++++++++++++-- drivers/net/wireless/realtek/rtw89/chan.h | 6 + drivers/net/wireless/realtek/rtw89/core.h | 4 + drivers/net/wireless/realtek/rtw89/mac.c | 10 +- drivers/net/wireless/realtek/rtw89/mac80211.c | 5 + 5 files changed, 154 insertions(+), 14 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +131 -12
@@ -1000,6 +1000,11 @@ static void rtw89_mcc_assign_pattern(struct rtw89_dev *rtwdev, *pattern = *new;memset (&pattern->courtesy,0 ,sizeof (pattern->courtesy)); +if (RTW89_MCC_REQ_COURTESY (pattern, aux) && aux->is_gc) + aux->ignore_bcn = true; +else + aux->ignore_bcn = false; +if (RTW89_MCC_REQ_COURTESY (pattern, aux) &&rtw89_mcc_can_courtesy (ref, aux)) { crtz = &pattern->courtesy.ref; ref->crtz = crtz;
@@ -1014,6 +1019,11 @@ static void rtw89_mcc_assign_pattern(struct rtw89_dev *rtwdev, ref->crtz =NULL ; } +if (RTW89_MCC_REQ_COURTESY (pattern, ref) && ref->is_gc) + ref->ignore_bcn = true; +else + ref->ignore_bcn = false; +if (RTW89_MCC_REQ_COURTESY (pattern, ref) &&rtw89_mcc_can_courtesy (aux, ref)) { crtz = &pattern->courtesy.aux; aux->crtz = crtz;
@@ -2255,15 +2265,6 @@ static int rtw89_mcc_start(struct rtw89_dev *rtwdev)else mcc->mode =RTW89_MCC_MODE_GC_STA ; -if (rtw89_mcc_ignore_bcn (rtwdev, ref)) { -rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, aux->rtwvif_link, false); - }else if (rtw89_mcc_ignore_bcn (rtwdev, aux)) { -rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, ref->rtwvif_link, false); - }else { -rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, ref->rtwvif_link, true); -rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, aux->rtwvif_link, true); - } -rtw89_debug (rtwdev,RTW89_DBG_CHAN ,"MCC sel mode: %d\n" , mcc->mode); mcc->group =RTW89_MCC_DFLT_GROUP ;
@@ -2272,6 +2273,15 @@ static int rtw89_mcc_start(struct rtw89_dev *rtwdev)if (ret)return ret; +if (rtw89_mcc_ignore_bcn (rtwdev, ref) || aux->ignore_bcn) { +rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, aux->rtwvif_link, false); + }else if (rtw89_mcc_ignore_bcn (rtwdev, aux) || ref->ignore_bcn) { +rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, ref->rtwvif_link, false); + }else { +rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, ref->rtwvif_link, true); +rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, aux->rtwvif_link, true); + } +if (rtw89_concurrent_via_mrc (rtwdev)) ret =__mrc_fw_start (rtwdev, false);else
@@ -2391,7 +2401,11 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev,static int rtw89_mcc_update (struct rtw89_dev *rtwdev) {struct rtw89_mcc_info *mcc = &rtwdev->mcc; +bool old_ref_ignore_bcn = mcc->role_ref.ignore_bcn; +bool old_aux_ignore_bcn = mcc->role_aux.ignore_bcn;struct rtw89_mcc_config *config = &mcc->config; +struct rtw89_mcc_role *ref = &mcc->role_ref; +struct rtw89_mcc_role *aux = &mcc->role_aux;struct rtw89_mcc_config old_cfg = *config;bool courtesy_changed;bool sync_changed;
@@ -2406,6 +2420,11 @@ static int rtw89_mcc_update(struct rtw89_dev *rtwdev)if (ret)return ret; +if (old_ref_ignore_bcn != ref->ignore_bcn) +rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, ref->rtwvif_link, !ref->ignore_bcn); +else if (old_aux_ignore_bcn != aux->ignore_bcn) +rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, aux->rtwvif_link, !aux->ignore_bcn); +if (memcmp (&old_cfg.pattern.courtesy, &config->pattern.courtesy,sizeof (old_cfg.pattern.courtesy)) ==0 ) courtesy_changed = false;
@@ -2441,10 +2460,105 @@ static int rtw89_mcc_update(struct rtw89_dev *rtwdev)return 0 ; } +static int rtw89_mcc_search_gc_iterator (struct rtw89_dev *rtwdev, +struct rtw89_mcc_role *mcc_role, +unsigned int ordered_idx, +void *data) +{ +struct rtw89_mcc_role **role = data; + +if (mcc_role->is_gc) + *role = mcc_role; + +return 0 ; +} + +static struct rtw89_mcc_role *rtw89_mcc_get_gc_role (struct rtw89_dev *rtwdev) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; +struct rtw89_mcc_role *role =NULL ; + +if (mcc->mode !=RTW89_MCC_MODE_GC_STA ) +return NULL ; + +rtw89_iterate_mcc_roles (rtwdev, rtw89_mcc_search_gc_iterator, &role); + +return role; +} + +void rtw89_mcc_gc_detect_beacon_work (struct wiphy *wiphy,struct wiphy_work *work) +{ + struct rtw89_vif_link *rtwvif_link = container_of(work, struct rtw89_vif_link, + mcc_gc_detect_beacon_work.work); +struct ieee80211_vif *vif =rtwvif_link_to_vif (rtwvif_link); +enum rtw89_entity_mode mode; +struct rtw89_dev *rtwdev; + +lockdep_assert_wiphy (wiphy); + + rtwdev = rtwvif_link->rtwvif->rtwdev; + + mode =rtw89_get_entity_mode (rtwdev); +if (mode !=RTW89_ENTITY_MODE_MCC ) +return ; + +if (READ_ONCE (rtwvif_link->sync_bcn_tsf) > rtwvif_link->last_sync_bcn_tsf) + rtwvif_link->detect_bcn_count =0 ; +else + rtwvif_link->detect_bcn_count++; + +if (rtwvif_link->detect_bcn_count <RTW89_MCC_DETECT_BCN_MAX_TRIES ) +rtw89_chanctx_proceed (rtwdev,NULL ); +else +ieee80211_connection_loss (vif); +} + +bool rtw89_mcc_detect_go_bcn (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link) +{ +enum rtw89_entity_mode mode =rtw89_get_entity_mode (rtwdev); +struct rtw89_chanctx_pause_parm pause_parm = { + .rsn =RTW89_CHANCTX_PAUSE_REASON_GC_BCN_LOSS , + .trigger = rtwvif_link, + }; +struct ieee80211_bss_conf *bss_conf; +struct rtw89_mcc_role *role; +u16 bcn_int; + +if (mode !=RTW89_ENTITY_MODE_MCC ) +return false; + + role =rtw89_mcc_get_gc_role (rtwdev); +if (!role) +return false; + +if (role->rtwvif_link != rtwvif_link) +return false; + +rtw89_debug (rtwdev,RTW89_DBG_CHAN , +"MCC GC beacon loss, pause MCC to detect GO beacon\n" ); + +rcu_read_lock (); + + bss_conf =rtw89_vif_rcu_dereference_link (rtwvif_link, true); + bcn_int = bss_conf->beacon_int; + +rcu_read_unlock (); + +rtw89_chanctx_pause (rtwdev, &pause_parm); + rtwvif_link->last_sync_bcn_tsf =READ_ONCE (rtwvif_link->sync_bcn_tsf); +wiphy_delayed_work_queue (rtwdev->hw->wiphy, + &rtwvif_link->mcc_gc_detect_beacon_work, +usecs_to_jiffies (ieee80211_tu_to_usec (bcn_int))); + +return true; +} +static void rtw89_mcc_detect_connection (struct rtw89_dev *rtwdev,struct rtw89_mcc_role *role) {struct ieee80211_vif *vif; +bool start_detect;int ret; ret = rtw89_core_send_nullfunc(rtwdev, role->rtwvif_link, true, false,
@@ -2458,7 +2572,12 @@ static void rtw89_mcc_detect_connection(struct rtw89_dev *rtwdev,return ;rtw89_debug (rtwdev,RTW89_DBG_CHAN , -"MCC <macid %d> can not detect AP\n" , role->rtwvif_link->mac_id); +"MCC <macid %d> can not detect AP/GO\n" , role->rtwvif_link->mac_id); + + start_detect =rtw89_mcc_detect_go_bcn (rtwdev, role->rtwvif_link); +if (start_detect) +return ; + vif =rtwvif_link_to_vif (role->rtwvif_link);ieee80211_connection_loss (vif); }
@@ -2474,9 +2593,9 @@ static void rtw89_mcc_track(struct rtw89_dev *rtwdev)u16 bcn_ofst;u16 diff; -if (rtw89_mcc_ignore_bcn (rtwdev, ref)) +if (rtw89_mcc_ignore_bcn (rtwdev, ref) || aux->ignore_bcn)rtw89_mcc_detect_connection (rtwdev, aux); -else if (rtw89_mcc_ignore_bcn (rtwdev, aux)) +else if (rtw89_mcc_ignore_bcn (rtwdev, aux) || ref->ignore_bcn)rtw89_mcc_detect_connection (rtwdev, ref);if (mcc->mode !=RTW89_MCC_MODE_GC_STA )
drivers/net/wireless/realtek/rtw89/chan.h +6 -0
@@ -23,6 +23,8 @@#define RTW89_MCC_PROBE_TIMEOUT 100#define RTW89_MCC_PROBE_MAX_TRIES 3 +#define RTW89_MCC_DETECT_BCN_MAX_TRIES 2 +#define RTW89_MCC_MIN_GO_DURATION \ (RTW89_MCC_EARLY_TX_BCN_TIME + RTW89_MCC_MIN_RX_BCN_TIME)
@@ -94,6 +96,7 @@ struct rtw89_mr_chanctx_info {enum rtw89_chanctx_pause_reasons {RTW89_CHANCTX_PAUSE_REASON_HW_SCAN ,RTW89_CHANCTX_PAUSE_REASON_ROC , +RTW89_CHANCTX_PAUSE_REASON_GC_BCN_LOSS , };struct rtw89_chanctx_pause_parm {
@@ -188,6 +191,9 @@ struct rtw89_mcc_links_info {void rtw89_mcc_get_links (struct rtw89_dev *rtwdev,struct rtw89_mcc_links_info *info);void rtw89_mcc_prepare_done_work (struct wiphy *wiphy,struct wiphy_work *work); +void rtw89_mcc_gc_detect_beacon_work (struct wiphy *wiphy,struct wiphy_work *work); +bool rtw89_mcc_detect_go_bcn (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link);int rtw89_chanctx_ops_add (struct rtw89_dev *rtwdev,struct ieee80211_chanctx_conf *ctx);
drivers/net/wireless/realtek/rtw89/core.h +4 -0
@@ -3597,6 +3597,7 @@ struct rtw89_vif_link {u8 hit_rule;u8 last_noa_nr;u64 sync_bcn_tsf; +u64 last_sync_bcn_tsf;bool rand_tsf_done;bool trigger;bool lsig_txop;
@@ -3620,6 +3621,8 @@ struct rtw89_vif_link {struct list_head general_pkt_list;struct rtw89_p2p_noa_setter p2p_noa;struct rtw89_ps_noa_once_handler noa_once; +struct wiphy_delayed_work mcc_gc_detect_beacon_work; +u8 detect_bcn_count; };enum rtw89_lv1_rcvy_step {
@@ -5777,6 +5780,7 @@ struct rtw89_mcc_role {bool is_2ghz;bool is_go;bool is_gc; +bool ignore_bcn; };struct rtw89_mcc_bt_role {
drivers/net/wireless/realtek/rtw89/mac.c +8 -2
@@ -5088,6 +5088,7 @@ rtw89_mac_bcn_fltr_rpt(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_lconst struct rtw89_c2h_mac_bcnfltr_rpt *c2h = (const struct rtw89_c2h_mac_bcnfltr_rpt *)skb->data;u8 type, event, mac_id; +bool start_detect;s8 sig; type =le32_get_bits (c2h->w2,RTW89_C2H_MAC_BCNFLTR_RPT_W2_TYPE );
@@ -5105,10 +5106,15 @@ rtw89_mac_bcn_fltr_rpt(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_lswitch (type) {case RTW89_BCN_FLTR_BEACON_LOSS :if (!rtwdev->scanning && !rtwvif->offchan && - !rtwvif_link->noa_once.in_duration) + !rtwvif_link->noa_once.in_duration) { + start_detect =rtw89_mcc_detect_go_bcn (rtwdev, rtwvif_link); +if (start_detect) +return ; +ieee80211_connection_loss (vif); -else + }else {rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, rtwvif_link, true); + }return ;case RTW89_BCN_FLTR_NOTIFY : nl_event =NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH ;
drivers/net/wireless/realtek/rtw89/mac80211.c +5 -0
@@ -113,6 +113,8 @@ static int __rtw89_ops_add_iface_link(struct rtw89_dev *rtwdev,wiphy_work_init (&rtwvif_link->update_beacon_work, rtw89_core_update_beacon_work);wiphy_delayed_work_init (&rtwvif_link->csa_beacon_work, rtw89_core_csa_beacon_work); +wiphy_delayed_work_init (&rtwvif_link->mcc_gc_detect_beacon_work, + rtw89_mcc_gc_detect_beacon_work);INIT_LIST_HEAD (&rtwvif_link->general_pkt_list);
@@ -124,6 +126,7 @@ static int __rtw89_ops_add_iface_link(struct rtw89_dev *rtwdev, rtwvif_link->chanctx_idx =RTW89_CHANCTX_0 ; rtwvif_link->reg_6ghz_power =RTW89_REG_6GHZ_POWER_DFLT ; rtwvif_link->rand_tsf_done = false; + rtwvif_link->detect_bcn_count =0 ;rcu_read_lock ();
@@ -147,6 +150,8 @@ static void __rtw89_ops_remove_iface_link(struct rtw89_dev *rtwdev,wiphy_work_cancel (rtwdev->hw->wiphy, &rtwvif_link->update_beacon_work);wiphy_delayed_work_cancel (rtwdev->hw->wiphy, &rtwvif_link->csa_beacon_work); +wiphy_delayed_work_cancel (rtwdev->hw->wiphy, + &rtwvif_link->mcc_gc_detect_beacon_work);rtw89_p2p_noa_once_deinit (rtwvif_link);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/14 wifi: rtw89: check LPS H2C command complete by C2H reg instead of done ack
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
8852B after FW 0.29.127, 8852BT after FW 0.29.127 and 8922A after FW 0.35.76 driver check LPS H2C command received by FW using C2H reg instead of done ack.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 11 ++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 4 ++++ drivers/net/wireless/realtek/rtw89/ps.c | 28 ++++++++++++++++++++++- 4 files changed, 42 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4608,6 +4608,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_BEACON_LOSS_COUNT_V1 ,RTW89_FW_FEATURE_SCAN_OFFLOAD_EXTRA_OP ,RTW89_FW_FEATURE_RFK_NTFY_MCC_V0 , + RTW89_FW_FEATURE_LPS_DACK_BY_C2H_REG, }; struct rtw89_fw_suit {
drivers/net/wireless/realtek/rtw89/fw.c +10 -1
@@ -827,11 +827,13 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,7 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852B , lt,0 ,29 ,30 ,0 ,NO_WOW_CPU_IO_RX ), +__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,127 ,0 ,LPS_DACK_BY_C2H_REG ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,NO_LPS_PG ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,TX_WAKE ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,90 ,0 ,CRASH_TRIGGER ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,91 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,110 ,0 ,BEACON_FILTER ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,127 ,0 ,LPS_DACK_BY_C2H_REG ),__CFG_FW_FEAT (RTL8852C , le,0 ,27 ,33 ,0 ,NO_DEEP_PS ),__CFG_FW_FEAT (RTL8852C , ge,0 ,0 ,0 ,0 ,RFK_NTFY_MCC_V0 ), __CFG_FW_FEAT(RTL8852C, ge, 0, 27, 34, 0, TX_WAKE),
@@ -856,6 +858,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,51 ,0 ,NO_PHYCAP_P1 ),__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,64 ,0 ,NO_POWER_DIFFERENCE ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,71 ,0 ,BEACON_LOSS_COUNT_V1 ), + __CFG_FW_FEAT(RTL8922A, ge, 0, 35, 76, 0, LPS_DACK_BY_C2H_REG), }; static void rtw89_fw_iterate_feature_cfg(struct rtw89_fw_info *fw,
@@ -2824,8 +2827,14 @@ int rtw89_fw_h2c_lps_parm(struct rtw89_dev *rtwdev, struct rtw89_lps_parm *lps_param) {struct sk_buff *skb; +bool done_ack;int ret; +if (RTW89_CHK_FW_FEATURE (LPS_DACK_BY_C2H_REG , &rtwdev->fw)) + done_ack = false; +else + done_ack = !lps_param->psmode; + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_LPS_PARM_LEN );if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for fw dl\n" );
@@ -2847,7 +2856,7 @@ int rtw89_fw_h2c_lps_parm(struct rtw89_dev *rtwdev,rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C ,H2C_CAT_MAC ,H2C_CL_MAC_PS , -H2C_FUNC_MAC_LPS_PARM ,0 , !lps_param->psmode, +H2C_FUNC_MAC_LPS_PARM ,0 , done_ack,H2C_LPS_PARM_LEN ); ret =rtw89_h2c_tx (rtwdev, skb, false);
drivers/net/wireless/realtek/rtw89/fw.h +4 -0
@@ -87,6 +87,9 @@ struct rtw89_c2hreg_phycap {#define RTW89_C2HREG_AOAC_RPT_2_W3_IGTK_IPN_IV_6 GENMASK(7, 0)#define RTW89_C2HREG_AOAC_RPT_2_W3_IGTK_IPN_IV_7 GENMASK(15, 8) +#define RTW89_C2HREG_PS_LEAVE_ACK_RET GENMASK(7, 0) +#define RTW89_C2HREG_PS_LEAVE_ACK_MACID GENMASK(31, 16) +struct rtw89_h2creg_hdr {u32 w0; };
@@ -154,6 +157,7 @@ enum rtw89_mac_c2h_type {RTW89_FWCMD_C2HREG_FUNC_TX_PAUSE_RPT ,RTW89_FWCMD_C2HREG_FUNC_WOW_CPUIO_RX_ACK =0xA ,RTW89_FWCMD_C2HREG_FUNC_PHY_CAP_PART1 =0xC , +RTW89_FWCMD_C2HREG_FUNC_PS_LEAVE_ACK =0xD , RTW89_FWCMD_C2HREG_FUNC_NULL = 0xFF, };
drivers/net/wireless/realtek/rtw89/ps.c +27 -1
@@ -13,6 +13,31 @@#include "reg.h" #include "util.h" +static int rtw89_fw_receive_lps_h2c_check (struct rtw89_dev *rtwdev,u8 macid) +{ +struct rtw89_mac_c2h_info c2h_info = {}; +u16 c2hreg_macid; +u32 c2hreg_ret; +int ret; + +if (!RTW89_CHK_FW_FEATURE (LPS_DACK_BY_C2H_REG , &rtwdev->fw)) +return 0 ; + + c2h_info.id =RTW89_FWCMD_C2HREG_FUNC_PS_LEAVE_ACK ; + ret =rtw89_fw_msg_reg (rtwdev,NULL , &c2h_info); +if (ret) +return ret; + + c2hreg_macid =u32_get_bits (c2h_info.u.c2hreg[0 ], +RTW89_C2HREG_PS_LEAVE_ACK_MACID ); + c2hreg_ret =u32_get_bits (c2h_info.u.c2hreg[1 ],RTW89_C2HREG_PS_LEAVE_ACK_RET ); + +if (macid != c2hreg_macid || c2hreg_ret) +rtw89_warn (rtwdev,"rtw89: check lps h2c received by firmware fail\n" ); + +return 0 ; +} +static int rtw89_fw_leave_lps_check (struct rtw89_dev *rtwdev,u8 macid) {const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;
@@ -106,7 +131,8 @@ static void __rtw89_leave_lps(struct rtw89_dev *rtwdev, };rtw89_fw_h2c_lps_parm (rtwdev, &lps_param); -rtw89_fw_leave_lps_check (rtwdev,0 ); +rtw89_fw_receive_lps_h2c_check (rtwdev, rtwvif_link->mac_id); +rtw89_fw_leave_lps_check (rtwdev, rtwvif_link->mac_id);rtw89_btc_ntfy_radio_state (rtwdev,BTC_RFCTRL_WL_ON );rtw89_chip_digital_pwr_comp (rtwdev, rtwvif_link->phy_idx); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/14 wifi: rtw89: introduce fw feature group and redefine CRASH_TRIGGER
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Some FW features may have variants on how to deal with in leaf functions, e.g. H2C commands. However, from SW component point of view, it might not matter which variant is supported exactly. In some cases, SW component may just care whether any of the variants is supported or not.
So, introduce a concept of FW feature group which can manage a set of FW features and can easily be checked if at least one of them is supported.
Since CRASH_TRIGGER will have variants and then matches the case mentioned above, so redefine CRASH_TRIGGER as a FW feature group and add a variant of type 0 for original handling.
--- drivers/net/wireless/realtek/rtw89/core.h | 15 ++++++++++++++- drivers/net/wireless/realtek/rtw89/debug.c | 2 +- drivers/net/wireless/realtek/rtw89/fw.c | 12 ++++++------ 3 files changed, 21 insertions(+), 8 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +14 -1
@@ -4583,11 +4583,20 @@ enum rtw89_fw_type { RTW89_FW_LOGFMT = 255, }; +#define RTW89_FW_FEATURE_GROUP(_grp, _features...) \ + RTW89_FW_FEATURE_##_grp##_MIN, \ + __RTW89_FW_FEATURE_##_grp##_S = RTW89_FW_FEATURE_##_grp##_MIN - 1, \ + _features \ + __RTW89_FW_FEATURE_##_grp##_E, \ + RTW89_FW_FEATURE_##_grp##_MAX = __RTW89_FW_FEATURE_##_grp##_E - 1 +enum rtw89_fw_feature {RTW89_FW_FEATURE_OLD_HT_RA_FORMAT ,RTW89_FW_FEATURE_SCAN_OFFLOAD ,RTW89_FW_FEATURE_TX_WAKE , -RTW89_FW_FEATURE_CRASH_TRIGGER , + RTW89_FW_FEATURE_GROUP(CRASH_TRIGGER, +RTW89_FW_FEATURE_CRASH_TRIGGER_TYPE_0 , + ),RTW89_FW_FEATURE_NO_PACKET_DROP ,RTW89_FW_FEATURE_NO_DEEP_PS ,RTW89_FW_FEATURE_NO_LPS_PG ,
@@ -4706,6 +4715,10 @@ struct rtw89_fw_info {#define RTW89_CHK_FW_FEATURE (_feat, _fw) \ (!!((_fw)->feature_map & BIT(RTW89_FW_FEATURE_ ## _feat))) +#define RTW89_CHK_FW_FEATURE_GROUP (_grp, _fw) \ + (!!((_fw)->feature_map & GENMASK(RTW89_FW_FEATURE_ ## _grp ## _MAX, \ + RTW89_FW_FEATURE_ ## _grp ## _MIN))) +#define RTW89_SET_FW_FEATURE (_fw_feature, _fw) \ ((_fw)->feature_map |= BIT(_fw_feature))
drivers/net/wireless/realtek/rtw89/debug.c +1 -1
@@ -3596,7 +3596,7 @@ rtw89_debug_priv_fw_crash_set(struct rtw89_dev *rtwdev,switch (crash_type) {case RTW89_DBG_SIM_CPU_EXCEPTION : -if (!RTW89_CHK_FW_FEATURE (CRASH_TRIGGER , &rtwdev->fw)) +if (!RTW89_CHK_FW_FEATURE_GROUP (CRASH_TRIGGER , &rtwdev->fw))return -EOPNOTSUPP ; sim = rtw89_fw_h2c_trigger_cpu_exception;break ;
drivers/net/wireless/realtek/rtw89/fw.c +6 -6
@@ -814,23 +814,23 @@ struct __fw_feat_cfg {static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8851B , ge,0 ,29 ,37 ,1 ,TX_WAKE ),__CFG_FW_FEAT (RTL8851B , ge,0 ,29 ,37 ,1 ,SCAN_OFFLOAD ), -__CFG_FW_FEAT (RTL8851B , ge,0 ,29 ,41 ,0 ,CRASH_TRIGGER ), +__CFG_FW_FEAT (RTL8851B , ge,0 ,29 ,41 ,0 ,CRASH_TRIGGER_TYPE_0 ),__CFG_FW_FEAT (RTL8852A , le,0 ,13 ,29 ,0 ,OLD_HT_RA_FORMAT ),__CFG_FW_FEAT (RTL8852A , ge,0 ,13 ,35 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852A , ge,0 ,13 ,35 ,0 ,TX_WAKE ), -__CFG_FW_FEAT (RTL8852A , ge,0 ,13 ,36 ,0 ,CRASH_TRIGGER ), +__CFG_FW_FEAT (RTL8852A , ge,0 ,13 ,36 ,0 ,CRASH_TRIGGER_TYPE_0 ),__CFG_FW_FEAT (RTL8852A , lt,0 ,13 ,37 ,0 ,NO_WOW_CPU_IO_RX ),__CFG_FW_FEAT (RTL8852A , lt,0 ,13 ,38 ,0 ,NO_PACKET_DROP ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,26 ,0 ,NO_LPS_PG ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,26 ,0 ,TX_WAKE ), -__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,0 ,CRASH_TRIGGER ), +__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,0 ,CRASH_TRIGGER_TYPE_0 ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,7 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852B , lt,0 ,29 ,30 ,0 ,NO_WOW_CPU_IO_RX ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,127 ,0 ,LPS_DACK_BY_C2H_REG ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,NO_LPS_PG ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,TX_WAKE ), -__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,90 ,0 ,CRASH_TRIGGER ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,90 ,0 ,CRASH_TRIGGER_TYPE_0 ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,91 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,110 ,0 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,127 ,0 ,LPS_DACK_BY_C2H_REG ),
@@ -838,11 +838,11 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852C , ge,0 ,0 ,0 ,0 ,RFK_NTFY_MCC_V0 ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,34 ,0 ,TX_WAKE ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,36 ,0 ,SCAN_OFFLOAD ), -__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,40 ,0 ,CRASH_TRIGGER ), +__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,40 ,0 ,CRASH_TRIGGER_TYPE_0 ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,56 ,10 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,80 ,0 ,WOW_REASON_V1 ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,128 ,0 ,BEACON_LOSS_COUNT_V1 ), -__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,30 ,0 ,CRASH_TRIGGER ), +__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,30 ,0 ,CRASH_TRIGGER_TYPE_0 ),__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,11 ,0 ,MACID_PAUSE_SLEEP ),__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,35 ,0 ,SCAN_OFFLOAD ), __CFG_FW_FEAT(RTL8922A, lt, 0, 35, 21, 0, SCAN_OFFLOAD_BE_V0),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/14 wifi: rtw89: update SER L2 type default value
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
8852BT after FW 0.29.127, 8852B after FW 0.29.128 and 8922A after FW 0.35.79, the SER L2 flow determines different L2 types by parameter, the zero value will trigger FW SER L2 assert.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 36 +++++++++++++++-------- drivers/net/wireless/realtek/rtw89/fw.h | 9 +++--- 3 files changed, 30 insertions(+), 16 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4596,6 +4596,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_TX_WAKE ,RTW89_FW_FEATURE_GROUP (CRASH_TRIGGER ,RTW89_FW_FEATURE_CRASH_TRIGGER_TYPE_0 , + RTW89_FW_FEATURE_CRASH_TRIGGER_TYPE_1, ),RTW89_FW_FEATURE_NO_PACKET_DROP , RTW89_FW_FEATURE_NO_DEEP_PS,
drivers/net/wireless/realtek/rtw89/fw.c +24 -12
@@ -828,12 +828,14 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,7 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852B , lt,0 ,29 ,30 ,0 ,NO_WOW_CPU_IO_RX ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,127 ,0 ,LPS_DACK_BY_C2H_REG ), +__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,128 ,0 ,CRASH_TRIGGER_TYPE_1 ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,NO_LPS_PG ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,TX_WAKE ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,90 ,0 ,CRASH_TRIGGER_TYPE_0 ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,91 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,110 ,0 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,127 ,0 ,LPS_DACK_BY_C2H_REG ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,127 ,0 ,CRASH_TRIGGER_TYPE_1 ),__CFG_FW_FEAT (RTL8852C , le,0 ,27 ,33 ,0 ,NO_DEEP_PS ),__CFG_FW_FEAT (RTL8852C , ge,0 ,0 ,0 ,0 ,RFK_NTFY_MCC_V0 ), __CFG_FW_FEAT(RTL8852C, ge, 0, 27, 34, 0, TX_WAKE),
@@ -859,6 +861,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,64 ,0 ,NO_POWER_DIFFERENCE ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,71 ,0 ,BEACON_LOSS_COUNT_V1 ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,76 ,0 ,LPS_DACK_BY_C2H_REG ), + __CFG_FW_FEAT(RTL8922A, ge, 0, 35, 79, 0, CRASH_TRIGGER_TYPE_1), }; static void rtw89_fw_iterate_feature_cfg(struct rtw89_fw_info *fw,
@@ -8009,41 +8012,50 @@ int rtw89_hw_scan_offload(struct rtw89_dev *rtwdev,return ret; } -#define H2C_FW_CPU_EXCEPTION_LEN 4 -#define H2C_FW_CPU_EXCEPTION_TYPE_DEF 0x5566 +#define H2C_FW_CPU_EXCEPTION_TYPE_0 0x5566 +#define H2C_FW_CPU_EXCEPTION_TYPE_1 0x0int rtw89_fw_h2c_trigger_cpu_exception (struct rtw89_dev *rtwdev) { +struct rtw89_h2c_trig_cpu_except *h2c; +u32 cpu_exception_type_def; +u32 len =sizeof (*h2c);struct sk_buff *skb;int ret; - skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_FW_CPU_EXCEPTION_LEN ); +if (RTW89_CHK_FW_FEATURE (CRASH_TRIGGER_TYPE_1 , &rtwdev->fw)) + cpu_exception_type_def =H2C_FW_CPU_EXCEPTION_TYPE_1 ; +else if (RTW89_CHK_FW_FEATURE (CRASH_TRIGGER_TYPE_0 , &rtwdev->fw)) + cpu_exception_type_def =H2C_FW_CPU_EXCEPTION_TYPE_0 ; +else +return -EOPNOTSUPP ; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for fw cpu exception\n" );return -ENOMEM ; } -skb_put (skb,H2C_FW_CPU_EXCEPTION_LEN ); -RTW89_SET_FWCMD_CPU_EXCEPTION_TYPE (skb->data, -H2C_FW_CPU_EXCEPTION_TYPE_DEF ); +skb_put (skb, len); + h2c = (struct rtw89_h2c_trig_cpu_except *)skb->data; + + h2c->w0 =le32_encode_bits (cpu_exception_type_def, +RTW89_H2C_CPU_EXCEPTION_TYPE );rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C ,H2C_CAT_TEST ,H2C_CL_FW_STATUS_TEST ,H2C_FUNC_CPU_EXCEPTION ,0 ,0 , -H2C_FW_CPU_EXCEPTION_LEN ); + len); ret =rtw89_h2c_tx (rtwdev, skb, false);if (ret) {rtw89_err (rtwdev,"failed to send h2c\n" ); - goto fail; +dev_kfree_skb_any (skb); +return ret; }return 0 ; - -fail: -dev_kfree_skb_any (skb); -return ret; }#define H2C_PKT_DROP_LEN 24
drivers/net/wireless/realtek/rtw89/fw.h +5 -4
@@ -1833,10 +1833,11 @@ struct rtw89_h2c_lps_ml_cmn_info {u8 dup_bcn_ofst[RTW89_PHY_NUM ]; } __packed; -static inline void RTW89_SET_FWCMD_CPU_EXCEPTION_TYPE (void *cmd,u32 val) -{ -le32p_replace_bits ((__le32 *)cmd, val,GENMASK (31 ,0 )); -} +struct rtw89_h2c_trig_cpu_except { +__le32 w0; +} __packed; + +#define RTW89_H2C_CPU_EXCEPTION_TYPE GENMASK(31, 0)static inline void RTW89_SET_FWCMD_PKT_DROP_SEL (void *cmd,u32 val) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/14 wifi: rtw89: tweak tx wake notify matching condition
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
8852BT needs to call TX wake notify once entering Leisure Power Save. 8852C needs to call TX wake notify after entering low power mode. Other AX chips only MGMT packets needs to call TX wake after entering low power mode. BE chips no need to call TX wake.
--- drivers/net/wireless/realtek/rtw89/core.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +17 -5
@@ -994,13 +994,25 @@ rtw89_core_tx_wake(struct rtw89_dev *rtwdev,if (!RTW89_CHK_FW_FEATURE (TX_WAKE , &rtwdev->fw))return ; -if (!test_bit (RTW89_FLAG_LOW_POWER_MODE , rtwdev->flags)) -return ; +switch (chip->chip_id) { +case RTL8852BT : +if (test_bit (RTW89_FLAG_LEISURE_PS , rtwdev->flags)) + goto notify; +break ; +case RTL8852C : +if (test_bit (RTW89_FLAG_LOW_POWER_MODE , rtwdev->flags)) + goto notify; +break ; +default : +if (test_bit (RTW89_FLAG_LOW_POWER_MODE , rtwdev->flags) && + tx_req->tx_type ==RTW89_CORE_TX_TYPE_MGMT ) + goto notify; +break ; + } -if (chip->chip_id !=RTL8852C && - tx_req->tx_type !=RTW89_CORE_TX_TYPE_MGMT ) -return ; +return ; +notify:rtw89_mac_notify_wake (rtwdev); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 11/14 wifi: rtw89: 8852bt: configure FW version for SCAN_OFFLOAD_EXTRA_OP feature
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
After v0.29.127.0, RTL8852BT FW supports SCAN_OFFLOAD_EXTRA_OP feature. With it, FW can do back-op and TX NULL frames on the second connection.
--- drivers/net/wireless/realtek/rtw89/fw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw89/fw.c +1 -0
@@ -834,6 +834,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,90 ,0 ,CRASH_TRIGGER_TYPE_0 ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,91 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,110 ,0 ,BEACON_FILTER ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,127 ,0 ,SCAN_OFFLOAD_EXTRA_OP ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,127 ,0 ,LPS_DACK_BY_C2H_REG ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,127 ,0 ,CRASH_TRIGGER_TYPE_1 ), __CFG_FW_FEAT(RTL8852C, le, 0, 27, 33, 0, NO_DEEP_PS),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 12/14 wifi: rtw89: 8852bt: implement RFK multi-channel handling and support chanctx up to 2
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
To support multiple channels, 2 for this case, RFK requires to record each calibration result for each channel in different RFK tables, and also needs to notify FW. Then, when FW runs in MCC (multi-channel concurrency), it can switch to the corresponding calibration result according to the channel.
--- .../net/wireless/realtek/rtw89/rtw8852bt.c | 12 +++- .../wireless/realtek/rtw89/rtw8852bt_rfk.c | 69 ++++++++++++++----- .../wireless/realtek/rtw89/rtw8852bt_rfk.h | 3 + 3 files changed, 65 insertions(+), 19 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +11 -1
@@ -533,8 +533,11 @@ static void rtw8852bt_set_channel_help(struct rtw89_dev *rtwdev, bool enter,static void rtw8852bt_rfk_init (struct rtw89_dev *rtwdev) { +struct rtw89_rfk_mcc_info *rfk_mcc = &rtwdev->rfk_mcc; + rtwdev->is_tssi_mode[RF_PATH_A ] = false; rtwdev->is_tssi_mode[RF_PATH_B ] = false; +memset (rfk_mcc,0 ,sizeof (*rfk_mcc));rtw8852bt_dpk_init (rtwdev);rtw8852bt_rck (rtwdev);
@@ -548,6 +551,7 @@ static void rtw8852bt_rfk_channel(struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx chanctx_idx = rtwvif_link->chanctx_idx;enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx; +rtw8852bt_mcc_get_ch_info (rtwdev, phy_idx);rtw89_btc_ntfy_conn_rfk (rtwdev, true);rtw8852bt_rx_dck (rtwdev, phy_idx, chanctx_idx);
@@ -558,6 +562,7 @@ static void rtw8852bt_rfk_channel(struct rtw89_dev *rtwdev,rtw8852bt_dpk (rtwdev, phy_idx, chanctx_idx);rtw89_btc_ntfy_conn_rfk (rtwdev, false); +rtw89_fw_h2c_rf_ntfy_mcc (rtwdev); } static void rtw8852bt_rfk_band_changed(struct rtw89_dev *rtwdev,
@@ -727,6 +732,10 @@ static const struct rtw89_chip_ops rtw8852bt_chip_ops = { .btc_set_policy = rtw89_btc_set_policy_v1, }; +static const struct rtw89_chanctx_listener rtw8852bt_chanctx_listener = { + .callbacks[RTW89_CHANCTX_CALLBACK_RFK ] = rtw8852bt_rfk_chanctx_cb, +}; +#ifdef CONFIG_PM static const struct wiphy_wowlan_support rtw_wowlan_stub_8852bt = { .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
@@ -769,6 +778,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .nctl_post_table = NULL, .dflt_parms = NULL, .rfe_parms_conf = NULL, + .chanctx_listener = &rtw8852bt_chanctx_listener, .txpwr_factor_bb = 3, .txpwr_factor_rf = 2, .txpwr_factor_mac = 1,
@@ -777,7 +787,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .tssi_dbw_table = NULL, .support_macid_num = RTW89_MAX_MAC_ID_NUM, .support_link_num = 0, - .support_chanctx_num = 1, + .support_chanctx_num = 2, .support_rnr = false, .support_bands =BIT (NL80211_BAND_2GHZ ) | BIT(NL80211_BAND_5GHZ),
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c +51 -18
93 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h +3 -0
@@ -27,5 +27,8 @@ void rtw8852bt_wifi_scan_notify(struct rtw89_dev *rtwdev, bool scan_start,void rtw8852bt_set_channel_rf (struct rtw89_dev *rtwdev,const struct rtw89_chan *chan,enum rtw89_phy_idx phy_idx); +void rtw8852bt_mcc_get_ch_info (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx); +void rtw8852bt_rfk_chanctx_cb (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_state state);#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 13/14 wifi: rtw89: 8852b: configure FW version for SCAN_OFFLOAD_EXTRA_OP feature
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
After v0.29.128.0, RTL8852B FW supports SCAN_OFFLOAD_EXTRA_OP feature. With it, FW can do back-op and TX NULL frames on the second connection.
--- drivers/net/wireless/realtek/rtw89/fw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw89/fw.c +1 -0
@@ -829,6 +829,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852B , lt,0 ,29 ,30 ,0 ,NO_WOW_CPU_IO_RX ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,127 ,0 ,LPS_DACK_BY_C2H_REG ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,128 ,0 ,CRASH_TRIGGER_TYPE_1 ), +__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,128 ,0 ,SCAN_OFFLOAD_EXTRA_OP ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,NO_LPS_PG ),__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,TX_WAKE ), __CFG_FW_FEAT(RTL8852BT, ge, 0, 29, 90, 0, CRASH_TRIGGER_TYPE_0),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 14/14 wifi: rtw89: 8852b: implement RFK multi-channel handling and support chanctx up to 2
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
To support multiple channels, 2 for this case, RFK requires to record each calibration result for each channel in different RFK tables, and also needs to notify FW. Then, when FW runs in MCC (multi-channel concurrency), it can switch to the corresponding calibration result according to the channel.
--- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 12 ++- .../net/wireless/realtek/rtw89/rtw8852b_rfk.c | 77 +++++++++++++------ .../net/wireless/realtek/rtw89/rtw8852b_rfk.h | 3 + 3 files changed, 68 insertions(+), 24 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852b.c +11 -1
@@ -628,8 +628,11 @@ static void rtw8852b_set_channel_help(struct rtw89_dev *rtwdev, bool enter,static void rtw8852b_rfk_init (struct rtw89_dev *rtwdev) { +struct rtw89_rfk_mcc_info *rfk_mcc = &rtwdev->rfk_mcc; + rtwdev->is_tssi_mode[RF_PATH_A ] = false; rtwdev->is_tssi_mode[RF_PATH_B ] = false; +memset (rfk_mcc,0 ,sizeof (*rfk_mcc));rtw8852b_dpk_init (rtwdev);rtw8852b_rck (rtwdev);
@@ -643,6 +646,7 @@ static void rtw8852b_rfk_channel(struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx chanctx_idx = rtwvif_link->chanctx_idx;enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx; +rtw8852b_mcc_get_ch_info (rtwdev, phy_idx);rtw89_btc_ntfy_conn_rfk (rtwdev, true);rtw8852b_rx_dck (rtwdev, phy_idx, chanctx_idx);
@@ -653,6 +657,7 @@ static void rtw8852b_rfk_channel(struct rtw89_dev *rtwdev,rtw8852b_dpk (rtwdev, phy_idx, chanctx_idx);rtw89_btc_ntfy_conn_rfk (rtwdev, false); +rtw89_fw_h2c_rf_ntfy_mcc (rtwdev); } static void rtw8852b_rfk_band_changed(struct rtw89_dev *rtwdev,
@@ -861,6 +866,10 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = { .btc_set_policy = rtw89_btc_set_policy_v1, }; +static const struct rtw89_chanctx_listener rtw8852b_chanctx_listener = { + .callbacks[RTW89_CHANCTX_CALLBACK_RFK ] = rtw8852b_rfk_chanctx_cb, +}; +#ifdef CONFIG_PM static const struct wiphy_wowlan_support rtw_wowlan_stub_8852b = { .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
@@ -909,6 +918,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .nctl_post_table = NULL, .dflt_parms = &rtw89_8852b_dflt_parms, .rfe_parms_conf = NULL, + .chanctx_listener = &rtw8852b_chanctx_listener, .txpwr_factor_bb = 3, .txpwr_factor_rf = 2, .txpwr_factor_mac = 1,
@@ -917,7 +927,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .tssi_dbw_table = NULL, .support_macid_num = RTW89_MAX_MAC_ID_NUM, .support_link_num = 0, - .support_chanctx_num = 0, + .support_chanctx_num = 2, .support_rnr = false, .support_bands =BIT (NL80211_BAND_2GHZ ) | BIT(NL80211_BAND_5GHZ),
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c +54 -23
119 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h +3 -0
@@ -27,5 +27,8 @@ void rtw8852b_wifi_scan_notify(struct rtw89_dev *rtwdev, bool scan_start,void rtw8852b_set_channel_rf (struct rtw89_dev *rtwdev,const struct rtw89_chan *chan,enum rtw89_phy_idx phy_idx); +void rtw8852b_mcc_get_ch_info (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx); +void rtw8852b_rfk_chanctx_cb (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_state state);#endif
Signature · 1 line
2.25.1