wifi: rtw89: rfk: add firmware command to do CIM3K

CIM is short for counter intermodulation products 3rd-order. Due to
non-linearity in transmit path, need a calibration to yield performance
for RF system.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20260123013957.16418-4-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index fed74ad6b4bd60916afbafb1bcc9c052dbed6776..4035ec8defa863c9869767892768501c24426f37 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -7657,6 +7657,47 @@ fail:
        return ret;
 }
 
+int rtw89_fw_h2c_rf_cim3k(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,
+                         const struct rtw89_chan *chan)
+{
+       struct rtw89_h2c_rf_cim3k *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 RF CIM3K\n");
+               return -ENOMEM;
+       }
+       skb_put(skb, len);
+       h2c = (struct rtw89_h2c_rf_cim3k *)skb->data;
+
+       h2c->len = len;
+       h2c->phy = phy_idx;
+       h2c->kpath = RF_AB;
+       h2c->cur_band = chan->band_type;
+       h2c->cur_bw = chan->band_width;
+       h2c->cur_ch = chan->channel;
+       h2c->cim3k_dbg_en = rtw89_debug_is_enabled(rtwdev, RTW89_DBG_RFK);
+
+       rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
+                             H2C_CAT_OUTSRC, H2C_CL_OUTSRC_RF_FW_RFK,
+                             H2C_FUNC_RFK_CIM3K_OFFOAD, 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;
+}
+
 int rtw89_fw_h2c_raw_with_hdr(struct rtw89_dev *rtwdev,
                              u8 h2c_class, u8 h2c_func, u8 *buf, u16 len,
                              bool rack, bool dack)

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index c3ad473a06f212f25b55c4a1c52bbef4bfad0646..2f04138148b750faf4f3a758dbad713446ee4698 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -4719,6 +4719,7 @@ enum rtw89_rfk_offload_h2c_func {
        H2C_FUNC_RFK_PRE_NOTIFY = 0x8,
        H2C_FUNC_RFK_TAS_OFFLOAD = 0x9,
        H2C_FUNC_RFK_TXIQK_OFFOAD = 0xc,
+       H2C_FUNC_RFK_CIM3K_OFFOAD = 0xe,
 };
 
 struct rtw89_fw_h2c_rf_get_mccch {
@@ -4948,6 +4949,18 @@ struct rtw89_h2c_rf_txiqk {
        u8 txiqk_dbg_en;
 } __packed;
 
+struct rtw89_h2c_rf_cim3k {
+       u8 len;
+       u8 phy;
+       u8 su_cim3k_enable[2];
+       u8 ru_cim3k_enable[2];
+       u8 kpath;
+       u8 cur_band;
+       u8 cur_bw;
+       u8 cur_ch;
+       u8 cim3k_dbg_en;
+} __packed;
+
 enum rtw89_rf_log_type {
        RTW89_RF_RUN_LOG = 0,
        RTW89_RF_RPT_LOG = 1,
@@ -5270,6 +5283,8 @@ int rtw89_fw_h2c_rf_rxdck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,
 int rtw89_fw_h2c_rf_tas_trigger(struct rtw89_dev *rtwdev, bool enable);
 int rtw89_fw_h2c_rf_txiqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,
                          const struct rtw89_chan *chan);
+int rtw89_fw_h2c_rf_cim3k(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,
+                         const struct rtw89_chan *chan);
 int rtw89_fw_h2c_raw_with_hdr(struct rtw89_dev *rtwdev,
                              u8 h2c_class, u8 h2c_func, u8 *buf, u16 len,
                              bool rack, bool dack);

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index 215864d1e1c7907b8dc62bf3d29eb92ad129e2e7..5f6854b7550d5a2befb6563af1e65d1a81a87adf 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -4149,6 +4149,23 @@ int rtw89_phy_rfk_txiqk_and_wait(struct rtw89_dev *rtwdev,
 }
 EXPORT_SYMBOL(rtw89_phy_rfk_txiqk_and_wait);
 
+int rtw89_phy_rfk_cim3k_and_wait(struct rtw89_dev *rtwdev,
+                                enum rtw89_phy_idx phy_idx,
+                                const struct rtw89_chan *chan,
+                                unsigned int ms)
+{
+       int ret;
+
+       rtw89_phy_rfk_report_prep(rtwdev);
+
+       ret = rtw89_fw_h2c_rf_cim3k(rtwdev, phy_idx, chan);
+       if (ret)
+               return ret;
+
+       return rtw89_phy_rfk_report_wait(rtwdev, "CIM3k", ms);
+}
+EXPORT_SYMBOL(rtw89_phy_rfk_cim3k_and_wait);
+
 static u32 phy_tssi_get_cck_group(u8 ch)
 {
        switch (ch) {

diff --git a/drivers/net/wireless/realtek/rtw89/phy.h b/drivers/net/wireless/realtek/rtw89/phy.h
index 89e3bc588494c9037a9875fc64312e4c73740c6c..5e04bdcef4e9b033335a6f80dd3d60c84d5e9f7e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.h
+++ b/drivers/net/wireless/realtek/rtw89/phy.h
@@ -1036,6 +1036,10 @@ int rtw89_phy_rfk_txiqk_and_wait(struct rtw89_dev *rtwdev,
                                 enum rtw89_phy_idx phy_idx,
                                 const struct rtw89_chan *chan,
                                 unsigned int ms);
+int rtw89_phy_rfk_cim3k_and_wait(struct rtw89_dev *rtwdev,
+                                enum rtw89_phy_idx phy_idx,
+                                const struct rtw89_chan *chan,
+                                unsigned int ms);
 void rtw89_phy_rfk_tssi_fill_fwcmd_efuse_to_de(struct rtw89_dev *rtwdev,
                                               enum rtw89_phy_idx phy,
                                               const struct rtw89_chan *chan,