[PATCH rtw-next 1/6] wifi: rtw89: ps: send H2C command related to MLO info when FWIPS

[Ping-Ke Shih <pkshih@realtek.com>]

From: Chih-Kang Chang <gary.chang@realtek.com>

When entering FWIPS, also send the H2C command related to MLO info, the
same as in LPS. Otherwise, the firmware cannot get enough information.

Signed-off-by: Chih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtw89/fw.h  | 11 +++++++++++
 drivers/net/wireless/realtek/rtw89/ps.c  |  7 +------
 drivers/net/wireless/realtek/rtw89/wow.c |  6 ++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index 9b616ec9323b..b879bdd94b88 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -5871,6 +5871,17 @@ int rtw89_chip_h2c_wow_cam_update(struct rtw89_dev *rtwdev,
 	return chip->ops->h2c_wow_cam_update(rtwdev, cam_info);
 }
 
+static inline void rtw89_fw_h2c_lps_ch_ml_info_routing(struct rtw89_dev *rtwdev,
+						       struct rtw89_vif *rtwvif)
+{
+	if (RTW89_CHK_FW_FEATURE(LPS_CH_INFO, &rtwdev->fw))
+		rtw89_fw_h2c_lps_ch_info(rtwdev, rtwvif);
+	else if (RTW89_CHK_FW_FEATURE(LPS_ML_INFO_V1, &rtwdev->fw))
+		rtw89_fw_h2c_lps_ml_cmn_info_v1(rtwdev, rtwvif);
+	else
+		rtw89_fw_h2c_lps_ml_cmn_info(rtwdev, rtwvif);
+}
+
 /* Must consider compatibility; don't insert new in the mid.
  * Fill each field's default value in rtw89_regd_entcpy().
  */
diff --git a/drivers/net/wireless/realtek/rtw89/ps.c b/drivers/net/wireless/realtek/rtw89/ps.c
index 23a9c7a0704a..3639292eba7a 100644
--- a/drivers/net/wireless/realtek/rtw89/ps.c
+++ b/drivers/net/wireless/realtek/rtw89/ps.c
@@ -187,12 +187,7 @@ void rtw89_enter_lps(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif,
 
 	rtw89_fw_h2c_rf_ps_info(rtwdev, rtwvif);
 
-	if (RTW89_CHK_FW_FEATURE(LPS_CH_INFO, &rtwdev->fw))
-		rtw89_fw_h2c_lps_ch_info(rtwdev, rtwvif);
-	else if (RTW89_CHK_FW_FEATURE(LPS_ML_INFO_V1, &rtwdev->fw))
-		rtw89_fw_h2c_lps_ml_cmn_info_v1(rtwdev, rtwvif);
-	else
-		rtw89_fw_h2c_lps_ml_cmn_info(rtwdev, rtwvif);
+	rtw89_fw_h2c_lps_ch_ml_info_routing(rtwdev, rtwvif);
 
 	if (ps_mode && can_ps_mode)
 		__rtw89_enter_ps_mode(rtwdev);
diff --git a/drivers/net/wireless/realtek/rtw89/wow.c b/drivers/net/wireless/realtek/rtw89/wow.c
index 7a2d6904951f..b9892ab84225 100644
--- a/drivers/net/wireless/realtek/rtw89/wow.c
+++ b/drivers/net/wireless/realtek/rtw89/wow.c
@@ -749,10 +749,12 @@ static void rtw89_wow_enter_ps(struct rtw89_dev *rtwdev)
 {
 	struct rtw89_vif_link *rtwvif_link = rtwdev->wow.rtwvif_link;
 
-	if (rtw89_wow_mgd_linked(rtwdev))
+	if (rtw89_wow_mgd_linked(rtwdev)) {
 		rtw89_enter_lps(rtwdev, rtwvif_link->rtwvif, false);
-	else if (rtw89_wow_no_link(rtwdev))
+	} else if (rtw89_wow_no_link(rtwdev)) {
 		rtw89_fw_h2c_fwips(rtwdev, rtwvif_link, true);
+		rtw89_fw_h2c_lps_ch_ml_info_routing(rtwdev, rtwvif_link->rtwvif);
+	}
 }
 
 static void rtw89_wow_leave_ps(struct rtw89_dev *rtwdev, bool enable_wow)
-- 
2.25.1