soc: mediatek: mtk-cmdq: Add pa_base parsing for hardware without subsys ID support

When GCE executes instructions, it typically locates the corresponding
hardware register using the subsys ID. For hardware that does not
support subsys ID, the subsys ID is set to an invalid value, and the
physical address must be used to generate GCE instructions.

The main advantage of using subsys ID is to reduce the number of
instructions. Without subsys ID, an additional `ASSIGN` instruction
is needed to assign the high bytes of the physical address, which can
impact performance if too many instructions are required. However, if
the hardware does not support subsys ID, using the physical address
is the only option to achieve the same functionality.

This commit adds a pa_base parsing flow to the cmdq_client_reg structure
to handle hardware without subsys ID support.

Signed-off-by: Jason-JH Lin <jason-jh.lin@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 8feeaa3203592da98713424a11113e581b52ddf7..80806fbeba918ea54e1aa6487f7661e19598fb1a 100644 (file)
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -8,6 +8,7 @@
 #include <linux/module.h>
 #include <linux/mailbox_controller.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/soc/mediatek/mtk-cmdq.h>
 
 #define CMDQ_WRITE_ENABLE_MASK BIT(0)
@@ -60,20 +61,31 @@ int cmdq_dev_get_client_reg(struct device *dev,
                            struct cmdq_client_reg *client_reg, int idx)
 {
        struct of_phandle_args spec;
+       struct resource res;
        int err;
 
        if (!client_reg)
                return -ENOENT;
 
+       err = of_address_to_resource(dev->of_node, 0, &res);
+       if (err) {
+               dev_err(dev, "Missing reg in %s node\n", dev->of_node->full_name);
+               return -EINVAL;
+       }
+       client_reg->pa_base = res.start;
+
        err = of_parse_phandle_with_fixed_args(dev->of_node,
                                               "mediatek,gce-client-reg",
                                               3, idx, &spec);
        if (err < 0) {
-               dev_warn(dev,
+               dev_dbg(dev,
                        "error %d can't parse gce-client-reg property (%d)",
                        err, idx);
 
-               return err;
+               /* make subsys invalid */
+               client_reg->subsys = CMDQ_SUBSYS_INVALID;
+
+               return 0;
        }
 
        client_reg->subsys = (u8)spec.args[0];

diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
index 0c3906e8ad19c56cc06ac2742260df53bbbeaa75..3578cc9200e96abb8b2ec127f1d959719f981e2c 100644 (file)
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -23,6 +23,8 @@
 #define CMDQ_THR_SPR_IDX2      (2)
 #define CMDQ_THR_SPR_IDX3      (3)
 
+#define CMDQ_SUBSYS_INVALID    (U8_MAX)
+
 struct cmdq_pkt;
 
 enum cmdq_logic_op {
@@ -52,6 +54,7 @@ struct cmdq_operand {
 
 struct cmdq_client_reg {
        u8 subsys;
+       phys_addr_t pa_base;
        u16 offset;
        u16 size;
 };