wifi: rtw89: initialize dual HW bands for MLO and control them by link

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.

Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20240925020119.13170-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 5b8e65f6de6a4e13b7130520b6a4e95b87cf7caf..6200755b5ce9e506d4861251a7b3e5abcdd54eb4 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -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 *rtwv
                rtw89_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;

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index ac9f9d33436c655160277ed15e63d606e77d90c8..f1f10b7b07318df89cab2afa82b068f9448548ed 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -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)
 {

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 1be1f61e0858bd354640d565241373a15224f03a..752a3c2536d4c51098f78b02bee293db90c22654 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -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) |
@@ -6524,7 +6528,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) {
@@ -6584,7 +6589,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) {
@@ -6622,6 +6628,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;
@@ -6644,10 +6651,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);
 }
@@ -6662,16 +6668,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);
@@ -6750,7 +6755,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;

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index a083bed3822b83728587eeb08808788722a1777f..d338c3aec725730880fdd25c5d79e8a7dadf0037 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -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,

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index 4e15d539e3d1c4512f5eb6e35fac233bef6df107..6a0262e512ea4ced3acf66d7e98b29d1c982e799 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -5543,7 +5543,8 @@ int rtw89_mac_cfg_ppdu_status_ax(struct rtw89_dev *rtwdev, u8 mac_idx, bool enab
        return 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;

diff --git a/drivers/net/wireless/realtek/rtw89/mac.h b/drivers/net/wireless/realtek/rtw89/mac.h
index 0c269961a573113406d7c1fb90098da1674a8a53..e59c1fcfea4632c7994e8244d6d8c6ec69ab7ce7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.h
+++ b/drivers/net/wireless/realtek/rtw89/mac.h
@@ -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,

diff --git a/drivers/net/wireless/realtek/rtw89/mac80211.c b/drivers/net/wireless/realtek/rtw89/mac80211.c
index 44ba4dc181b5bd5d18f23d7e00c51d60fc983982..1ee63a85308ff0244f0ae92da794eeb44c91dd4e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw89/mac80211.c
@@ -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;

diff --git a/drivers/net/wireless/realtek/rtw89/mac_be.c b/drivers/net/wireless/realtek/rtw89/mac_be.c
index f22eaa83297fb47359fed5340afda5049e2bfbd0..30943462640f9b0e0fb27e14aa9edce12a03fb7e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac_be.c
+++ b/drivers/net/wireless/realtek/rtw89/mac_be.c
@@ -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;

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index 1527b08e0c92b2f1d4a342ca6abdfc43cf69244e..7f90316a0f2fba92d9a8d59472f69e4c571cb31a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -1114,14 +1114,21 @@ static bool rtw89_chip_rf_v1(struct rtw89_dev *rtwdev)
        return rtwdev->chip->ops->write_rf == rtw89_phy_write_rf_v1;
 }
 
-static void rtw89_phy_bb_reset(struct rtw89_dev *rtwdev,
-                              enum rtw89_phy_idx phy_idx)
+static void __rtw89_phy_bb_reset(struct rtw89_dev *rtwdev,
+                                enum rtw89_phy_idx phy_idx)
 {
        const struct rtw89_chip_info *chip = rtwdev->chip;
 
        chip->ops->bb_reset(rtwdev, phy_idx);
 }
 
+static void rtw89_phy_bb_reset(struct rtw89_dev *rtwdev)
+{
+       __rtw89_phy_bb_reset(rtwdev, RTW89_PHY_0);
+       if (rtwdev->dbcc_en)
+               __rtw89_phy_bb_reset(rtwdev, RTW89_PHY_1);
+}
+
 static void rtw89_phy_config_bb_reg(struct rtw89_dev *rtwdev,
                                    const struct rtw89_reg2_def *reg,
                                    enum rtw89_rf_path rf_path,
@@ -1667,13 +1674,15 @@ void rtw89_phy_init_bb_reg(struct rtw89_dev *rtwdev)
        if (rtwdev->dbcc_en)
                rtw89_phy_init_reg(rtwdev, bb_table, rtw89_phy_config_bb_reg,
                                   (void *)RTW89_PHY_1);
-       rtw89_chip_init_txpwr_unit(rtwdev, RTW89_PHY_0);
+
+       rtw89_chip_init_txpwr_unit(rtwdev);
 
        bb_gain_table = elm_info->bb_gain ? elm_info->bb_gain : chip->bb_gain_table;
        if (bb_gain_table)
                rtw89_phy_init_reg(rtwdev, bb_gain_table,
                                   chip->phy_def->config_bb_gain, NULL);
-       rtw89_phy_bb_reset(rtwdev, RTW89_PHY_0);
+
+       rtw89_phy_bb_reset(rtwdev);
 }
 
 static u32 rtw89_phy_nctl_poll(struct rtw89_dev *rtwdev)
@@ -1793,6 +1802,24 @@ void rtw89_phy_write32_idx(struct rtw89_dev *rtwdev, u32 addr, u32 mask,
 }
 EXPORT_SYMBOL(rtw89_phy_write32_idx);
 
+void rtw89_phy_write32_idx_set(struct rtw89_dev *rtwdev, u32 addr, u32 bits,
+                              enum rtw89_phy_idx phy_idx)
+{
+       if (rtwdev->dbcc_en && phy_idx == RTW89_PHY_1)
+               addr += rtw89_phy0_phy1_offset(rtwdev, addr);
+       rtw89_phy_write32_set(rtwdev, addr, bits);
+}
+EXPORT_SYMBOL(rtw89_phy_write32_idx_set);
+
+void rtw89_phy_write32_idx_clr(struct rtw89_dev *rtwdev, u32 addr, u32 bits,
+                              enum rtw89_phy_idx phy_idx)
+{
+       if (rtwdev->dbcc_en && phy_idx == RTW89_PHY_1)
+               addr += rtw89_phy0_phy1_offset(rtwdev, addr);
+       rtw89_phy_write32_clr(rtwdev, addr, bits);
+}
+EXPORT_SYMBOL(rtw89_phy_write32_idx_clr);
+
 u32 rtw89_phy_read32_idx(struct rtw89_dev *rtwdev, u32 addr, u32 mask,
                         enum rtw89_phy_idx phy_idx)
 {
@@ -5406,7 +5433,8 @@ static u32 rtw89_phy_get_ie_bitmap_addr(enum rtw89_phy_status_bitmap ie_page)
 }
 
 static u32 rtw89_physts_get_ie_bitmap(struct rtw89_dev *rtwdev,
-                                     enum rtw89_phy_status_bitmap ie_page)
+                                     enum rtw89_phy_status_bitmap ie_page,
+                                     enum rtw89_phy_idx phy_idx)
 {
        u32 addr;
 
@@ -5415,12 +5443,12 @@ static u32 rtw89_physts_get_ie_bitmap(struct rtw89_dev *rtwdev,
 
        addr = rtw89_phy_get_ie_bitmap_addr(ie_page);
 
-       return rtw89_phy_read32(rtwdev, addr);
+       return rtw89_phy_read32_idx(rtwdev, addr, MASKDWORD, phy_idx);
 }
 
 static void rtw89_physts_set_ie_bitmap(struct rtw89_dev *rtwdev,
                                       enum rtw89_phy_status_bitmap ie_page,
-                                      u32 val)
+                                      u32 val, enum rtw89_phy_idx phy_idx)
 {
        const struct rtw89_chip_info *chip = rtwdev->chip;
        u32 addr;
@@ -5432,22 +5460,22 @@ static void rtw89_physts_set_ie_bitmap(struct rtw89_dev *rtwdev,
                val &= B_PHY_STS_BITMAP_MSK_52A;
 
        addr = rtw89_phy_get_ie_bitmap_addr(ie_page);
-       rtw89_phy_write32(rtwdev, addr, val);
+       rtw89_phy_write32_idx(rtwdev, addr, MASKDWORD, val, phy_idx);
 }
 
 static void rtw89_physts_enable_ie_bitmap(struct rtw89_dev *rtwdev,
                                          enum rtw89_phy_status_bitmap bitmap,
                                          enum rtw89_phy_status_ie_type ie,
-                                         bool enable)
+                                         bool enable, enum rtw89_phy_idx phy_idx)
 {
-       u32 val = rtw89_physts_get_ie_bitmap(rtwdev, bitmap);
+       u32 val = rtw89_physts_get_ie_bitmap(rtwdev, bitmap, phy_idx);
 
        if (enable)
                val |= BIT(ie);
        else
                val &= ~BIT(ie);
 
-       rtw89_physts_set_ie_bitmap(rtwdev, bitmap, val);
+       rtw89_physts_set_ie_bitmap(rtwdev, bitmap, val, phy_idx);
 }
 
 static void rtw89_physts_enable_fail_report(struct rtw89_dev *rtwdev,
@@ -5458,44 +5486,52 @@ static void rtw89_physts_enable_fail_report(struct rtw89_dev *rtwdev,
        const struct rtw89_physts_regs *physts = phy->physts;
 
        if (enable) {
-               rtw89_phy_write32_clr(rtwdev, physts->setting_addr,
-                                     physts->dis_trigger_fail_mask);
-               rtw89_phy_write32_clr(rtwdev, physts->setting_addr,
-                                     physts->dis_trigger_brk_mask);
+               rtw89_phy_write32_idx_clr(rtwdev, physts->setting_addr,
+                                         physts->dis_trigger_fail_mask, phy_idx);
+               rtw89_phy_write32_idx_clr(rtwdev, physts->setting_addr,
+                                         physts->dis_trigger_brk_mask, phy_idx);
        } else {
-               rtw89_phy_write32_set(rtwdev, physts->setting_addr,
-                                     physts->dis_trigger_fail_mask);
-               rtw89_phy_write32_set(rtwdev, physts->setting_addr,
-                                     physts->dis_trigger_brk_mask);
+               rtw89_phy_write32_idx_set(rtwdev, physts->setting_addr,
+                                         physts->dis_trigger_fail_mask, phy_idx);
+               rtw89_phy_write32_idx_set(rtwdev, physts->setting_addr,
+                                         physts->dis_trigger_brk_mask, phy_idx);
        }
 }
 
-static void rtw89_physts_parsing_init(struct rtw89_dev *rtwdev)
+static void __rtw89_physts_parsing_init(struct rtw89_dev *rtwdev,
+                                       enum rtw89_phy_idx phy_idx)
 {
        u8 i;
 
-       rtw89_physts_enable_fail_report(rtwdev, false, RTW89_PHY_0);
+       rtw89_physts_enable_fail_report(rtwdev, false, phy_idx);
 
        for (i = 0; i < RTW89_PHYSTS_BITMAP_NUM; i++) {
                if (i >= RTW89_CCK_PKT)
                        rtw89_physts_enable_ie_bitmap(rtwdev, i,
                                                      RTW89_PHYSTS_IE09_FTR_0,
-                                                     true);
+                                                     true, phy_idx);
                if ((i >= RTW89_CCK_BRK && i <= RTW89_VHT_MU) ||
                    (i >= RTW89_RSVD_9 && i <= RTW89_CCK_PKT))
                        continue;
                rtw89_physts_enable_ie_bitmap(rtwdev, i,
                                              RTW89_PHYSTS_IE24_OFDM_TD_PATH_A,
-                                             true);
+                                             true, phy_idx);
        }
        rtw89_physts_enable_ie_bitmap(rtwdev, RTW89_VHT_PKT,
-                                     RTW89_PHYSTS_IE13_DL_MU_DEF, true);
+                                     RTW89_PHYSTS_IE13_DL_MU_DEF, true, phy_idx);
        rtw89_physts_enable_ie_bitmap(rtwdev, RTW89_HE_PKT,
-                                     RTW89_PHYSTS_IE13_DL_MU_DEF, true);
+                                     RTW89_PHYSTS_IE13_DL_MU_DEF, true, phy_idx);
 
        /* force IE01 for channel index, only channel field is valid */
        rtw89_physts_enable_ie_bitmap(rtwdev, RTW89_CCK_PKT,
-                                     RTW89_PHYSTS_IE01_CMN_OFDM, true);
+                                     RTW89_PHYSTS_IE01_CMN_OFDM, true, phy_idx);
+}
+
+static void rtw89_physts_parsing_init(struct rtw89_dev *rtwdev)
+{
+       __rtw89_physts_parsing_init(rtwdev, RTW89_PHY_0);
+       if (rtwdev->dbcc_en)
+               __rtw89_physts_parsing_init(rtwdev, RTW89_PHY_1);
 }
 
 static void rtw89_phy_dig_read_gain_table(struct rtw89_dev *rtwdev, int type)
@@ -6246,7 +6282,7 @@ void rtw89_phy_set_bss_color(struct rtw89_dev *rtwdev,
        struct ieee80211_vif *vif = rtwvif_link_to_vif(rtwvif_link);
        const struct rtw89_chip_info *chip = rtwdev->chip;
        const struct rtw89_reg_def *bss_clr_vld = &chip->bss_clr_vld;
-       enum rtw89_phy_idx phy_idx = RTW89_PHY_0;
+       enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx;
        struct ieee80211_bss_conf *bss_conf;
        u8 bss_color;
 

diff --git a/drivers/net/wireless/realtek/rtw89/phy.h b/drivers/net/wireless/realtek/rtw89/phy.h
index 727b69c45a52783e2e755d8a7f24410dc1650b19..c683f4d7d29b0a649dd245e3421a61243ae91987 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.h
+++ b/drivers/net/wireless/realtek/rtw89/phy.h
@@ -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,

diff --git a/drivers/net/wireless/realtek/rtw89/phy_be.c b/drivers/net/wireless/realtek/rtw89/phy_be.c
index 72eda9bbd3ae4d55732a2909e80a4f222db84875..37d8f254ae3259b93a9fbe2bdfa1b4039852e925 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy_be.c
+++ b/drivers/net/wireless/realtek/rtw89/phy_be.c
@@ -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);

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
index 2aff7e29992f6d55a9bcef5ab7a32e7fdfbdc6db..58c9721ac3abe4be523e591e980e18ec774e5017 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
@@ -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)