wifi: rtw89: only reset BB/RF for existing WiFi 6 chips while starting up

The new WiFi 7 chips change the design, so no need to disable/enable
BB/RF when core_start(). Keep the same logic for existing chips.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231211083341.118047-7-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index d5ee2aa053d445d137aa99102ce8ad23d93c2214..fd527a249996416c61004fc832efb7bc021eb78b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -3956,10 +3956,7 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)
        /* efuse process */
 
        /* pre-config BB/RF, BB reset/RFC reset */
-       ret = rtw89_chip_disable_bb_rf(rtwdev);
-       if (ret)
-               return ret;
-       ret = rtw89_chip_enable_bb_rf(rtwdev);
+       ret = rtw89_chip_reset_bb_rf(rtwdev);
        if (ret)
                return ret;
 

diff --git a/drivers/net/wireless/realtek/rtw89/mac.h b/drivers/net/wireless/realtek/rtw89/mac.h
index 56cd81347784cee27e36e944dc2ffc4084766fee..ed98b49809a4630ce1128831fd5c380fbaebc0f4 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.h
+++ b/drivers/net/wireless/realtek/rtw89/mac.h
@@ -1108,6 +1108,23 @@ static inline int rtw89_chip_disable_bb_rf(struct rtw89_dev *rtwdev)
        return chip->ops->disable_bb_rf(rtwdev);
 }
 
+static inline int rtw89_chip_reset_bb_rf(struct rtw89_dev *rtwdev)
+{
+       int ret;
+
+       if (rtwdev->chip->chip_gen != RTW89_CHIP_AX)
+               return 0;
+
+       ret = rtw89_chip_disable_bb_rf(rtwdev);
+       if (ret)
+               return ret;
+       ret = rtw89_chip_enable_bb_rf(rtwdev);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 u32 rtw89_mac_get_err_status(struct rtw89_dev *rtwdev);
 int rtw89_mac_set_err_status(struct rtw89_dev *rtwdev, u32 err);
 bool rtw89_mac_c2h_chk_atomic(struct rtw89_dev *rtwdev, u8 class, u8 func);