wifi: rtw89: add new H2C for PS mode in 802.11be chip

Because 802.11be chip support MLO mode, driver needs to send new H2C to
pass more connected channel information to firmware, to ensure PS mode
work fine.

Signed-off-by: Chin-Yen Lee <timlee@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240126063356.17857-6-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 7a0671e4ef2ca5bf7d61f833872962d0e7083477..2f3f2b5035073f7499b9de7884d190e38cb71bdf 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -2036,6 +2036,50 @@ fail:
        return ret;
 }
 
+int rtw89_fw_h2c_lps_ch_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)
+{
+       const struct rtw89_chan *chan = rtw89_chan_get(rtwdev,
+                                                      rtwvif->sub_entity_idx);
+       const struct rtw89_chip_info *chip = rtwdev->chip;
+       struct rtw89_h2c_lps_ch_info *h2c;
+       u32 len = sizeof(*h2c);
+       struct sk_buff *skb;
+       int ret;
+
+       if (chip->chip_gen != RTW89_CHIP_BE)
+               return 0;
+
+       skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, len);
+       if (!skb) {
+               rtw89_err(rtwdev, "failed to alloc skb for h2c lps_ch_info\n");
+               return -ENOMEM;
+       }
+       skb_put(skb, len);
+       h2c = (struct rtw89_h2c_lps_ch_info *)skb->data;
+
+       h2c->info[0].central_ch = chan->channel;
+       h2c->info[0].pri_ch = chan->primary_channel;
+       h2c->info[0].band = chan->band_type;
+       h2c->info[0].bw = chan->band_width;
+       h2c->mlo_dbcc_mode_lps = cpu_to_le32(MLO_2_PLUS_0_1RF);
+
+       rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
+                             H2C_CAT_OUTSRC, H2C_CL_OUTSRC_DM,
+                             H2C_FUNC_FW_LPS_CH_INFO, 0, 0, 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;
+}
+
 #define H2C_P2P_ACT_LEN 20
 int rtw89_fw_h2c_p2p_act(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,
                         struct ieee80211_p2p_noa_desc *desc,

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index 08b8f6d75065134e70dd05fe74898f4a27511292..c5c801e9ce3c9e0bbd5738ab86deaf3e01f5390c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -1974,6 +1974,17 @@ static inline void SET_LPS_PARM_LASTRPWM(void *h2c, u32 val)
        le32p_replace_bits((__le32 *)(h2c) + 1, val, GENMASK(15, 8));
 }
 
+struct rtw89_h2c_lps_ch_info {
+       struct {
+               u8 pri_ch;
+               u8 central_ch;
+               u8 bw;
+               u8 band;
+       } __packed info[2];
+
+       __le32 mlo_dbcc_mode_lps;
+} __packed;
+
 static inline void RTW89_SET_FWCMD_CPU_EXCEPTION_TYPE(void *cmd, u32 val)
 {
        le32p_replace_bits((__le32 *)cmd, val, GENMASK(31, 0));
@@ -3896,6 +3907,9 @@ enum rtw89_mcc_h2c_func {
 #define H2C_CL_OUTSRC_RA               0x1
 #define H2C_FUNC_OUTSRC_RA_MACIDCFG    0x0
 
+#define H2C_CL_OUTSRC_DM               0x2
+#define H2C_FUNC_FW_LPS_CH_INFO                0xb
+
 #define H2C_CL_OUTSRC_RF_REG_A         0x8
 #define H2C_CL_OUTSRC_RF_REG_B         0x9
 #define H2C_CL_OUTSRC_RF_FW_NOTIFY     0xa
@@ -4110,6 +4124,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_ch_info(struct rtw89_dev *rtwdev,
+                            struct rtw89_vif *rtwvif);
 struct sk_buff *rtw89_fw_h2c_alloc_skb_with_hdr(struct rtw89_dev *rtwdev, u32 len);
 struct sk_buff *rtw89_fw_h2c_alloc_skb_no_hdr(struct rtw89_dev *rtwdev, u32 len);
 int rtw89_fw_msg_reg(struct rtw89_dev *rtwdev,

diff --git a/drivers/net/wireless/realtek/rtw89/ps.c b/drivers/net/wireless/realtek/rtw89/ps.c
index 917c01e5e9eda3e12a53d490f6feede9376bfdfe..be1dcd9eb955fdb99af5e9ef40f2524e2a1ddd3a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/ps.c
+++ b/drivers/net/wireless/realtek/rtw89/ps.c
@@ -83,16 +83,17 @@ void __rtw89_leave_ps_mode(struct rtw89_dev *rtwdev)
                rtw89_ps_power_mode_change(rtwdev, false);
 }
 
-static void __rtw89_enter_lps(struct rtw89_dev *rtwdev, u8 mac_id)
+static void __rtw89_enter_lps(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)
 {
        struct rtw89_lps_parm lps_param = {
-               .macid = mac_id,
+               .macid = rtwvif->mac_id,
                .psmode = RTW89_MAC_AX_PS_MODE_LEGACY,
                .lastrpwm = RTW89_LAST_RPWM_PS,
        };
 
        rtw89_btc_ntfy_radio_state(rtwdev, BTC_RFCTRL_FW_CTRL);
        rtw89_fw_h2c_lps_parm(rtwdev, &lps_param);
+       rtw89_fw_h2c_lps_ch_info(rtwdev, rtwvif);
 }
 
 static void __rtw89_leave_lps(struct rtw89_dev *rtwdev, u8 mac_id)
@@ -123,7 +124,7 @@ void rtw89_enter_lps(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif,
        if (test_and_set_bit(RTW89_FLAG_LEISURE_PS, rtwdev->flags))
                return;
 
-       __rtw89_enter_lps(rtwdev, rtwvif->mac_id);
+       __rtw89_enter_lps(rtwdev, rtwvif);
        if (ps_mode)
                __rtw89_enter_ps_mode(rtwdev, rtwvif);
 }