[PATCH 01/12][SRU][OEM-OSP1-B] UBUNTU: SAUCE: Revert "UBUNTU: SAUCE: rtw88: Move driver IQK to set channel before association for 11N chip"

[You-Sheng Yang]

BugLink: https://bugs.launchpad.net/bugs/1878147

This reverts commit a0d17282f3bc199cedc6941793c6290ab3798b1c.
---
 drivers/net/wireless/realtek/rtw88/mac80211.c |  3 +--
 drivers/net/wireless/realtek/rtw88/main.c     | 10 ----------
 drivers/net/wireless/realtek/rtw88/main.h     |  6 ------
 drivers/net/wireless/realtek/rtw88/tx.c       |  5 -----
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index bb99fc3ce2a4..a0853997d30e 100644
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -279,8 +279,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;
-			if (!rtw_chip_wcpu_11n(rtwdev))
-				chip->ops->phy_calibration(rtwdev);
+			chip->ops->phy_calibration(rtwdev);
 
 			rtwvif->aid = conf->aid;
 			rtw_fw_config_rsvd_page(rtwdev);
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index c33c235e2546..563bf49d682e 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -417,16 +417,6 @@ void rtw_set_channel(struct rtw_dev *rtwdev)
 	}
 
 	rtw_phy_set_tx_power_level(rtwdev, center_chan);
-
-	/* 11N chip uses driver IQK that takes lot of time, so move here
-	 * to avoid interferencing 4 way handshake.
-	 */
-	if (rtw_chip_wcpu_11n(rtwdev) &&
-	    !(hw->conf.flags & IEEE80211_CONF_IDLE) &&
-	    !test_bit(RTW_FLAG_SCANNING, rtwdev->flags) &&
-	    !test_bit(RTW_FLAG_INACTIVE_PS, rtwdev->flags)) {
-		rtwdev->need_rfk = true;
-	}
 }
 
 static void rtw_vif_write_addr(struct rtw_dev *rtwdev, u32 start, u8 *addr)
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index c18411711203..89fd6b299d6c 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -1698,7 +1698,6 @@ struct rtw_dev {
 	struct delayed_work sar_work;
 
 	u32 fix_rate_count;
-	bool need_rfk;
 
 	/* hci related data, must be last */
 	u8 priv[0] __aligned(sizeof(void *));
@@ -1736,11 +1735,6 @@ static inline void rtw_efuse_en(struct rtw_dev *rtwdev, bool enable)
 		rtwdev->chip->ops->efuse_en(rtwdev, enable);
 }
 
-static inline bool rtw_chip_wcpu_11n(struct rtw_dev *rtwdev)
-{
-	return rtwdev->chip->wlan_cpu == RTW_WCPU_11N;
-}
-
 void rtw_get_channel_params(struct cfg80211_chan_def *chandef,
 			    struct rtw_channel_params *ch_param);
 bool check_hw_ready(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 target);
diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c
index 3cb6a5d8c738..3362da35f6c3 100644
--- a/drivers/net/wireless/realtek/rtw88/tx.c
+++ b/drivers/net/wireless/realtek/rtw88/tx.c
@@ -365,11 +365,6 @@ void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev,
 	if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) {
 		info->flags &= ~IEEE80211_TX_CTL_REQ_TX_STATUS;	// no report
 		pkt_info->no_retry = true;	// don't re-tx
-
-		if (rtwdev->need_rfk) {
-			rtwdev->need_rfk = false;
-			chip->ops->phy_calibration(rtwdev);
-		}
 	}
 
 	if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)
-- 
2.25.1