wifi: rtw89: concentrate parameter control for setting channel callback

For future support on multiple channels by multiple sub-entities,
we need to manage parameters of each channel instance like rtw89_chan,
rtw89_mac_idx, rtw89_phy_idx. So, we adjust related channel callback
functions and centrally conrtol these parameters in set_channel().

Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220809104952.61355-8-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 05ec34d..fb3943c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -319,13 +319,15 @@ void rtw89_set_channel(struct rtw89_dev *rtwdev)
 
        rtw89_set_entity_state(rtwdev, true);
 
-       rtw89_chip_set_channel_prepare(rtwdev, &bak);
+       rtw89_chip_set_channel_prepare(rtwdev, &bak, &chan,
+                                      RTW89_MAC_0, RTW89_PHY_0);
 
-       chip->ops->set_channel(rtwdev, &chan);
+       chip->ops->set_channel(rtwdev, &chan, RTW89_MAC_0, RTW89_PHY_0);
 
        rtw89_core_set_chip_txpwr(rtwdev);
 
-       rtw89_chip_set_channel_done(rtwdev, &bak);
+       rtw89_chip_set_channel_done(rtwdev, &bak, &chan,
+                                   RTW89_MAC_0, RTW89_PHY_0);
 
        if (!entity_active || band_changed) {
                rtw89_btc_ntfy_switch_band(rtwdev, RTW89_PHY_0, chan.band_type);

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 34efccd..7de9e22 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -2115,9 +2115,14 @@ struct rtw89_chip_ops {
        bool (*write_rf)(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path,
                         u32 addr, u32 mask, u32 data);
        void (*set_channel)(struct rtw89_dev *rtwdev,
-                           const struct rtw89_chan *chan);
+                           const struct rtw89_chan *chan,
+                           enum rtw89_mac_idx mac_idx,
+                           enum rtw89_phy_idx phy_idx);
        void (*set_channel_help)(struct rtw89_dev *rtwdev, bool enter,
-                                struct rtw89_channel_help_params *p);
+                                struct rtw89_channel_help_params *p,
+                                const struct rtw89_chan *chan,
+                                enum rtw89_mac_idx mac_idx,
+                                enum rtw89_phy_idx phy_idx);
        int (*read_efuse)(struct rtw89_dev *rtwdev, u8 *log_map);
        int (*read_phycap)(struct rtw89_dev *rtwdev, u8 *phycap_map);
        void (*fem_setup)(struct rtw89_dev *rtwdev);
@@ -3604,16 +3609,24 @@ struct rtw89_bssid_cam_entry *rtw89_get_bssid_cam_of(struct rtw89_vif *rtwvif,
 
 static inline
 void rtw89_chip_set_channel_prepare(struct rtw89_dev *rtwdev,
-                                   struct rtw89_channel_help_params *p)
+                                   struct rtw89_channel_help_params *p,
+                                   const struct rtw89_chan *chan,
+                                   enum rtw89_mac_idx mac_idx,
+                                   enum rtw89_phy_idx phy_idx)
 {
-       rtwdev->chip->ops->set_channel_help(rtwdev, true, p);
+       rtwdev->chip->ops->set_channel_help(rtwdev, true, p, chan,
+                                           mac_idx, phy_idx);
 }
 
 static inline
 void rtw89_chip_set_channel_done(struct rtw89_dev *rtwdev,
-                                struct rtw89_channel_help_params *p)
+                                struct rtw89_channel_help_params *p,
+                                const struct rtw89_chan *chan,
+                                enum rtw89_mac_idx mac_idx,
+                                enum rtw89_phy_idx phy_idx)
 {
-       rtwdev->chip->ops->set_channel_help(rtwdev, false, p);
+       rtwdev->chip->ops->set_channel_help(rtwdev, false, p, chan,
+                                           mac_idx, phy_idx);
 }
 
 static inline

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 3630c18..2cf72dd 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -1156,10 +1156,12 @@ static void rtw8852a_set_channel_bb(struct rtw89_dev *rtwdev,
 }
 
 static void rtw8852a_set_channel(struct rtw89_dev *rtwdev,
-                                const struct rtw89_chan *chan)
+                                const struct rtw89_chan *chan,
+                                enum rtw89_mac_idx mac_idx,
+                                enum rtw89_phy_idx phy_idx)
 {
-       rtw8852a_set_channel_mac(rtwdev, chan, RTW89_MAC_0);
-       rtw8852a_set_channel_bb(rtwdev, chan, RTW89_PHY_0);
+       rtw8852a_set_channel_mac(rtwdev, chan, mac_idx);
+       rtw8852a_set_channel_bb(rtwdev, chan, phy_idx);
 }
 
 static void rtw8852a_dfs_en(struct rtw89_dev *rtwdev, bool en)
@@ -1210,25 +1212,27 @@ static void rtw8852a_adc_en(struct rtw89_dev *rtwdev, bool en)
 }
 
 static void rtw8852a_set_channel_help(struct rtw89_dev *rtwdev, bool enter,
-                                     struct rtw89_channel_help_params *p)
+                                     struct rtw89_channel_help_params *p,
+                                     const struct rtw89_chan *chan,
+                                     enum rtw89_mac_idx mac_idx,
+                                     enum rtw89_phy_idx phy_idx)
 {
-       u8 phy_idx = RTW89_PHY_0;
-
        if (enter) {
-               rtw89_chip_stop_sch_tx(rtwdev, RTW89_MAC_0, &p->tx_en, RTW89_SCH_TX_SEL_ALL);
-               rtw89_mac_cfg_ppdu_status(rtwdev, RTW89_MAC_0, false);
+               rtw89_chip_stop_sch_tx(rtwdev, mac_idx, &p->tx_en,
+                                      RTW89_SCH_TX_SEL_ALL);
+               rtw89_mac_cfg_ppdu_status(rtwdev, mac_idx, false);
                rtw8852a_dfs_en(rtwdev, false);
-               rtw8852a_tssi_cont_en_phyidx(rtwdev, false, RTW89_PHY_0);
+               rtw8852a_tssi_cont_en_phyidx(rtwdev, false, phy_idx);
                rtw8852a_adc_en(rtwdev, false);
                fsleep(40);
                rtw8852a_bb_reset_en(rtwdev, phy_idx, false);
        } else {
-               rtw89_mac_cfg_ppdu_status(rtwdev, RTW89_MAC_0, true);
+               rtw89_mac_cfg_ppdu_status(rtwdev, mac_idx, true);
                rtw8852a_adc_en(rtwdev, true);
                rtw8852a_dfs_en(rtwdev, true);
-               rtw8852a_tssi_cont_en_phyidx(rtwdev, true, RTW89_PHY_0);
+               rtw8852a_tssi_cont_en_phyidx(rtwdev, true, phy_idx);
                rtw8852a_bb_reset_en(rtwdev, phy_idx, true);
-               rtw89_chip_resume_sch_tx(rtwdev, RTW89_MAC_0, p->tx_en);
+               rtw89_chip_resume_sch_tx(rtwdev, mac_idx, p->tx_en);
        }
 }
 

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index ab7eb6c..7a2822f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -1529,11 +1529,9 @@ static void rtw8852c_bb_reset_all(struct rtw89_dev *rtwdev,
                              phy_idx);
 }
 
-static void rtw8852c_bb_reset_en(struct rtw89_dev *rtwdev,
+static void rtw8852c_bb_reset_en(struct rtw89_dev *rtwdev, enum rtw89_band band,
                                 enum rtw89_phy_idx phy_idx, bool en)
 {
-       const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0);
-
        if (en) {
                rtw89_phy_write32_idx(rtwdev, R_S0_HW_SI_DIS,
                                      B_S0_HW_SI_DIS_W_R_TRIG, 0x0, phy_idx);
@@ -1541,7 +1539,7 @@ static void rtw8852c_bb_reset_en(struct rtw89_dev *rtwdev,
                                      B_S1_HW_SI_DIS_W_R_TRIG, 0x0, phy_idx);
                rtw89_phy_write32_idx(rtwdev, R_RSTB_ASYNC, B_RSTB_ASYNC_ALL, 1,
                                      phy_idx);
-               if (chan->band_type == RTW89_BAND_2G)
+               if (band == RTW89_BAND_2G)
                        rtw89_phy_write32_mask(rtwdev, R_RXCCA_V1, B_RXCCA_DIS_V1, 0x0);
                rtw89_phy_write32_mask(rtwdev, R_PD_CTRL, B_PD_HIT_DIS, 0x0);
        } else {
@@ -1777,11 +1775,13 @@ static void rtw8852c_set_channel_bb(struct rtw89_dev *rtwdev,
 }
 
 static void rtw8852c_set_channel(struct rtw89_dev *rtwdev,
-                                const struct rtw89_chan *chan)
+                                const struct rtw89_chan *chan,
+                                enum rtw89_mac_idx mac_idx,
+                                enum rtw89_phy_idx phy_idx)
 {
-       rtw8852c_set_channel_mac(rtwdev, chan, RTW89_MAC_0);
-       rtw8852c_set_channel_bb(rtwdev, chan, RTW89_PHY_0);
-       rtw8852c_set_channel_rf(rtwdev, chan, RTW89_PHY_0);
+       rtw8852c_set_channel_mac(rtwdev, chan, mac_idx);
+       rtw8852c_set_channel_bb(rtwdev, chan, phy_idx);
+       rtw8852c_set_channel_rf(rtwdev, chan, phy_idx);
 }
 
 static void rtw8852c_dfs_en(struct rtw89_dev *rtwdev, bool en)
@@ -1803,25 +1803,27 @@ static void rtw8852c_adc_en(struct rtw89_dev *rtwdev, bool en)
 }
 
 static void rtw8852c_set_channel_help(struct rtw89_dev *rtwdev, bool enter,
-                                     struct rtw89_channel_help_params *p)
+                                     struct rtw89_channel_help_params *p,
+                                     const struct rtw89_chan *chan,
+                                     enum rtw89_mac_idx mac_idx,
+                                     enum rtw89_phy_idx phy_idx)
 {
-       u8 phy_idx = RTW89_PHY_0;
-
        if (enter) {
-               rtw89_chip_stop_sch_tx(rtwdev, RTW89_MAC_0, &p->tx_en, RTW89_SCH_TX_SEL_ALL);
-               rtw89_mac_cfg_ppdu_status(rtwdev, RTW89_MAC_0, false);
+               rtw89_chip_stop_sch_tx(rtwdev, mac_idx, &p->tx_en,
+                                      RTW89_SCH_TX_SEL_ALL);
+               rtw89_mac_cfg_ppdu_status(rtwdev, mac_idx, false);
                rtw8852c_dfs_en(rtwdev, false);
-               rtw8852c_tssi_cont_en_phyidx(rtwdev, false, RTW89_PHY_0);
+               rtw8852c_tssi_cont_en_phyidx(rtwdev, false, phy_idx);
                rtw8852c_adc_en(rtwdev, false);
                fsleep(40);
-               rtw8852c_bb_reset_en(rtwdev, phy_idx, false);
+               rtw8852c_bb_reset_en(rtwdev, chan->band_type, phy_idx, false);
        } else {
-               rtw89_mac_cfg_ppdu_status(rtwdev, RTW89_MAC_0, true);
+               rtw89_mac_cfg_ppdu_status(rtwdev, mac_idx, true);
                rtw8852c_adc_en(rtwdev, true);
                rtw8852c_dfs_en(rtwdev, true);
-               rtw8852c_tssi_cont_en_phyidx(rtwdev, true, RTW89_PHY_0);
-               rtw8852c_bb_reset_en(rtwdev, phy_idx, true);
-               rtw89_chip_resume_sch_tx(rtwdev, RTW89_MAC_0, p->tx_en);
+               rtw8852c_tssi_cont_en_phyidx(rtwdev, true, phy_idx);
+               rtw8852c_bb_reset_en(rtwdev, chan->band_type, phy_idx, true);
+               rtw89_chip_resume_sch_tx(rtwdev, mac_idx, p->tx_en);
        }
 }