rtw88: move IQK/DPK into phy_calibration

Since 8822c requires to do not only IQK, but also DPK.
Move these calibrations that need to be done once the channel
is determined, into phy_calibration.

And note that the order of the calibrations matters, 8822c
should do IQK first, then DPK.

Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index fedea28c7a97e3e4a6a7363009874f2ab90d6cca..e5e3605bb6931c1c6f0d87a1434ce78eedc9f36a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -256,7 +256,7 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
                if (conf->assoc) {
                        rtw_coex_connect_notify(rtwdev, COEX_ASSOCIATE_FINISH);
                        net_type = RTW_NET_MGD_LINKED;
-                       chip->ops->do_iqk(rtwdev);
+                       chip->ops->phy_calibration(rtwdev);
 
                        rtwvif->aid = conf->aid;
                        rtw_add_rsvd_page(rtwdev, RSVD_PS_POLL, true);

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 1ed7eb054071cc3e7416c01f68362c5e2724032f..76d925323819fe49ef00859e415777807d9fc5cd 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -640,9 +640,8 @@ struct rtw_chip_ops {
                            u8 antenna_rx);
        void (*cfg_ldo25)(struct rtw_dev *rtwdev, bool enable);
        void (*false_alarm_statistics)(struct rtw_dev *rtwdev);
-       void (*do_iqk)(struct rtw_dev *rtwdev);
+       void (*phy_calibration)(struct rtw_dev *rtwdev);
        void (*dpk_track)(struct rtw_dev *rtwdev);
-       void (*do_dpk)(struct rtw_dev *rtwdev);
 
        /* for coex */
        void (*coex_set_init)(struct rtw_dev *rtwdev);

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index 36795050f2bcf284466702b79339a9195bc2ac19..7056ea31c1d88bd16c696323a8ae4b5559690633 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -1001,8 +1001,9 @@ static void rtw8822b_do_iqk(struct rtw_dev *rtwdev)
                counter, reload, ++do_iqk_cnt, iqk_fail_mask);
 }
 
-static void rtw8822b_do_dpk(struct rtw_dev *rtwdev)
+static void rtw8822b_phy_calibration(struct rtw_dev *rtwdev)
 {
+       rtw8822b_do_iqk(rtwdev);
 }
 
 static void rtw8822b_coex_cfg_init(struct rtw_dev *rtwdev)
@@ -1798,8 +1799,7 @@ static struct rtw_chip_ops rtw8822b_ops = {
        .set_antenna            = rtw8822b_set_antenna,
        .cfg_ldo25              = rtw8822b_cfg_ldo25,
        .false_alarm_statistics = rtw8822b_false_alarm_statistics,
-       .do_iqk                 = rtw8822b_do_iqk,
-       .do_dpk                 = rtw8822b_do_dpk,
+       .phy_calibration        = rtw8822b_phy_calibration,
 
        .coex_set_init          = rtw8822b_coex_cfg_init,
        .coex_set_ant_switch    = rtw8822b_coex_cfg_ant_switch,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index cee12b1e869ff72f6d1fcfa160eabf475a7d077b..5a428e041bb8d98983f301701af97e9ad9c4c990 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -3078,6 +3078,12 @@ static void rtw8822c_do_dpk(struct rtw_dev *rtwdev)
        rtw8822c_dpk_restore_registers(rtwdev, DPK_BB_REG_NUM, bckp);
 }
 
+static void rtw8822c_phy_calibration(struct rtw_dev *rtwdev)
+{
+       rtw8822c_do_iqk(rtwdev);
+       rtw8822c_do_dpk(rtwdev);
+}
+
 void rtw8822c_dpk_track(struct rtw_dev *rtwdev)
 {
        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
@@ -3487,9 +3493,8 @@ static struct rtw_chip_ops rtw8822c_ops = {
        .set_tx_power_index     = rtw8822c_set_tx_power_index,
        .cfg_ldo25              = rtw8822c_cfg_ldo25,
        .false_alarm_statistics = rtw8822c_false_alarm_statistics,
-       .do_iqk                 = rtw8822c_do_iqk,
-       .do_dpk                 = rtw8822c_do_dpk,
        .dpk_track              = rtw8822c_dpk_track,
+       .phy_calibration        = rtw8822c_phy_calibration,
 
        .coex_set_init          = rtw8822c_coex_cfg_init,
        .coex_set_ant_switch    = NULL,