mt76: mt7915: set muru platform type

Set muru platform type by mcu cmd to notify fw to init corresponding
algorithm.

Suggested-by: Money Wang <money.wang@mediatek.com>
Reviewed-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index f32e124b1a0f26cd1b530fb375bfd360acc875d9..d4c8759bedd84903ec13c6200963f053624bf7bd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -2906,6 +2906,21 @@ static int mt7915_mcu_set_mwds(struct mt7915_dev *dev, bool enabled)
                                 sizeof(req), false);
 }
 
+int mt7915_mcu_set_muru_ctrl(struct mt7915_dev *dev, u32 cmd, u32 val)
+{
+       struct {
+               __le32 cmd;
+               u8 val[4];
+       } __packed req = {
+               .cmd = cpu_to_le32(cmd),
+       };
+
+       put_unaligned_le32(val, req.val);
+
+       return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(MURU_CTRL), &req,
+                                sizeof(req), false);
+}
+
 int mt7915_mcu_init(struct mt7915_dev *dev)
 {
        static const struct mt76_mcu_ops mt7915_mcu_ops = {
@@ -2935,6 +2950,11 @@ int mt7915_mcu_init(struct mt7915_dev *dev)
        if (ret)
                return ret;
 
+       ret = mt7915_mcu_set_muru_ctrl(dev, MURU_SET_PLATFORM_TYPE,
+                                      MURU_PLATFORM_TYPE_PERF_LEVEL_2);
+       if (ret)
+               return ret;
+
        return mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(SET),
                                 MCU_WA_PARAM_RED, 0, 0);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index a1a6cc0645737246a6d98dc3611c943437da17bd..4043cf547c9e82bbac60f8f9ec2d4e623c2c3bf1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -1092,6 +1092,16 @@ enum {
        MT_BF_MODULE_UPDATE = 25
 };
 
+enum {
+       MURU_SET_ARB_OP_MODE = 14,
+       MURU_SET_PLATFORM_TYPE = 25,
+};
+
+enum {
+       MURU_PLATFORM_TYPE_PERF_LEVEL_1 = 1,
+       MURU_PLATFORM_TYPE_PERF_LEVEL_2,
+};
+
 #define MT7915_WTBL_UPDATE_MAX_SIZE    (sizeof(struct wtbl_req_hdr) +  \
                                         sizeof(struct wtbl_generic) +  \
                                         sizeof(struct wtbl_rx) +       \

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 78c0896f97b958fa28b7660cedc2c4a448631e82..bb8ef60f1b1e5ff95e6cf1a6593f82ba203aedd8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -443,6 +443,7 @@ int mt7915_mcu_set_pulse_th(struct mt7915_dev *dev,
                            const struct mt7915_dfs_pulse *pulse);
 int mt7915_mcu_set_radar_th(struct mt7915_dev *dev, int index,
                            const struct mt7915_dfs_pattern *pattern);
+int mt7915_mcu_set_muru_ctrl(struct mt7915_dev *dev, u32 cmd, u32 val);
 int mt7915_mcu_apply_group_cal(struct mt7915_dev *dev);
 int mt7915_mcu_apply_tx_dpd(struct mt7915_phy *phy);
 int mt7915_mcu_get_chan_mib_info(struct mt7915_phy *phy, bool chan_switch);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
index 00dcc46b90829fd8601f07d3b425d1fe5de62cc8..89aae323d29e242451d2589a4d3a4fcebd0d7d6c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
@@ -169,22 +169,16 @@ static int
 mt7915_tm_set_tam_arb(struct mt7915_phy *phy, bool enable, bool mu)
 {
        struct mt7915_dev *dev = phy->dev;
-       struct {
-               __le32 cmd;
-               u8 op_mode;
-       } __packed req = {
-               .cmd = cpu_to_le32(MURU_SET_ARB_OP_MODE),
-       };
+       u32 op_mode;
 
        if (!enable)
-               req.op_mode = TAM_ARB_OP_MODE_NORMAL;
+               op_mode = TAM_ARB_OP_MODE_NORMAL;
        else if (mu)
-               req.op_mode = TAM_ARB_OP_MODE_TEST;
+               op_mode = TAM_ARB_OP_MODE_TEST;
        else
-               req.op_mode = TAM_ARB_OP_MODE_FORCE_SU;
+               op_mode = TAM_ARB_OP_MODE_FORCE_SU;
 
-       return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(MURU_CTRL), &req,
-                                sizeof(req), false);
+       return mt7915_mcu_set_muru_ctrl(dev, MURU_SET_ARB_OP_MODE, op_mode);
 }
 
 static int

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h
index 107f0cf2505e71200a19607faa115d7c3b4cb23a..5573ac309363d47e49b41b127d02aa17b3728fe3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h
@@ -102,8 +102,4 @@ enum {
        TAM_ARB_OP_MODE_FORCE_SU = 5,
 };
 
-enum {
-       MURU_SET_ARB_OP_MODE = 14,
-};
-
 #endif