From: Jason-JH.Lin <jason-jh.lin@mediatek.com>
To: Jassi Brar <jassisinghbrar@gmail.com>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: Conor Dooley <conor+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Jeffrey Kardatzke <jkardatzke@google.com>,
Jason-ch Chen <jason-ch.chen@mediatek.com>,
"Johnson Wang" <johnson.wang@mediatek.com>,
"Jason-JH . Lin" <jason-jh.lin@mediatek.com>,
Singo Chang <singo.chang@mediatek.com>,
"Nancy Lin" <nancy.lin@mediatek.com>,
Shawn Sung <shawn.sung@mediatek.com>
Subject: [PATCH v2 7/9] mailbox: mediatek: Add secure CMDQ driver support for CMDQ driver
Date: Mon, 23 Oct 2023 12:37:49 +0800 [thread overview]
Message-ID: <20231023043751.17114-8-jason-jh.lin@mediatek.com> (raw)
In-Reply-To: <20231023043751.17114-1-jason-jh.lin@mediatek.com>
CMDQ driver will probe a secure CMDQ driver when has_sec flag
in platform data is true and its device node in dts has defined a
event id of CMDQ_SYNC_TOKEN_SEC_EOF.
Secure CMDQ driver support on mt8188 and mt8195 currently.
So add a has_sec flag to their driver data to probe it.
Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
drivers/mailbox/mtk-cmdq-mailbox.c | 42 ++++++++++++++++++++++--
include/linux/mailbox/mtk-cmdq-mailbox.h | 11 +++++++
2 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index 3bdfb9a60614..4db5eb76f353 100644
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -87,6 +87,7 @@ struct gce_plat {
u8 shift;
bool control_by_sw;
bool sw_ddr_en;
+ bool has_sec;
u32 gce_num;
};
@@ -560,14 +561,23 @@ static int cmdq_probe(struct platform_device *pdev)
int alias_id = 0;
static const char * const clk_name = "gce";
static const char * const clk_names[] = { "gce0", "gce1" };
+ struct resource *res;
+ struct platform_device *mtk_cmdq_sec;
+ u32 hwid = 0;
cmdq = devm_kzalloc(dev, sizeof(*cmdq), GFP_KERNEL);
if (!cmdq)
return -ENOMEM;
- cmdq->base = devm_platform_ioremap_resource(pdev, 0);
- if (IS_ERR(cmdq->base))
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -EINVAL;
+
+ cmdq->base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(cmdq->base)) {
+ dev_err(dev, "failed to ioremap cmdq\n");
return PTR_ERR(cmdq->base);
+ }
cmdq->irq = platform_get_irq(pdev, 0);
if (cmdq->irq < 0)
@@ -585,6 +595,8 @@ static int cmdq_probe(struct platform_device *pdev)
dev, cmdq->base, cmdq->irq);
if (cmdq->pdata->gce_num > 1) {
+ hwid = of_alias_get_id(dev->of_node, clk_name);
+
for_each_child_of_node(phandle->parent, node) {
alias_id = of_alias_get_id(node, clk_name);
if (alias_id >= 0 && alias_id < cmdq->pdata->gce_num) {
@@ -653,6 +665,30 @@ static int cmdq_probe(struct platform_device *pdev)
return err;
}
+ if (cmdq->pdata->has_sec) {
+ struct cmdq_sec_plat gce_sec_plat;
+
+ if (of_property_read_u32_index(dev->of_node, "mediatek,gce-events", 0,
+ &gce_sec_plat.cmdq_event) == 0) {
+ gce_sec_plat.gce_dev = dev;
+ gce_sec_plat.base = cmdq->base;
+ gce_sec_plat.base_pa = res->start;
+ gce_sec_plat.hwid = hwid;
+ gce_sec_plat.gce_num = cmdq->pdata->gce_num;
+ gce_sec_plat.clocks = cmdq->clocks;
+ gce_sec_plat.thread_nr = cmdq->pdata->thread_nr;
+
+ mtk_cmdq_sec = platform_device_register_data(dev, "mtk_cmdq_sec",
+ PLATFORM_DEVID_AUTO,
+ &gce_sec_plat,
+ sizeof(gce_sec_plat));
+ if (IS_ERR(mtk_cmdq_sec)) {
+ dev_err(dev, "failed to register platform_device mtk_cmdq_sec\n");
+ return PTR_ERR(mtk_cmdq_sec);
+ }
+ }
+ }
+
return 0;
}
@@ -693,6 +729,7 @@ static const struct gce_plat gce_plat_v6 = {
.thread_nr = 24,
.shift = 3,
.control_by_sw = true,
+ .has_sec = true,
.gce_num = 2
};
@@ -708,6 +745,7 @@ static const struct gce_plat gce_plat_v8 = {
.thread_nr = 32,
.shift = 3,
.control_by_sw = true,
+ .has_sec = true,
.gce_num = 2
};
diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h
index f78a08e7c6ed..fdda995a69ce 100644
--- a/include/linux/mailbox/mtk-cmdq-mailbox.h
+++ b/include/linux/mailbox/mtk-cmdq-mailbox.h
@@ -79,6 +79,17 @@ struct cmdq_pkt {
bool loop;
};
+struct cmdq_sec_plat {
+ struct device *gce_dev;
+ void __iomem *base;
+ dma_addr_t base_pa;
+ u32 hwid;
+ u32 gce_num;
+ struct clk_bulk_data *clocks;
+ u32 thread_nr;
+ u32 cmdq_event;
+};
+
u8 cmdq_get_shift_pa(struct mbox_chan *chan);
#endif /* __MTK_CMDQ_MAILBOX_H__ */
--
2.18.0
next prev parent reply other threads:[~2023-10-23 4:39 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 4:37 [PATCH v2 0/9] Add CMDQ secure driver for SVP Jason-JH.Lin
2023-10-23 4:37 ` [PATCH v2 1/9] dt-bindings: gce: mt8195: Add CMDQ_SYNC_TOKEN_SECURE_THR_EOF event id Jason-JH.Lin
2023-10-23 7:47 ` Krzysztof Kozlowski
2023-10-23 7:49 ` Krzysztof Kozlowski
2023-10-24 16:21 ` Jason-JH Lin (林睿祥)
2023-10-25 6:26 ` Jason-JH Lin (林睿祥)
2023-10-25 7:03 ` Krzysztof Kozlowski
2023-10-25 7:36 ` Jason-JH Lin (林睿祥)
2023-10-23 8:08 ` Krzysztof Kozlowski
2023-10-25 6:28 ` Jason-JH Lin (林睿祥)
2023-10-23 4:37 ` [PATCH v2 2/9] dt-bindings: mailbox: Add property for CMDQ secure driver Jason-JH.Lin
2023-10-23 7:49 ` Krzysztof Kozlowski
2023-10-24 16:37 ` Jason-JH Lin (林睿祥)
2023-10-28 9:10 ` Krzysztof Kozlowski
2023-10-31 2:34 ` Jason-JH Lin (林睿祥)
2023-10-23 4:37 ` [PATCH v2 3/9] soc: mailbox: Add cmdq_pkt_logic_command to support math operation Jason-JH.Lin
2023-10-23 8:26 ` Fei Shao
2023-10-23 9:14 ` Fei Shao
2023-10-24 16:59 ` Jason-JH Lin (林睿祥)
2023-10-23 9:50 ` AngeloGioacchino Del Regno
2023-10-24 17:11 ` Jason-JH Lin (林睿祥)
2023-10-23 4:37 ` [PATCH v2 4/9] soc: mailbox: Add cmdq_pkt_write_s_reg_value to support write value to reg Jason-JH.Lin
2023-10-23 9:50 ` AngeloGioacchino Del Regno
2023-10-25 0:45 ` Jason-JH Lin (林睿祥)
2023-10-23 4:37 ` [PATCH v2 5/9] soc: mailbox: Add cmdq_pkt_finalize_loop to support looping cmd with irq Jason-JH.Lin
2023-10-23 9:50 ` AngeloGioacchino Del Regno
2023-10-25 0:55 ` Jason-JH Lin (林睿祥)
2023-10-23 4:37 ` [PATCH v2 6/9] mailbox: mediatek: Add CMDQ driver support for mt8188 Jason-JH.Lin
2023-10-23 9:41 ` Fei Shao
2023-10-25 6:33 ` Jason-JH Lin (林睿祥)
2023-10-23 9:50 ` AngeloGioacchino Del Regno
2023-10-23 10:14 ` AngeloGioacchino Del Regno
2023-10-25 0:58 ` Jason-JH Lin (林睿祥)
2023-10-23 4:37 ` Jason-JH.Lin [this message]
2023-10-23 10:47 ` [PATCH v2 7/9] mailbox: mediatek: Add secure CMDQ driver support for CMDQ driver Fei Shao
2023-10-25 2:08 ` Jason-JH Lin (林睿祥)
2023-10-23 4:37 ` [PATCH v2 8/9] mailbox: mediatek: Add CMDQ secure mailbox driver Jason-JH.Lin
2023-10-23 10:48 ` AngeloGioacchino Del Regno
2023-10-25 6:20 ` Jason-JH Lin (林睿祥)
2023-11-06 6:53 ` CK Hu (胡俊光)
2023-11-06 13:07 ` Jason-JH Lin (林睿祥)
2023-10-23 4:37 ` [PATCH v2 9/9] arm64: dts: mediatek: mt8195: Add CMDQ secure driver support for gce0 Jason-JH.Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231023043751.17114-8-jason-jh.lin@mediatek.com \
--to=jason-jh.lin@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chunkuang.hu@kernel.org \
--cc=conor+dt@kernel.org \
--cc=jason-ch.chen@mediatek.com \
--cc=jassisinghbrar@gmail.com \
--cc=jkardatzke@google.com \
--cc=johnson.wang@mediatek.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nancy.lin@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=shawn.sung@mediatek.com \
--cc=singo.chang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox