[PATCH rtw-next 2/2] wifi: rtw89: avoid premature power save entry for buffered traffic

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

From: Chin-Yen Lee <timlee@realtek.com>

Configure two LPS parameters to prevent premature entry into power
save mode and improving the delivery of real-time traffic. Enable
MART_PS_DTIM_RX to transmit a Null Data frame to synchronize the
power save state with the AP after waking up when buffered traffic
is indicated by the beacon TIM. Enable TRX_EXT_MODE to keep the device
awake for the remainder of the current TBTT interval when the AP has
buffered packets.

Signed-off-by: Chin-Yen Lee <timlee@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtw89/fw.c | 40 +++++++++++++++++++++++++
 drivers/net/wireless/realtek/rtw89/fw.h | 15 ++++++++++
 drivers/net/wireless/realtek/rtw89/ps.c |  1 +
 3 files changed, 56 insertions(+)

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index ea7dba077f5d..5ba265e0eeed 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -3525,6 +3525,46 @@ int rtw89_fw_h2c_lps_parm(struct rtw89_dev *rtwdev,
 	return ret;
 }
 
+int rtw89_fw_h2c_lps_adv_param(struct rtw89_dev *rtwdev,
+			       struct rtw89_vif_link *rtwvif_link)
+{
+	struct rtw89_h2c_lps_adv_parm *h2c;
+	u32 len = sizeof(*h2c);
+	struct sk_buff *skb;
+	int ret;
+
+	skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, len);
+	if (!skb) {
+		rtw89_err(rtwdev, "failed to alloc skb for h2c lps adv parm\n");
+		return -ENOMEM;
+	}
+	skb_put(skb, len);
+	h2c = (struct rtw89_h2c_lps_adv_parm *)skb->data;
+
+	h2c->w0 = le32_encode_bits(rtwvif_link->mac_id, RTW89_H2C_PS_ADV_PARM_W0_MACID) |
+		  le32_encode_bits(1, RTW89_H2C_PS_ADV_PARM_W0_EN_SMART_PS_DTIM_RX) |
+		  le32_encode_bits(1, RTW89_H2C_PS_ADV_PARM_W0_EN_TRX_EXT_MODE);
+
+	rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
+			      H2C_CAT_MAC,
+			      H2C_CL_MAC_PS,
+			      H2C_FUNC_MAC_PS_ADVANCE_PARM, 0, 1,
+			      len);
+
+	ret = rtw89_h2c_tx(rtwdev, skb, false);
+	if (ret) {
+		rtw89_err(rtwdev, "failed to send h2c\n");
+		goto fail;
+	}
+
+	return 0;
+
+fail:
+	dev_kfree_skb_any(skb);
+
+	return ret;
+}
+
 int rtw89_fw_h2c_lps_ch_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)
 {
 	const struct rtw89_chip_info *chip = rtwdev->chip;
diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index e4d3331fc18f..ba4813b9230f 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -2338,6 +2338,18 @@ struct rtw89_h2c_wow_payload_cam_update {
 	__le32 w8;
 } __packed;
 
+struct rtw89_h2c_lps_adv_parm {
+	__le32 w0;
+	__le32 w1;
+} __packed;
+
+#define RTW89_H2C_PS_ADV_PARM_W0_MACID GENMASK(7, 0)
+#define RTW89_H2C_PS_ADV_PARM_W0_TRX_TIMEOUT_TIME_SET GENMASK(9, 8)
+#define RTW89_H2C_PS_ADV_PARM_W0_EN_SMART_PS_DTIM_RX BIT(10)
+#define RTW89_H2C_PS_ADV_PARM_W0_EN_TRX_EXT_MODE BIT(11)
+#define RTW89_H2C_PS_ADV_PARM_W1_TRX_TIMEOUT_TIME_VAL GENMASK(7, 0)
+#define RTW89_H2C_PS_ADV_PARM_W1_EXTNUM GENMASK(15, 8)
+
 #define RTW89_H2C_WOW_PLD_CAM_UPD_W0_R_W BIT(0)
 #define RTW89_H2C_WOW_PLD_CAM_UPD_W0_IDX GENMASK(7, 1)
 #define RTW89_H2C_WOW_PLD_CAM_UPD_WKFM0 GENMASK(31, 0)
@@ -4800,6 +4812,7 @@ enum rtw89_ps_h2c_func {
 	H2C_FUNC_MAC_LPS_PARM		= 0x0,
 	H2C_FUNC_P2P_ACT		= 0x1,
 	H2C_FUNC_IPS_CFG		= 0x3,
+	H2C_FUNC_MAC_PS_ADVANCE_PARM	= 0x4,
 	H2C_FUNC_PS_POWER_LEVEL		= 0x7,
 	H2C_FUNC_TBTT_TUNING		= 0xA,
 
@@ -5636,6 +5649,8 @@ int rtw89_fw_h2c_init_ba_cam_users(struct rtw89_dev *rtwdev, u8 users,
 
 int rtw89_fw_h2c_lps_parm(struct rtw89_dev *rtwdev,
 			  struct rtw89_lps_parm *lps_param);
+int rtw89_fw_h2c_lps_adv_param(struct rtw89_dev *rtwdev,
+			       struct rtw89_vif_link *rtwvif_link);
 int rtw89_fw_h2c_lps_ch_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif);
 int rtw89_fw_h2c_lps_ml_cmn_info(struct rtw89_dev *rtwdev,
 				 struct rtw89_vif *rtwvif);
diff --git a/drivers/net/wireless/realtek/rtw89/ps.c b/drivers/net/wireless/realtek/rtw89/ps.c
index 3639292eba7a..40bac65dd8ed 100644
--- a/drivers/net/wireless/realtek/rtw89/ps.c
+++ b/drivers/net/wireless/realtek/rtw89/ps.c
@@ -138,6 +138,7 @@ static void __rtw89_enter_lps_link(struct rtw89_dev *rtwdev,
 
 	rtw89_btc_ntfy_radio_state(rtwdev, BTC_RFCTRL_FW_CTRL);
 	rtw89_fw_h2c_lps_parm(rtwdev, &lps_param);
+	rtw89_fw_h2c_lps_adv_param(rtwdev, rtwvif_link);
 
 	if (RTW89_CHK_FW_FEATURE(BEACON_TRACKING, &rtwdev->fw))
 		rtw89_fw_h2c_pwr_lvl(rtwdev, rtwvif_link);
-- 
2.25.1