wifi: rtw89: configure two HW bands as preparation of MLO
Ping-Ke Shih
maintainercover wifi: rtw89: configure two HW bands as preparation of MLO
Originally we only configure first hardware band, and now we should configure second hardware band or both bands for MLO.
Zong-Zhe Yang (2):
wifi: rtw89: initialize dual HW bands for MLO and control them by link
wifi: rtw89: handle entity active flag per PHY
drivers/net/wireless/realtek/rtw89/chan.h | 11 ++- drivers/net/wireless/realtek/rtw89/core.c | 37 ++++---- drivers/net/wireless/realtek/rtw89/core.h | 21 +++-- drivers/net/wireless/realtek/rtw89/fw.c | 33 ++++--- drivers/net/wireless/realtek/rtw89/fw.h | 4 - drivers/net/wireless/realtek/rtw89/mac.c | 15 +++- drivers/net/wireless/realtek/rtw89/mac.h | 17 +++- drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 2 +- drivers/net/wireless/realtek/rtw89/phy.c | 90 +++++++++++++------ drivers/net/wireless/realtek/rtw89/phy.h | 4 + drivers/net/wireless/realtek/rtw89/phy_be.c | 12 ++- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 17 +++- 13 files changed, 180 insertions(+), 85 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/2 wifi: rtw89: initialize dual HW bands for MLO and control them by link
From: Zong-Zhe Yang <[email protected]>
To support MLO, we initialize things on dual HW bands of Wi-Fi 7 chip. And, each link will indicate which HW band it's bound to. So, in link control flow, we control major things based on target link's HW band instead of hardcode like RTW89_PHY_X or RTW89_MAC_X.
--- drivers/net/wireless/realtek/rtw89/core.c | 22 ++--- drivers/net/wireless/realtek/rtw89/core.h | 19 +++- drivers/net/wireless/realtek/rtw89/fw.c | 33 ++++--- drivers/net/wireless/realtek/rtw89/fw.h | 4 - drivers/net/wireless/realtek/rtw89/mac.c | 12 ++- drivers/net/wireless/realtek/rtw89/mac.h | 17 +++- drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 2 +- drivers/net/wireless/realtek/rtw89/phy.c | 90 +++++++++++++------ drivers/net/wireless/realtek/rtw89/phy.h | 4 + drivers/net/wireless/realtek/rtw89/phy_be.c | 12 ++- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 17 +++- 12 files changed, 162 insertions(+), 72 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +11 -11
@@ -3150,6 +3150,7 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)struct rtw89_vif_link *rtwvif_link;struct cfg80211_chan_def roc_chan;struct rtw89_vif *tmp_vif; +u32 reg;int ret;lockdep_assert_held (&rtwdev->mutex);
@@ -3185,9 +3186,9 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)cfg80211_chandef_create (&roc_chan, &roc->chan,NL80211_CHAN_NO_HT );rtw89_config_roc_chandef (rtwdev, rtwvif_link->chanctx_idx, &roc_chan);rtw89_set_channel (rtwdev); -rtw89_write32_clr (rtwdev, -rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ), -B_AX_A_UC_CAM_MATCH |B_AX_A_BC_CAM_MATCH ); + + reg =rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr, rtwvif_link->mac_idx); +rtw89_write32_clr (rtwdev, reg,B_AX_A_UC_CAM_MATCH |B_AX_A_BC_CAM_MATCH );ieee80211_ready_on_channel (hw);cancel_delayed_work (&rtwvif->roc.roc_work);
@@ -3202,6 +3203,7 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)struct rtw89_roc *roc = &rtwvif->roc;struct rtw89_vif_link *rtwvif_link;struct rtw89_vif *tmp_vif; +u32 reg;int ret;lockdep_assert_held (&rtwdev->mutex);
@@ -3217,10 +3219,8 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)return ; } -rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ), -B_AX_RX_FLTR_CFG_MASK , - rtwdev->hal.rx_fltr); + reg =rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr, rtwvif_link->mac_idx); +rtw89_write32_mask (rtwdev, reg,B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr); roc->state =RTW89_ROC_IDLE ;rtw89_config_roc_chandef (rtwdev, rtwvif_link->chanctx_idx,NULL );
@@ -4399,8 +4399,8 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)rtw89_phy_dm_init (rtwdev); -rtw89_mac_cfg_ppdu_status (rtwdev,RTW89_MAC_0 , true); -rtw89_mac_update_rts_threshold (rtwdev,RTW89_MAC_0 ); +rtw89_mac_cfg_ppdu_status_bands (rtwdev, true); +rtw89_mac_update_rts_threshold (rtwdev);rtw89_tas_reset (rtwdev);
@@ -4751,7 +4751,7 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvrtw89_leave_ips_by_hwflags (rtwdev);ether_addr_copy (rtwvif_link->mac_addr, mac_addr); -rtw89_btc_ntfy_scan_start (rtwdev,RTW89_PHY_0 , chan->band_type); +rtw89_btc_ntfy_scan_start (rtwdev, rtwvif_link->phy_idx, chan->band_type);rtw89_chip_rfk_scan (rtwdev, rtwvif_link, true);rtw89_hci_recalc_int_mit (rtwdev);rtw89_phy_config_edcca (rtwdev, true);
@@ -4777,7 +4777,7 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL );rtw89_chip_rfk_scan (rtwdev, rtwvif_link, false); -rtw89_btc_ntfy_scan_finish (rtwdev,RTW89_PHY_0 ); +rtw89_btc_ntfy_scan_finish (rtwdev, rtwvif_link->phy_idx);rtw89_phy_config_edcca (rtwdev, false); rtwdev->scanning = false;
drivers/net/wireless/realtek/rtw89/core.h +15 -4
@@ -6484,8 +6484,12 @@ static inline void rtw89_chip_set_txpwr_ctrl(struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip; -if (chip->ops->set_txpwr_ctrl) - chip->ops->set_txpwr_ctrl (rtwdev,RTW89_PHY_0 ); +if (!chip->ops->set_txpwr_ctrl) +return ; + + chip->ops->set_txpwr_ctrl (rtwdev,RTW89_PHY_0 ); +if (rtwdev->dbcc_en) + chip->ops->set_txpwr_ctrl (rtwdev,RTW89_PHY_1 ); }static inline void rtw89_chip_power_trim (struct rtw89_dev *rtwdev)
@@ -6496,8 +6500,8 @@ static inline void rtw89_chip_power_trim(struct rtw89_dev *rtwdev) chip->ops->power_trim (rtwdev); } -static inline void rtw89_chip_init_txpwr_unit (struct rtw89_dev *rtwdev, -enum rtw89_phy_idx phy_idx) +static inline void __rtw89_chip_init_txpwr_unit (struct rtw89_dev *rtwdev, +enum rtw89_phy_idx phy_idx) {const struct rtw89_chip_info *chip = rtwdev->chip;
@@ -6505,6 +6509,13 @@ static inline void rtw89_chip_init_txpwr_unit(struct rtw89_dev *rtwdev, chip->ops->init_txpwr_unit (rtwdev, phy_idx); } +static inline void rtw89_chip_init_txpwr_unit (struct rtw89_dev *rtwdev) +{ +__rtw89_chip_init_txpwr_unit (rtwdev,RTW89_PHY_0 ); +if (rtwdev->dbcc_en) +__rtw89_chip_init_txpwr_unit (rtwdev,RTW89_PHY_1 ); +} +static inline u8 rtw89_chip_get_thermal (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path) {
drivers/net/wireless/realtek/rtw89/fw.c +19 -14
@@ -4761,6 +4761,7 @@ int rtw89_fw_h2c_add_pkt_offload(struct rtw89_dev *rtwdev, u8 *id,return 0 ; } +static int rtw89_fw_h2c_scan_list_offload (struct rtw89_dev *rtwdev,int ch_num,struct list_head *chan_list) {
@@ -4832,8 +4833,10 @@ int rtw89_fw_h2c_scan_list_offload(struct rtw89_dev *rtwdev, int ch_num,return 0 ; } +static int rtw89_fw_h2c_scan_list_offload_be (struct rtw89_dev *rtwdev,int ch_num, -struct list_head *chan_list) +struct list_head *chan_list, +struct rtw89_vif_link *rtwvif_link) {struct rtw89_wait_info *wait = &rtwdev->mac.fw_ofld_wait;struct rtw89_h2c_chinfo_elem_be *elem;
@@ -4858,7 +4861,8 @@ int rtw89_fw_h2c_scan_list_offload_be(struct rtw89_dev *rtwdev, int ch_num, h2c->ch_num = ch_num; h2c->elem_size =sizeof (*elem) /4 ;/* in unit of 4 bytes */ - h2c->arg =u8_encode_bits (RTW89_PHY_0 ,RTW89_H2C_CHINFO_ARG_MAC_IDX_MASK ); + h2c->arg =u8_encode_bits (rtwvif_link->mac_idx, +RTW89_H2C_CHINFO_ARG_MAC_IDX_MASK );list_for_each_entry (ch_info, chan_list, list) { elem = (struct rtw89_h2c_chinfo_elem_be *)skb_put (skb,sizeof (*elem));
@@ -4965,7 +4969,7 @@ int rtw89_fw_h2c_scan_offload_ax(struct rtw89_dev *rtwdev, h2c->w0 =le32_encode_bits (rtwvif_link->mac_id,RTW89_H2C_SCANOFLD_W0_MACID ) |le32_encode_bits (rtwvif_link->port,RTW89_H2C_SCANOFLD_W0_PORT_ID ) | -le32_encode_bits (RTW89_PHY_0 ,RTW89_H2C_SCANOFLD_W0_BAND ) | +le32_encode_bits (rtwvif_link->mac_idx,RTW89_H2C_SCANOFLD_W0_BAND ) |le32_encode_bits (option->enable,RTW89_H2C_SCANOFLD_W0_OPERATION ); h2c->w1 = le32_encode_bits(true, RTW89_H2C_SCANOFLD_W1_NOTIFY_END) |
@@ -6521,7 +6525,8 @@ int rtw89_pno_scan_add_chan_list_be(struct rtw89_dev *rtwdev,list_add_tail (&ch_info->list, &chan_list); } - ret =rtw89_fw_h2c_scan_list_offload_be (rtwdev, list_len, &chan_list); + ret =rtw89_fw_h2c_scan_list_offload_be (rtwdev, list_len, &chan_list, + rtwvif_link); out:list_for_each_entry_safe (ch_info, tmp, &chan_list, list) {
@@ -6581,7 +6586,8 @@ int rtw89_hw_scan_add_chan_list_be(struct rtw89_dev *rtwdev, } rtwdev->scan_info.last_chan_idx = idx; - ret =rtw89_fw_h2c_scan_list_offload_be (rtwdev, list_len, &chan_list); + ret =rtw89_fw_h2c_scan_list_offload_be (rtwdev, list_len, &chan_list, + rtwvif_link); out:list_for_each_entry_safe (ch_info, tmp, &chan_list, list) {
@@ -6619,6 +6625,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif = rtwvif_link->rtwvif;u32 rx_fltr = rtwdev->hal.rx_fltr;u8 mac_addr[ETH_ALEN ]; +u32 reg;/* clone op and keep it during scan */ rtwdev->scan_info.op_chan = *chan;
@@ -6641,10 +6648,9 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, rx_fltr &= ~B_AX_A_BCN_CHK_EN ; rx_fltr &= ~B_AX_A_BC ; rx_fltr &= ~B_AX_A_A1_MATCH ; -rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ), -B_AX_RX_FLTR_CFG_MASK , - rx_fltr); + + reg =rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr, rtwvif_link->mac_idx); +rtw89_write32_mask (rtwdev, reg,B_AX_RX_FLTR_CFG_MASK , rx_fltr);rtw89_chanctx_pause (rtwdev,RTW89_CHANCTX_PAUSE_REASON_HW_SCAN ); }
@@ -6659,16 +6665,15 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, .aborted = aborted, };struct rtw89_vif *rtwvif; +u32 reg;if (!rtwvif_link)return ; rtwvif = rtwvif_link->rtwvif; -rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ), -B_AX_RX_FLTR_CFG_MASK , - rtwdev->hal.rx_fltr); + reg =rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr, rtwvif_link->mac_idx); +rtw89_write32_mask (rtwdev, reg,B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);rtw89_core_scan_complete (rtwdev, rtwvif_link, true);ieee80211_scan_completed (rtwdev->hw, &info);
@@ -6747,7 +6752,7 @@ int rtw89_hw_scan_offload(struct rtw89_dev *rtwdev,if (rtwdev->chip->chip_gen ==RTW89_CHIP_BE ) { opt.operation = enable ?RTW89_SCAN_OP_START :RTW89_SCAN_OP_STOP ; opt.scan_mode =RTW89_SCAN_MODE_SA ; - opt.band =RTW89_PHY_0 ; + opt.band = rtwvif_link->mac_idx; opt.num_macc_role =0 ; opt.mlo_mode = rtwdev->mlo_dbcc_mode; opt.num_opch = connected ?1 :0 ;
drivers/net/wireless/realtek/rtw89/fw.h +0 -4
@@ -4527,10 +4527,6 @@ int rtw89_fw_h2c_cxdrv_rfk(struct rtw89_dev *rtwdev, u8 type);int rtw89_fw_h2c_del_pkt_offload (struct rtw89_dev *rtwdev,u8 id);int rtw89_fw_h2c_add_pkt_offload (struct rtw89_dev *rtwdev,u8 *id,struct sk_buff *skb_ofld); -int rtw89_fw_h2c_scan_list_offload (struct rtw89_dev *rtwdev,int ch_num, -struct list_head *chan_list); -int rtw89_fw_h2c_scan_list_offload_be (struct rtw89_dev *rtwdev,int ch_num, -struct list_head *chan_list); int rtw89_fw_h2c_scan_offload_ax(struct rtw89_dev *rtwdev, struct rtw89_scan_option *opt, struct rtw89_vif_link *vif,
drivers/net/wireless/realtek/rtw89/mac.c +10 -2
@@ -5543,7 +5543,8 @@ int rtw89_mac_cfg_ppdu_status_ax(struct rtw89_dev *rtwdev, u8 mac_idx, bool enabreturn 0 ; } -void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev,u8 mac_idx) +static +void __rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev,u8 mac_idx) {#define MAC_AX_TIME_TH_SH 5#define MAC_AX_LEN_TH_SH 4
@@ -5573,6 +5574,13 @@ void rtw89_mac_update_rts_threshold(struct rtw89_dev *rtwdev, u8 mac_idx)rtw89_write16_mask (rtwdev, reg,B_AX_RTS_LEN_TH_MASK , len_th); } +void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev) +{ +__rtw89_mac_update_rts_threshold (rtwdev,RTW89_MAC_0 ); +if (rtwdev->dbcc_en) +__rtw89_mac_update_rts_threshold (rtwdev,RTW89_MAC_1 ); +} +void rtw89_mac_flush_txq (struct rtw89_dev *rtwdev,u32 queues,bool drop) {bool empty;
@@ -6446,7 +6454,7 @@ void rtw89_mac_pkt_drop_sta(struct rtw89_dev *rtwdev,struct rtw89_pkt_drop_params params = {0 };int i; - params.mac_band =RTW89_MAC_0 ; + params.mac_band = rtwvif_link->mac_idx; params.macid = rtwsta_link->mac_id; params.port = rtwvif_link->port; params.mbssid =0 ;
drivers/net/wireless/realtek/rtw89/mac.h +16 -1
@@ -1222,7 +1222,22 @@ int rtw89_mac_cfg_ppdu_status(struct rtw89_dev *rtwdev, u8 mac_idx, bool enable)return mac->cfg_ppdu_status (rtwdev, mac_idx, enable); } -void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev,u8 mac_idx); +static inline +int rtw89_mac_cfg_ppdu_status_bands (struct rtw89_dev *rtwdev,bool enable) +{ +int ret; + + ret =rtw89_mac_cfg_ppdu_status (rtwdev,RTW89_MAC_0 , enable); +if (ret) +return ret; + +if (!rtwdev->dbcc_en) +return 0 ; + +return rtw89_mac_cfg_ppdu_status (rtwdev,RTW89_MAC_1 , enable); +} + +void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev);void rtw89_mac_flush_txq (struct rtw89_dev *rtwdev,u32 queues,bool drop);int rtw89_mac_coex_init (struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex *coex); int rtw89_mac_coex_init_v1(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -1
@@ -1031,7 +1031,7 @@ static int rtw89_ops_set_rts_threshold(struct ieee80211_hw *hw, u32 value)mutex_lock (&rtwdev->mutex);rtw89_leave_ps_mode (rtwdev);if (test_bit (RTW89_FLAG_POWERON , rtwdev->flags)) -rtw89_mac_update_rts_threshold (rtwdev,RTW89_MAC_0 ); +rtw89_mac_update_rts_threshold (rtwdev);mutex_unlock (&rtwdev->mutex);return 0 ;
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -1
@@ -773,7 +773,7 @@ static int dmac_init_be(struct rtw89_dev *rtwdev, u8 mac_idx)return ret; } - ret =rtw89_mac_preload_init (rtwdev,RTW89_MAC_0 , rtwdev->mac.qta_mode); + ret =rtw89_mac_preload_init (rtwdev, mac_idx, rtwdev->mac.qta_mode);if (ret) {rtw89_err (rtwdev,"[ERR]preload init %d\n" , ret);return ret;
drivers/net/wireless/realtek/rtw89/phy.c +63 -27
188 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/phy.h +4 -0
@@ -815,6 +815,10 @@ void rtw89_phy_config_rf_reg_v1(struct rtw89_dev *rtwdev,void rtw89_phy_dm_init (struct rtw89_dev *rtwdev);void rtw89_phy_write32_idx (struct rtw89_dev *rtwdev,u32 addr,u32 mask,u32 data,enum rtw89_phy_idx phy_idx); +void rtw89_phy_write32_idx_set (struct rtw89_dev *rtwdev,u32 addr,u32 bits, +enum rtw89_phy_idx phy_idx); +void rtw89_phy_write32_idx_clr (struct rtw89_dev *rtwdev,u32 addr,u32 bits, +enum rtw89_phy_idx phy_idx);u32 rtw89_phy_read32_idx (struct rtw89_dev *rtwdev,u32 addr,u32 mask,enum rtw89_phy_idx phy_idx); s8 *rtw89_phy_raw_byr_seek(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/phy_be.c +9 -3
@@ -398,10 +398,9 @@ static void rtw89_phy_bb_wrap_ul_pwr(struct rtw89_dev *rtwdev) } } -static void rtw89_phy_bb_wrap_init_be (struct rtw89_dev *rtwdev) +static void __rtw89_phy_bb_wrap_init_be (struct rtw89_dev *rtwdev, +enum rtw89_mac_idx mac_idx) { -enum rtw89_mac_idx mac_idx =RTW89_MAC_0 ; -rtw89_phy_bb_wrap_pwr_by_macid_init (rtwdev);rtw89_phy_bb_wrap_tx_path_by_macid_init (rtwdev);rtw89_phy_bb_wrap_listen_path_en_init (rtwdev);
@@ -411,6 +410,13 @@ static void rtw89_phy_bb_wrap_init_be(struct rtw89_dev *rtwdev)rtw89_phy_bb_wrap_ul_pwr (rtwdev); } +static void rtw89_phy_bb_wrap_init_be (struct rtw89_dev *rtwdev) +{ +__rtw89_phy_bb_wrap_init_be (rtwdev,RTW89_MAC_0 ); +if (rtwdev->dbcc_en) +__rtw89_phy_bb_wrap_init_be (rtwdev,RTW89_MAC_1 ); +} +static void rtw89_phy_ch_info_init_be (struct rtw89_dev *rtwdev) {rtw89_phy_write32_mask (rtwdev,R_CHINFO_SEG ,B_CHINFO_SEG_LEN ,0x0 );
drivers/net/wireless/realtek/rtw89/rtw8922a.c +13 -4
@@ -1991,14 +1991,23 @@ static void rtw8922a_rfk_init(struct rtw89_dev *rtwdev)memset (rfk_mcc,0 ,sizeof (*rfk_mcc)); } +static void __rtw8922a_rfk_init_late (struct rtw89_dev *rtwdev, +enum rtw89_phy_idx phy_idx, +const struct rtw89_chan *chan) +{ +rtw89_phy_rfk_pre_ntfy_and_wait (rtwdev, phy_idx,5 ); + +rtw89_phy_rfk_dack_and_wait (rtwdev, phy_idx, chan,58 ); +rtw89_phy_rfk_rxdck_and_wait (rtwdev, phy_idx, chan, false,32 ); +} +static void rtw8922a_rfk_init_late (struct rtw89_dev *rtwdev) {const struct rtw89_chan *chan =rtw89_chan_get (rtwdev,RTW89_CHANCTX_0 ); -rtw89_phy_rfk_pre_ntfy_and_wait (rtwdev,RTW89_PHY_0 ,5 ); - -rtw89_phy_rfk_dack_and_wait (rtwdev,RTW89_PHY_0 , chan,58 ); -rtw89_phy_rfk_rxdck_and_wait (rtwdev,RTW89_PHY_0 , chan, false,32 ); +__rtw8922a_rfk_init_late (rtwdev,RTW89_PHY_0 , chan); +if (rtwdev->dbcc_en) +__rtw8922a_rfk_init_late (rtwdev,RTW89_PHY_1 , chan); }static void _wait_rx_mode (struct rtw89_dev *rtwdev,u8 kpath)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH 1/2] wifi: rtw89: initialize dual HW bands for MLO and control them by link
Quoted 9 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
To support MLO, we initialize things on dual HW bands of Wi-Fi 7 chip. And, each link will indicate which HW band it's bound to. So, in link control flow, we control major things based on target link's HW band instead of hardcode like
RTW89_PHY_XorRTW89_MAC_X.Signed-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
2 patch(es) applied to rtw-next branch of rtw.git, thanks.
f82a4471fc51 wifi: rtw89: initialize dual HW bands for MLO and control them by link ad95bb3b92c6 wifi: rtw89: handle entity active flag per PHY
Ping-Ke Shih
maintainerPATCH 2/2 wifi: rtw89: handle entity active flag per PHY
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Originally, we have an active flag to record whether we have set PHY once. After impending MLO support, there will be dual-PHY and they can be set individually on Wi-Fi 7 chips. So, we now have active flag per PHY and handle them individually.
--- drivers/net/wireless/realtek/rtw89/chan.h | 11 +++++++---- drivers/net/wireless/realtek/rtw89/core.c | 15 ++++++++------- drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/mac.c | 3 ++- 4 files changed, 18 insertions(+), 13 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.h +7 -4
@@ -43,18 +43,21 @@ struct rtw89_entity_weight {unsigned int active_roles; }; -static inline bool rtw89_get_entity_state (struct rtw89_dev *rtwdev) +static inline bool rtw89_get_entity_state (struct rtw89_dev *rtwdev, +enum rtw89_phy_idx phy_idx) {struct rtw89_hal *hal = &rtwdev->hal; -return READ_ONCE (hal->entity_active); +return READ_ONCE (hal->entity_active[phy_idx]); } -static inline void rtw89_set_entity_state (struct rtw89_dev *rtwdev,bool active) +static inline void rtw89_set_entity_state (struct rtw89_dev *rtwdev, +enum rtw89_phy_idx phy_idx, +bool active) {struct rtw89_hal *hal = &rtwdev->hal; -WRITE_ONCE (hal->entity_active, active); +WRITE_ONCE (hal->entity_active[phy_idx], active); } static inline
drivers/net/wireless/realtek/rtw89/core.c +8 -7
@@ -352,10 +352,6 @@ void rtw89_core_set_chip_txpwr(struct rtw89_dev *rtwdev)enum rtw89_entity_mode mode;bool entity_active; - entity_active =rtw89_get_entity_state (rtwdev); -if (!entity_active) -return ; - mode =rtw89_get_entity_mode (rtwdev);switch (mode) {case RTW89_ENTITY_MODE_SCC :
@@ -375,6 +371,11 @@ void rtw89_core_set_chip_txpwr(struct rtw89_dev *rtwdev) chanctx_idx = roc_idx; phy_idx =RTW89_PHY_0 ; + + entity_active =rtw89_get_entity_state (rtwdev, phy_idx); +if (!entity_active) +return ; + chan =rtw89_chan_get (rtwdev, chanctx_idx); chip->ops->set_txpwr (rtwdev, chan, phy_idx); }
@@ -393,8 +394,6 @@ int rtw89_set_channel(struct rtw89_dev *rtwdev)enum rtw89_entity_mode mode;bool entity_active; - entity_active =rtw89_get_entity_state (rtwdev); - mode =rtw89_entity_recalc (rtwdev);switch (mode) {case RTW89_ENTITY_MODE_SCC :
@@ -416,6 +415,8 @@ int rtw89_set_channel(struct rtw89_dev *rtwdev) mac_idx =RTW89_MAC_0 ; phy_idx =RTW89_PHY_0 ; + entity_active =rtw89_get_entity_state (rtwdev, phy_idx); + chan =rtw89_chan_get (rtwdev, chanctx_idx); chan_rcd =rtw89_chan_rcd_get (rtwdev, chanctx_idx);
@@ -432,7 +433,7 @@ int rtw89_set_channel(struct rtw89_dev *rtwdev)rtw89_chip_rfk_band_changed (rtwdev, phy_idx, chan); } -rtw89_set_entity_state (rtwdev, true); +rtw89_set_entity_state (rtwdev, phy_idx, true);return 0 ; }
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -4669,7 +4669,7 @@ struct rtw89_hal {struct rtw89_chanctx chanctx[NUM_OF_RTW89_CHANCTX ];struct cfg80211_chan_def roc_chandef; -bool entity_active; +bool entity_active[RTW89_PHY_MAX ];bool entity_pause;enum rtw89_entity_mode entity_mode;
drivers/net/wireless/realtek/rtw89/mac.c +2 -1
@@ -1483,7 +1483,8 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)clear_bit (RTW89_FLAG_CMAC1_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_FW_RDY , rtwdev->flags);rtw89_write8 (rtwdev,R_AX_SCOREBOARD +3 ,MAC_AX_NOTIFY_PWR_MAJOR ); -rtw89_set_entity_state (rtwdev, false); +rtw89_set_entity_state (rtwdev,RTW89_PHY_0 , false); +rtw89_set_entity_state (rtwdev,RTW89_PHY_1 , false); }return 0 ;
Signature · 1 line
2.25.1