* [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
@ 2022-08-24 1:10 ` Peng Fan (OSS)
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
V5:
The patchset could not apply on latest remoteproc for-next branch,
so rebased. Only patch 6 has a minor conflict, other patches are not
changed.
V4:
https://lore.kernel.org/all/20220701104725.557314-1-peng.fan@oss.nxp.com/
Add R-b from DT maintainer
Fix probe failure and driver remove path in patch 3, 4
Add comments about i.MX8QM entries filter in patch 5
V3:
Drop the dependency in V2.
Tested on i.MX8QM/8MM
Use 'fsl,resource-id' and 'fsl,entry-address' Per dt maintainer
Drop 'reg' property Per remoteproc maintainer
Drop mcore self recovery, until we land in common framework support.
https://patchwork.kernel.org/project/linux-remoteproc/cover/20220517064937.4033441-1-peng.fan@oss.nxp.com/
V2:
https://patchwork.kernel.org/project/linux-remoteproc/cover/20220309102118.8131-1-peng.fan@oss.nxp.com/
Depends on https://patchwork.kernel.org/project/linux-remoteproc/list/?series=621311
Tested on i.MX8QXP/QM/8MP
Addressed Mathieu's comments
Drop V1 patch 5/9, patch 3/9 is replaced with upper dependency patchset
Move V1 patch 4/9 out to https://patchwork.kernel.org/project/linux-remoteproc/patch/20220308065754.3355-1-peng.fan@oss.nxp.com/
Update commit log
Drop magic number to get entry address from device tree in patch 4/6
The V1 patchset:
https://patchwork.kernel.org/project/linux-remoteproc/patch/20220111033333.403448-4-peng.fan@oss.nxp.com/
Peng Fan (6):
dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
dt-bindings: remoteproc: imx_rproc: support i.MX8QM
remoteproc: imx_rproc: support attaching to i.MX8QXP M4
remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
remoteproc: imx_rproc: support i.MX8QM
remoteproc: imx_rproc: request mbox channel later
.../bindings/remoteproc/fsl,imx-rproc.yaml | 16 ++
drivers/remoteproc/imx_rproc.c | 261 +++++++++++++++++-
2 files changed, 270 insertions(+), 7 deletions(-)
--
2.37.1
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
@ 2022-08-24 1:10 ` Peng Fan (OSS)
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
V5:
The patchset could not apply on latest remoteproc for-next branch,
so rebased. Only patch 6 has a minor conflict, other patches are not
changed.
V4:
https://lore.kernel.org/all/20220701104725.557314-1-peng.fan@oss.nxp.com/
Add R-b from DT maintainer
Fix probe failure and driver remove path in patch 3, 4
Add comments about i.MX8QM entries filter in patch 5
V3:
Drop the dependency in V2.
Tested on i.MX8QM/8MM
Use 'fsl,resource-id' and 'fsl,entry-address' Per dt maintainer
Drop 'reg' property Per remoteproc maintainer
Drop mcore self recovery, until we land in common framework support.
https://patchwork.kernel.org/project/linux-remoteproc/cover/20220517064937.4033441-1-peng.fan@oss.nxp.com/
V2:
https://patchwork.kernel.org/project/linux-remoteproc/cover/20220309102118.8131-1-peng.fan@oss.nxp.com/
Depends on https://patchwork.kernel.org/project/linux-remoteproc/list/?series=621311
Tested on i.MX8QXP/QM/8MP
Addressed Mathieu's comments
Drop V1 patch 5/9, patch 3/9 is replaced with upper dependency patchset
Move V1 patch 4/9 out to https://patchwork.kernel.org/project/linux-remoteproc/patch/20220308065754.3355-1-peng.fan@oss.nxp.com/
Update commit log
Drop magic number to get entry address from device tree in patch 4/6
The V1 patchset:
https://patchwork.kernel.org/project/linux-remoteproc/patch/20220111033333.403448-4-peng.fan@oss.nxp.com/
Peng Fan (6):
dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
dt-bindings: remoteproc: imx_rproc: support i.MX8QM
remoteproc: imx_rproc: support attaching to i.MX8QXP M4
remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
remoteproc: imx_rproc: support i.MX8QM
remoteproc: imx_rproc: request mbox channel later
.../bindings/remoteproc/fsl,imx-rproc.yaml | 16 ++
drivers/remoteproc/imx_rproc.c | 261 +++++++++++++++++-
2 files changed, 270 insertions(+), 7 deletions(-)
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH V5 1/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
2022-08-24 1:10 ` Peng Fan (OSS)
@ 2022-08-24 1:10 ` Peng Fan (OSS)
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan, Rob Herring
From: Peng Fan <peng.fan@nxp.com>
Add i.MX8QXP compatible
Add a new property fsl,resource-id for SoC which supports SCFW.
This property is used to check whether remote process is under control
of Linux or not.
Add fsl,entry-address to specify the entry address which used by SCFW
to kick M4.
To i.MX8QM/QXP, when M4 is in the same hardware partition with Cortex-A
cores, need power up M4 through SCFW, then M4 could start. So introduce
power-domains property
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
.../bindings/remoteproc/fsl,imx-rproc.yaml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
index 3a1f59ad79e2..70322e57b6ff 100644
--- a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
@@ -22,6 +22,7 @@ properties:
- fsl,imx8mn-cm7
- fsl,imx8mp-cm7
- fsl,imx8mq-cm4
+ - fsl,imx8qxp-cm4
- fsl,imx8ulp-cm33
- fsl,imx93-cm33
@@ -54,12 +55,26 @@ properties:
minItems: 1
maxItems: 32
+ power-domains:
+ maxItems: 8
+
fsl,auto-boot:
$ref: /schemas/types.yaml#/definitions/flag
description:
Indicate whether need to load the default firmware and start the remote
processor automatically.
+ fsl,entry-address:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Specify CPU entry address for SCU enabled processor.
+
+ fsl,resource-id:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ This property is to specify the resource id of the remote processor in SoC
+ which supports SCFW
+
required:
- compatible
--
2.37.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 1/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
@ 2022-08-24 1:10 ` Peng Fan (OSS)
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan, Rob Herring
From: Peng Fan <peng.fan@nxp.com>
Add i.MX8QXP compatible
Add a new property fsl,resource-id for SoC which supports SCFW.
This property is used to check whether remote process is under control
of Linux or not.
Add fsl,entry-address to specify the entry address which used by SCFW
to kick M4.
To i.MX8QM/QXP, when M4 is in the same hardware partition with Cortex-A
cores, need power up M4 through SCFW, then M4 could start. So introduce
power-domains property
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
.../bindings/remoteproc/fsl,imx-rproc.yaml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
index 3a1f59ad79e2..70322e57b6ff 100644
--- a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
@@ -22,6 +22,7 @@ properties:
- fsl,imx8mn-cm7
- fsl,imx8mp-cm7
- fsl,imx8mq-cm4
+ - fsl,imx8qxp-cm4
- fsl,imx8ulp-cm33
- fsl,imx93-cm33
@@ -54,12 +55,26 @@ properties:
minItems: 1
maxItems: 32
+ power-domains:
+ maxItems: 8
+
fsl,auto-boot:
$ref: /schemas/types.yaml#/definitions/flag
description:
Indicate whether need to load the default firmware and start the remote
processor automatically.
+ fsl,entry-address:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Specify CPU entry address for SCU enabled processor.
+
+ fsl,resource-id:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ This property is to specify the resource id of the remote processor in SoC
+ which supports SCFW
+
required:
- compatible
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 2/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QM
2022-08-24 1:10 ` Peng Fan (OSS)
@ 2022-08-24 1:10 ` Peng Fan (OSS)
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan, Rob Herring
From: Peng Fan <peng.fan@nxp.com>
Add i.MX8QM compatible
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
index 70322e57b6ff..64e783234e38 100644
--- a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
@@ -23,6 +23,7 @@ properties:
- fsl,imx8mp-cm7
- fsl,imx8mq-cm4
- fsl,imx8qxp-cm4
+ - fsl,imx8qm-cm4
- fsl,imx8ulp-cm33
- fsl,imx93-cm33
--
2.37.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 2/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QM
@ 2022-08-24 1:10 ` Peng Fan (OSS)
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan, Rob Herring
From: Peng Fan <peng.fan@nxp.com>
Add i.MX8QM compatible
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
index 70322e57b6ff..64e783234e38 100644
--- a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
@@ -23,6 +23,7 @@ properties:
- fsl,imx8mp-cm7
- fsl,imx8mq-cm4
- fsl,imx8qxp-cm4
+ - fsl,imx8qm-cm4
- fsl,imx8ulp-cm33
- fsl,imx93-cm33
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-08-24 1:10 ` Peng Fan (OSS)
@ 2022-08-24 1:10 ` Peng Fan (OSS)
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
When M4 is kicked by SCFW, M4 runs in its own hardware partition, Linux
could only do IPC with M4, it could not start, stop, update image.
We disable recovery reboot when M4 is managed by SCFW, because
remoteproc core still not support M4 auto-recovery without loading
image.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 108 ++++++++++++++++++++++++++++++++-
1 file changed, 107 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 7cc4fd207e2d..bcba74e90020 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -6,6 +6,7 @@
#include <linux/arm-smccc.h>
#include <linux/clk.h>
#include <linux/err.h>
+#include <linux/firmware/imx/sci.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/mailbox_client.h>
@@ -59,6 +60,8 @@
#define IMX_SIP_RPROC_STARTED 0x01
#define IMX_SIP_RPROC_STOP 0x02
+#define IMX_SC_IRQ_GROUP_REBOOTED 5
+
/**
* struct imx_rproc_mem - slim internal memory structure
* @cpu_addr: MPU virtual address of the memory region
@@ -89,6 +92,10 @@ struct imx_rproc {
struct work_struct rproc_work;
struct workqueue_struct *workqueue;
void __iomem *rsc_table;
+ struct imx_sc_ipc *ipc_handle;
+ struct notifier_block rproc_nb;
+ u32 rproc_pt; /* partition id */
+ u32 rsrc_id; /* resource id */
};
static const struct imx_rproc_att imx_rproc_att_imx93[] = {
@@ -117,6 +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
{ 0xD0000000, 0xa0000000, 0x10000000, 0 },
};
+static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
+ { 0x08000000, 0x08000000, 0x10000000, 0 },
+ /* TCML/U */
+ { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
+ /* OCRAM(Low 96KB) */
+ { 0x21000000, 0x00100000, 0x00018000, 0 },
+ /* OCRAM */
+ { 0x21100000, 0x00100000, 0x00040000, 0 },
+ /* DDR (Data) */
+ { 0x80000000, 0x80000000, 0x60000000, 0 },
+};
+
static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
/* dev addr , sys addr , size , flags */
/* ITCM */
@@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
.method = IMX_RPROC_MMIO,
};
+static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
+ .att = imx_rproc_att_imx8qxp,
+ .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
+ .method = IMX_RPROC_SCU_API,
+};
+
static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
.att = imx_rproc_att_imx8ulp,
.att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
@@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc *rproc)
mbox_free_channel(priv->rx_ch);
}
+static void imx_rproc_put_scu(struct rproc *rproc)
+{
+ struct imx_rproc *priv = rproc->priv;
+ const struct imx_rproc_dcfg *dcfg = priv->dcfg;
+
+ if (dcfg->method != IMX_RPROC_SCU_API)
+ return;
+
+ if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ return;
+
+ imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), false);
+ imx_scu_irq_unregister_notifier(&priv->rproc_nb);
+}
+
+static int imx_rproc_partition_notify(struct notifier_block *nb,
+ unsigned long event, void *group)
+{
+ struct imx_rproc *priv = container_of(nb, struct imx_rproc, rproc_nb);
+
+ /* Ignore other irqs */
+ if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED)))
+ return 0;
+
+ rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
+
+ pr_info("Partition%d reset!\n", priv->rproc_pt);
+
+ return 0;
+}
+
static int imx_rproc_detect_mode(struct imx_rproc *priv)
{
struct regmap_config config = { .name = "imx-rproc" };
@@ -689,6 +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
struct arm_smccc_res res;
int ret;
u32 val;
+ u8 pt;
switch (dcfg->method) {
case IMX_RPROC_NONE:
@@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
if (res.a0)
priv->rproc->state = RPROC_DETACHED;
return 0;
+ case IMX_RPROC_SCU_API:
+ ret = imx_scu_get_handle(&priv->ipc_handle);
+ if (ret)
+ return ret;
+ ret = of_property_read_u32(dev->of_node, "fsl,resource-id", &priv->rsrc_id);
+ if (ret) {
+ dev_err(dev, "No fsl,resource-id property\n");
+ return ret;
+ }
+
+ /*
+ * If Mcore resource is not owned by Acore partition, It is kicked by ROM,
+ * and Linux could only do IPC with Mcore and nothing else.
+ */
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ return 0;
+
+ priv->rproc->state = RPROC_DETACHED;
+ priv->rproc->recovery_disabled = true;
+
+ /* Get partition id and enable irq in SCFW */
+ ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc_id, &pt);
+ if (ret) {
+ dev_err(dev, "not able to get resource owner\n");
+ return ret;
+ }
+
+ priv->rproc_pt = pt;
+ priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
+
+ ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
+ if (ret) {
+ dev_warn(dev, "register scu notifier failed.\n");
+ return ret;
+ }
+
+ ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt),
+ true);
+ if (ret) {
+ imx_scu_irq_unregister_notifier(&priv->rproc_nb);
+ dev_warn(dev, "Enable irq failed.\n");
+ return ret;
+ }
+
+ return 0;
default:
break;
}
@@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device *pdev)
ret = imx_rproc_clk_enable(priv);
if (ret)
- goto err_put_mbox;
+ goto err_put_scu;
INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
@@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device *pdev)
err_put_clk:
clk_disable_unprepare(priv->clk);
+err_put_scu:
+ imx_rproc_put_scu(rproc);
err_put_mbox:
imx_rproc_free_mbox(rproc);
err_put_wkq:
@@ -837,6 +941,7 @@ static int imx_rproc_remove(struct platform_device *pdev)
clk_disable_unprepare(priv->clk);
rproc_del(rproc);
+ imx_rproc_put_scu(rproc);
imx_rproc_free_mbox(rproc);
destroy_workqueue(priv->workqueue);
rproc_free(rproc);
@@ -852,6 +957,7 @@ static const struct of_device_id imx_rproc_of_match[] = {
{ .compatible = "fsl,imx8mm-cm4", .data = &imx_rproc_cfg_imx8mq },
{ .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn },
{ .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn },
+ { .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp },
{ .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp },
{ .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
{},
--
2.37.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-08-24 1:10 ` Peng Fan (OSS)
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
When M4 is kicked by SCFW, M4 runs in its own hardware partition, Linux
could only do IPC with M4, it could not start, stop, update image.
We disable recovery reboot when M4 is managed by SCFW, because
remoteproc core still not support M4 auto-recovery without loading
image.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 108 ++++++++++++++++++++++++++++++++-
1 file changed, 107 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 7cc4fd207e2d..bcba74e90020 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -6,6 +6,7 @@
#include <linux/arm-smccc.h>
#include <linux/clk.h>
#include <linux/err.h>
+#include <linux/firmware/imx/sci.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/mailbox_client.h>
@@ -59,6 +60,8 @@
#define IMX_SIP_RPROC_STARTED 0x01
#define IMX_SIP_RPROC_STOP 0x02
+#define IMX_SC_IRQ_GROUP_REBOOTED 5
+
/**
* struct imx_rproc_mem - slim internal memory structure
* @cpu_addr: MPU virtual address of the memory region
@@ -89,6 +92,10 @@ struct imx_rproc {
struct work_struct rproc_work;
struct workqueue_struct *workqueue;
void __iomem *rsc_table;
+ struct imx_sc_ipc *ipc_handle;
+ struct notifier_block rproc_nb;
+ u32 rproc_pt; /* partition id */
+ u32 rsrc_id; /* resource id */
};
static const struct imx_rproc_att imx_rproc_att_imx93[] = {
@@ -117,6 +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
{ 0xD0000000, 0xa0000000, 0x10000000, 0 },
};
+static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
+ { 0x08000000, 0x08000000, 0x10000000, 0 },
+ /* TCML/U */
+ { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
+ /* OCRAM(Low 96KB) */
+ { 0x21000000, 0x00100000, 0x00018000, 0 },
+ /* OCRAM */
+ { 0x21100000, 0x00100000, 0x00040000, 0 },
+ /* DDR (Data) */
+ { 0x80000000, 0x80000000, 0x60000000, 0 },
+};
+
static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
/* dev addr , sys addr , size , flags */
/* ITCM */
@@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
.method = IMX_RPROC_MMIO,
};
+static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
+ .att = imx_rproc_att_imx8qxp,
+ .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
+ .method = IMX_RPROC_SCU_API,
+};
+
static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
.att = imx_rproc_att_imx8ulp,
.att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
@@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc *rproc)
mbox_free_channel(priv->rx_ch);
}
+static void imx_rproc_put_scu(struct rproc *rproc)
+{
+ struct imx_rproc *priv = rproc->priv;
+ const struct imx_rproc_dcfg *dcfg = priv->dcfg;
+
+ if (dcfg->method != IMX_RPROC_SCU_API)
+ return;
+
+ if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ return;
+
+ imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), false);
+ imx_scu_irq_unregister_notifier(&priv->rproc_nb);
+}
+
+static int imx_rproc_partition_notify(struct notifier_block *nb,
+ unsigned long event, void *group)
+{
+ struct imx_rproc *priv = container_of(nb, struct imx_rproc, rproc_nb);
+
+ /* Ignore other irqs */
+ if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED)))
+ return 0;
+
+ rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
+
+ pr_info("Partition%d reset!\n", priv->rproc_pt);
+
+ return 0;
+}
+
static int imx_rproc_detect_mode(struct imx_rproc *priv)
{
struct regmap_config config = { .name = "imx-rproc" };
@@ -689,6 +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
struct arm_smccc_res res;
int ret;
u32 val;
+ u8 pt;
switch (dcfg->method) {
case IMX_RPROC_NONE:
@@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
if (res.a0)
priv->rproc->state = RPROC_DETACHED;
return 0;
+ case IMX_RPROC_SCU_API:
+ ret = imx_scu_get_handle(&priv->ipc_handle);
+ if (ret)
+ return ret;
+ ret = of_property_read_u32(dev->of_node, "fsl,resource-id", &priv->rsrc_id);
+ if (ret) {
+ dev_err(dev, "No fsl,resource-id property\n");
+ return ret;
+ }
+
+ /*
+ * If Mcore resource is not owned by Acore partition, It is kicked by ROM,
+ * and Linux could only do IPC with Mcore and nothing else.
+ */
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ return 0;
+
+ priv->rproc->state = RPROC_DETACHED;
+ priv->rproc->recovery_disabled = true;
+
+ /* Get partition id and enable irq in SCFW */
+ ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc_id, &pt);
+ if (ret) {
+ dev_err(dev, "not able to get resource owner\n");
+ return ret;
+ }
+
+ priv->rproc_pt = pt;
+ priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
+
+ ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
+ if (ret) {
+ dev_warn(dev, "register scu notifier failed.\n");
+ return ret;
+ }
+
+ ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt),
+ true);
+ if (ret) {
+ imx_scu_irq_unregister_notifier(&priv->rproc_nb);
+ dev_warn(dev, "Enable irq failed.\n");
+ return ret;
+ }
+
+ return 0;
default:
break;
}
@@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device *pdev)
ret = imx_rproc_clk_enable(priv);
if (ret)
- goto err_put_mbox;
+ goto err_put_scu;
INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
@@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device *pdev)
err_put_clk:
clk_disable_unprepare(priv->clk);
+err_put_scu:
+ imx_rproc_put_scu(rproc);
err_put_mbox:
imx_rproc_free_mbox(rproc);
err_put_wkq:
@@ -837,6 +941,7 @@ static int imx_rproc_remove(struct platform_device *pdev)
clk_disable_unprepare(priv->clk);
rproc_del(rproc);
+ imx_rproc_put_scu(rproc);
imx_rproc_free_mbox(rproc);
destroy_workqueue(priv->workqueue);
rproc_free(rproc);
@@ -852,6 +957,7 @@ static const struct of_device_id imx_rproc_of_match[] = {
{ .compatible = "fsl,imx8mm-cm4", .data = &imx_rproc_cfg_imx8mq },
{ .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn },
{ .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn },
+ { .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp },
{ .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp },
{ .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
{},
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 4/6] remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
2022-08-24 1:10 ` Peng Fan (OSS)
@ 2022-08-24 1:10 ` Peng Fan (OSS)
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
When M4 is in the same hardware partition with Cortex-A, it
could be start/stop by Linux.
Added power domain to make sure M4 could run, it requires several power
domains to work. Make clk always optional for i.MX8QXP, because
SCFW handles it when power up M4 core.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 88 ++++++++++++++++++++++++++++++++--
1 file changed, 84 insertions(+), 4 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index bcba74e90020..8cc8bcbbd895 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -16,6 +16,7 @@
#include <linux/of_reserved_mem.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/pm_domain.h>
#include <linux/regmap.h>
#include <linux/remoteproc.h>
#include <linux/workqueue.h>
@@ -79,6 +80,8 @@ struct imx_rproc_mem {
#define ATT_OWN BIT(1)
#define ATT_IOMEM BIT(2)
+static int imx_rproc_detach_pd(struct rproc *rproc);
+
struct imx_rproc {
struct device *dev;
struct regmap *regmap;
@@ -96,6 +99,10 @@ struct imx_rproc {
struct notifier_block rproc_nb;
u32 rproc_pt; /* partition id */
u32 rsrc_id; /* resource id */
+ u32 entry; /* cpu start address */
+ int num_pd;
+ struct device **pd_dev;
+ struct device_link **pd_dev_link;
};
static const struct imx_rproc_att imx_rproc_att_imx93[] = {
@@ -335,6 +342,9 @@ static int imx_rproc_start(struct rproc *rproc)
arm_smccc_smc(IMX_SIP_RPROC, IMX_SIP_RPROC_START, 0, 0, 0, 0, 0, 0, &res);
ret = res.a0;
break;
+ case IMX_RPROC_SCU_API:
+ ret = imx_sc_pm_cpu_start(priv->ipc_handle, priv->rsrc_id, true, priv->entry);
+ break;
default:
return -EOPNOTSUPP;
}
@@ -364,6 +374,9 @@ static int imx_rproc_stop(struct rproc *rproc)
if (res.a1)
dev_info(dev, "Not in wfi, force stopped\n");
break;
+ case IMX_RPROC_SCU_API:
+ ret = imx_sc_pm_cpu_start(priv->ipc_handle, priv->rsrc_id, false, priv->entry);
+ break;
default:
return -EOPNOTSUPP;
}
@@ -713,8 +726,8 @@ static void imx_rproc_put_scu(struct rproc *rproc)
if (dcfg->method != IMX_RPROC_SCU_API)
return;
- if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
- return;
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ return imx_rproc_detach_pd(rproc);
imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), false);
imx_scu_irq_unregister_notifier(&priv->rproc_nb);
@@ -736,6 +749,69 @@ static int imx_rproc_partition_notify(struct notifier_block *nb,
return 0;
}
+static int imx_rproc_attach_pd(struct imx_rproc *priv)
+{
+ struct device *dev = priv->dev;
+ int ret, i;
+
+ priv->num_pd = of_count_phandle_with_args(dev->of_node, "power-domains",
+ "#power-domain-cells");
+ if (priv->num_pd <= 1)
+ return 0;
+
+ priv->pd_dev = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev), GFP_KERNEL);
+ if (!priv->pd_dev)
+ return -ENOMEM;
+
+ priv->pd_dev_link = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev_link),
+ GFP_KERNEL);
+
+ if (!priv->pd_dev_link)
+ return -ENOMEM;
+
+ for (i = 0; i < priv->num_pd; i++) {
+ priv->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i);
+ if (IS_ERR(priv->pd_dev[i])) {
+ ret = PTR_ERR(priv->pd_dev[i]);
+ goto detach_pd;
+ }
+
+ priv->pd_dev_link[i] = device_link_add(dev, priv->pd_dev[i], DL_FLAG_STATELESS |
+ DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE);
+ if (!priv->pd_dev_link[i]) {
+ dev_pm_domain_detach(priv->pd_dev[i], false);
+ ret = -EINVAL;
+ goto detach_pd;
+ }
+ }
+
+ return 0;
+
+detach_pd:
+ while (--i >= 0) {
+ device_link_del(priv->pd_dev_link[i]);
+ dev_pm_domain_detach(priv->pd_dev[i], false);
+ }
+
+ return ret;
+}
+
+static int imx_rproc_detach_pd(struct rproc *rproc)
+{
+ struct imx_rproc *priv = rproc->priv;
+ int i;
+
+ if (priv->num_pd <= 1)
+ return 0;
+
+ for (i = 0; i < priv->num_pd; i++) {
+ device_link_del(priv->pd_dev_link[i]);
+ dev_pm_domain_detach(priv->pd_dev[i], false);
+ }
+
+ return 0;
+}
+
static int imx_rproc_detect_mode(struct imx_rproc *priv)
{
struct regmap_config config = { .name = "imx-rproc" };
@@ -770,8 +846,12 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
* If Mcore resource is not owned by Acore partition, It is kicked by ROM,
* and Linux could only do IPC with Mcore and nothing else.
*/
- if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
- return 0;
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) {
+ if (of_property_read_u32(dev->of_node, "fsl,entry-address", &priv->entry))
+ return -EINVAL;
+
+ return imx_rproc_attach_pd(priv);
+ }
priv->rproc->state = RPROC_DETACHED;
priv->rproc->recovery_disabled = true;
--
2.37.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 4/6] remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
@ 2022-08-24 1:10 ` Peng Fan (OSS)
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
When M4 is in the same hardware partition with Cortex-A, it
could be start/stop by Linux.
Added power domain to make sure M4 could run, it requires several power
domains to work. Make clk always optional for i.MX8QXP, because
SCFW handles it when power up M4 core.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 88 ++++++++++++++++++++++++++++++++--
1 file changed, 84 insertions(+), 4 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index bcba74e90020..8cc8bcbbd895 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -16,6 +16,7 @@
#include <linux/of_reserved_mem.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/pm_domain.h>
#include <linux/regmap.h>
#include <linux/remoteproc.h>
#include <linux/workqueue.h>
@@ -79,6 +80,8 @@ struct imx_rproc_mem {
#define ATT_OWN BIT(1)
#define ATT_IOMEM BIT(2)
+static int imx_rproc_detach_pd(struct rproc *rproc);
+
struct imx_rproc {
struct device *dev;
struct regmap *regmap;
@@ -96,6 +99,10 @@ struct imx_rproc {
struct notifier_block rproc_nb;
u32 rproc_pt; /* partition id */
u32 rsrc_id; /* resource id */
+ u32 entry; /* cpu start address */
+ int num_pd;
+ struct device **pd_dev;
+ struct device_link **pd_dev_link;
};
static const struct imx_rproc_att imx_rproc_att_imx93[] = {
@@ -335,6 +342,9 @@ static int imx_rproc_start(struct rproc *rproc)
arm_smccc_smc(IMX_SIP_RPROC, IMX_SIP_RPROC_START, 0, 0, 0, 0, 0, 0, &res);
ret = res.a0;
break;
+ case IMX_RPROC_SCU_API:
+ ret = imx_sc_pm_cpu_start(priv->ipc_handle, priv->rsrc_id, true, priv->entry);
+ break;
default:
return -EOPNOTSUPP;
}
@@ -364,6 +374,9 @@ static int imx_rproc_stop(struct rproc *rproc)
if (res.a1)
dev_info(dev, "Not in wfi, force stopped\n");
break;
+ case IMX_RPROC_SCU_API:
+ ret = imx_sc_pm_cpu_start(priv->ipc_handle, priv->rsrc_id, false, priv->entry);
+ break;
default:
return -EOPNOTSUPP;
}
@@ -713,8 +726,8 @@ static void imx_rproc_put_scu(struct rproc *rproc)
if (dcfg->method != IMX_RPROC_SCU_API)
return;
- if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
- return;
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ return imx_rproc_detach_pd(rproc);
imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), false);
imx_scu_irq_unregister_notifier(&priv->rproc_nb);
@@ -736,6 +749,69 @@ static int imx_rproc_partition_notify(struct notifier_block *nb,
return 0;
}
+static int imx_rproc_attach_pd(struct imx_rproc *priv)
+{
+ struct device *dev = priv->dev;
+ int ret, i;
+
+ priv->num_pd = of_count_phandle_with_args(dev->of_node, "power-domains",
+ "#power-domain-cells");
+ if (priv->num_pd <= 1)
+ return 0;
+
+ priv->pd_dev = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev), GFP_KERNEL);
+ if (!priv->pd_dev)
+ return -ENOMEM;
+
+ priv->pd_dev_link = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev_link),
+ GFP_KERNEL);
+
+ if (!priv->pd_dev_link)
+ return -ENOMEM;
+
+ for (i = 0; i < priv->num_pd; i++) {
+ priv->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i);
+ if (IS_ERR(priv->pd_dev[i])) {
+ ret = PTR_ERR(priv->pd_dev[i]);
+ goto detach_pd;
+ }
+
+ priv->pd_dev_link[i] = device_link_add(dev, priv->pd_dev[i], DL_FLAG_STATELESS |
+ DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE);
+ if (!priv->pd_dev_link[i]) {
+ dev_pm_domain_detach(priv->pd_dev[i], false);
+ ret = -EINVAL;
+ goto detach_pd;
+ }
+ }
+
+ return 0;
+
+detach_pd:
+ while (--i >= 0) {
+ device_link_del(priv->pd_dev_link[i]);
+ dev_pm_domain_detach(priv->pd_dev[i], false);
+ }
+
+ return ret;
+}
+
+static int imx_rproc_detach_pd(struct rproc *rproc)
+{
+ struct imx_rproc *priv = rproc->priv;
+ int i;
+
+ if (priv->num_pd <= 1)
+ return 0;
+
+ for (i = 0; i < priv->num_pd; i++) {
+ device_link_del(priv->pd_dev_link[i]);
+ dev_pm_domain_detach(priv->pd_dev[i], false);
+ }
+
+ return 0;
+}
+
static int imx_rproc_detect_mode(struct imx_rproc *priv)
{
struct regmap_config config = { .name = "imx-rproc" };
@@ -770,8 +846,12 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
* If Mcore resource is not owned by Acore partition, It is kicked by ROM,
* and Linux could only do IPC with Mcore and nothing else.
*/
- if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
- return 0;
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) {
+ if (of_property_read_u32(dev->of_node, "fsl,entry-address", &priv->entry))
+ return -EINVAL;
+
+ return imx_rproc_attach_pd(priv);
+ }
priv->rproc->state = RPROC_DETACHED;
priv->rproc->recovery_disabled = true;
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 5/6] remoteproc: imx_rproc: support i.MX8QM
2022-08-24 1:10 ` Peng Fan (OSS)
@ 2022-08-24 1:10 ` Peng Fan (OSS)
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Most logic are same as i.MX8QXP, but i.MX8QM has two general purpose
M4 cores, the two cores runs independently and they has different resource
id, different start address from SCFW view.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 47 +++++++++++++++++++++++++++++++---
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 8cc8bcbbd895..9e46fd9bc2d1 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -3,6 +3,7 @@
* Copyright (c) 2017 Pengutronix, Oleksij Rempel <kernel@pengutronix.de>
*/
+#include <dt-bindings/firmware/imx/rsrc.h>
#include <linux/arm-smccc.h>
#include <linux/clk.h>
#include <linux/err.h>
@@ -75,10 +76,13 @@ struct imx_rproc_mem {
size_t size;
};
-/* att flags */
+/* att flags: lower 16 bits specifying core, higher 16 bits for flags */
/* M4 own area. Can be mapped at probe */
-#define ATT_OWN BIT(1)
-#define ATT_IOMEM BIT(2)
+#define ATT_OWN BIT(31)
+#define ATT_IOMEM BIT(30)
+
+#define ATT_CORE_MASK 0xffff
+#define ATT_CORE(I) BIT((I))
static int imx_rproc_detach_pd(struct rproc *rproc);
@@ -101,6 +105,7 @@ struct imx_rproc {
u32 rsrc_id; /* resource id */
u32 entry; /* cpu start address */
int num_pd;
+ u32 core_index;
struct device **pd_dev;
struct device_link **pd_dev_link;
};
@@ -131,6 +136,19 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
{ 0xD0000000, 0xa0000000, 0x10000000, 0 },
};
+static const struct imx_rproc_att imx_rproc_att_imx8qm[] = {
+ /* dev addr , sys addr , size , flags */
+ { 0x08000000, 0x08000000, 0x10000000, 0},
+ /* TCML */
+ { 0x1FFE0000, 0x34FE0000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(0)},
+ { 0x1FFE0000, 0x38FE0000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(1)},
+ /* TCMU */
+ { 0x20000000, 0x35000000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(0)},
+ { 0x20000000, 0x39000000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(1)},
+ /* DDR (Data) */
+ { 0x80000000, 0x80000000, 0x60000000, 0 },
+};
+
static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
{ 0x08000000, 0x08000000, 0x10000000, 0 },
/* TCML/U */
@@ -281,6 +299,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
.method = IMX_RPROC_MMIO,
};
+static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qm = {
+ .att = imx_rproc_att_imx8qm,
+ .att_size = ARRAY_SIZE(imx_rproc_att_imx8qm),
+ .method = IMX_RPROC_SCU_API,
+};
+
static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
.att = imx_rproc_att_imx8qxp,
.att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
@@ -397,6 +421,17 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,
for (i = 0; i < dcfg->att_size; i++) {
const struct imx_rproc_att *att = &dcfg->att[i];
+ /*
+ * Ignore entries not belong to current core:
+ * i.MX8QM has dual general M4_[0,1] cores, M4_0's own entries
+ * has "ATT_CORE(0) & BIT(0)" true, M4_1's own entries has
+ * "ATT_CORE(1) & BIT(1)" true.
+ */
+ if (att->flags & ATT_CORE_MASK) {
+ if (!((BIT(priv->core_index)) & (att->flags & ATT_CORE_MASK)))
+ continue;
+ }
+
if (da >= att->da && da + len < att->da + att->size) {
unsigned int offset = da - att->da;
@@ -842,6 +877,11 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
return ret;
}
+ if (priv->rsrc_id == IMX_SC_R_M4_1_PID0)
+ priv->core_index = 1;
+ else
+ priv->core_index = 0;
+
/*
* If Mcore resource is not owned by Acore partition, It is kicked by ROM,
* and Linux could only do IPC with Mcore and nothing else.
@@ -1038,6 +1078,7 @@ static const struct of_device_id imx_rproc_of_match[] = {
{ .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn },
{ .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn },
{ .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp },
+ { .compatible = "fsl,imx8qm-cm4", .data = &imx_rproc_cfg_imx8qm },
{ .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp },
{ .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
{},
--
2.37.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 5/6] remoteproc: imx_rproc: support i.MX8QM
@ 2022-08-24 1:10 ` Peng Fan (OSS)
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Most logic are same as i.MX8QXP, but i.MX8QM has two general purpose
M4 cores, the two cores runs independently and they has different resource
id, different start address from SCFW view.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 47 +++++++++++++++++++++++++++++++---
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 8cc8bcbbd895..9e46fd9bc2d1 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -3,6 +3,7 @@
* Copyright (c) 2017 Pengutronix, Oleksij Rempel <kernel@pengutronix.de>
*/
+#include <dt-bindings/firmware/imx/rsrc.h>
#include <linux/arm-smccc.h>
#include <linux/clk.h>
#include <linux/err.h>
@@ -75,10 +76,13 @@ struct imx_rproc_mem {
size_t size;
};
-/* att flags */
+/* att flags: lower 16 bits specifying core, higher 16 bits for flags */
/* M4 own area. Can be mapped at probe */
-#define ATT_OWN BIT(1)
-#define ATT_IOMEM BIT(2)
+#define ATT_OWN BIT(31)
+#define ATT_IOMEM BIT(30)
+
+#define ATT_CORE_MASK 0xffff
+#define ATT_CORE(I) BIT((I))
static int imx_rproc_detach_pd(struct rproc *rproc);
@@ -101,6 +105,7 @@ struct imx_rproc {
u32 rsrc_id; /* resource id */
u32 entry; /* cpu start address */
int num_pd;
+ u32 core_index;
struct device **pd_dev;
struct device_link **pd_dev_link;
};
@@ -131,6 +136,19 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
{ 0xD0000000, 0xa0000000, 0x10000000, 0 },
};
+static const struct imx_rproc_att imx_rproc_att_imx8qm[] = {
+ /* dev addr , sys addr , size , flags */
+ { 0x08000000, 0x08000000, 0x10000000, 0},
+ /* TCML */
+ { 0x1FFE0000, 0x34FE0000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(0)},
+ { 0x1FFE0000, 0x38FE0000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(1)},
+ /* TCMU */
+ { 0x20000000, 0x35000000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(0)},
+ { 0x20000000, 0x39000000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(1)},
+ /* DDR (Data) */
+ { 0x80000000, 0x80000000, 0x60000000, 0 },
+};
+
static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
{ 0x08000000, 0x08000000, 0x10000000, 0 },
/* TCML/U */
@@ -281,6 +299,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
.method = IMX_RPROC_MMIO,
};
+static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qm = {
+ .att = imx_rproc_att_imx8qm,
+ .att_size = ARRAY_SIZE(imx_rproc_att_imx8qm),
+ .method = IMX_RPROC_SCU_API,
+};
+
static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
.att = imx_rproc_att_imx8qxp,
.att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
@@ -397,6 +421,17 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,
for (i = 0; i < dcfg->att_size; i++) {
const struct imx_rproc_att *att = &dcfg->att[i];
+ /*
+ * Ignore entries not belong to current core:
+ * i.MX8QM has dual general M4_[0,1] cores, M4_0's own entries
+ * has "ATT_CORE(0) & BIT(0)" true, M4_1's own entries has
+ * "ATT_CORE(1) & BIT(1)" true.
+ */
+ if (att->flags & ATT_CORE_MASK) {
+ if (!((BIT(priv->core_index)) & (att->flags & ATT_CORE_MASK)))
+ continue;
+ }
+
if (da >= att->da && da + len < att->da + att->size) {
unsigned int offset = da - att->da;
@@ -842,6 +877,11 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
return ret;
}
+ if (priv->rsrc_id == IMX_SC_R_M4_1_PID0)
+ priv->core_index = 1;
+ else
+ priv->core_index = 0;
+
/*
* If Mcore resource is not owned by Acore partition, It is kicked by ROM,
* and Linux could only do IPC with Mcore and nothing else.
@@ -1038,6 +1078,7 @@ static const struct of_device_id imx_rproc_of_match[] = {
{ .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn },
{ .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn },
{ .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp },
+ { .compatible = "fsl,imx8qm-cm4", .data = &imx_rproc_cfg_imx8qm },
{ .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp },
{ .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
{},
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 6/6] remoteproc: imx_rproc: request mbox channel later
2022-08-24 1:10 ` Peng Fan (OSS)
@ 2022-08-24 1:10 ` Peng Fan (OSS)
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
It is possible that when remote processor crash, the communication
channel will be broken with garbage value in mailbox, such as
when Linux is issuing a message through mailbox, remote processor
crashes, we need free & rebuild the mailbox channels to make sure
no garbage value in mailbox channels.
So move the request/free to start/stop for managing remote procesosr in
Linux, move to attach/detach for remote processor is out of control of
Linux.
Previous, we just request mbox when attach for CM4 boot early before
Linux, but if mbox defer probe, remoteproc core will do resource cleanup
and corrupt resource table for later probe.
So move request mbox ealier and still keep mbox request when attach
for self recovery case, but keep a check when request/free mbox.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 9e46fd9bc2d1..62726efa8ff5 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -84,6 +84,8 @@ struct imx_rproc_mem {
#define ATT_CORE_MASK 0xffff
#define ATT_CORE(I) BIT((I))
+static int imx_rproc_xtr_mbox_init(struct rproc *rproc);
+static void imx_rproc_free_mbox(struct rproc *rproc);
static int imx_rproc_detach_pd(struct rproc *rproc);
struct imx_rproc {
@@ -357,6 +359,10 @@ static int imx_rproc_start(struct rproc *rproc)
struct arm_smccc_res res;
int ret;
+ ret = imx_rproc_xtr_mbox_init(rproc);
+ if (ret)
+ return ret;
+
switch (dcfg->method) {
case IMX_RPROC_MMIO:
ret = regmap_update_bits(priv->regmap, dcfg->src_reg, dcfg->src_mask,
@@ -407,6 +413,8 @@ static int imx_rproc_stop(struct rproc *rproc)
if (ret)
dev_err(dev, "Failed to stop remote core\n");
+ else
+ imx_rproc_free_mbox(rproc);
return ret;
}
@@ -592,7 +600,7 @@ static void imx_rproc_kick(struct rproc *rproc, int vqid)
static int imx_rproc_attach(struct rproc *rproc)
{
- return 0;
+ return imx_rproc_xtr_mbox_init(rproc);
}
static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz)
@@ -720,6 +728,9 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
struct device *dev = priv->dev;
struct mbox_client *cl;
+ if (priv->tx_ch && priv->rx_ch)
+ return 0;
+
if (!of_get_property(dev->of_node, "mbox-names", NULL))
return 0;
@@ -749,8 +760,15 @@ static void imx_rproc_free_mbox(struct rproc *rproc)
{
struct imx_rproc *priv = rproc->priv;
- mbox_free_channel(priv->tx_ch);
- mbox_free_channel(priv->rx_ch);
+ if (priv->tx_ch) {
+ mbox_free_channel(priv->tx_ch);
+ priv->tx_ch = NULL;
+ }
+
+ if (priv->rx_ch) {
+ mbox_free_channel(priv->rx_ch);
+ priv->rx_ch = NULL;
+ }
}
static void imx_rproc_put_scu(struct rproc *rproc)
@@ -777,6 +795,8 @@ static int imx_rproc_partition_notify(struct notifier_block *nb,
if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED)))
return 0;
+ imx_rproc_free_mbox(priv->rproc);
+
rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
pr_info("Partition%d reset!\n", priv->rproc_pt);
--
2.37.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH V5 6/6] remoteproc: imx_rproc: request mbox channel later
@ 2022-08-24 1:10 ` Peng Fan (OSS)
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan (OSS) @ 2022-08-24 1:10 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
It is possible that when remote processor crash, the communication
channel will be broken with garbage value in mailbox, such as
when Linux is issuing a message through mailbox, remote processor
crashes, we need free & rebuild the mailbox channels to make sure
no garbage value in mailbox channels.
So move the request/free to start/stop for managing remote procesosr in
Linux, move to attach/detach for remote processor is out of control of
Linux.
Previous, we just request mbox when attach for CM4 boot early before
Linux, but if mbox defer probe, remoteproc core will do resource cleanup
and corrupt resource table for later probe.
So move request mbox ealier and still keep mbox request when attach
for self recovery case, but keep a check when request/free mbox.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 9e46fd9bc2d1..62726efa8ff5 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -84,6 +84,8 @@ struct imx_rproc_mem {
#define ATT_CORE_MASK 0xffff
#define ATT_CORE(I) BIT((I))
+static int imx_rproc_xtr_mbox_init(struct rproc *rproc);
+static void imx_rproc_free_mbox(struct rproc *rproc);
static int imx_rproc_detach_pd(struct rproc *rproc);
struct imx_rproc {
@@ -357,6 +359,10 @@ static int imx_rproc_start(struct rproc *rproc)
struct arm_smccc_res res;
int ret;
+ ret = imx_rproc_xtr_mbox_init(rproc);
+ if (ret)
+ return ret;
+
switch (dcfg->method) {
case IMX_RPROC_MMIO:
ret = regmap_update_bits(priv->regmap, dcfg->src_reg, dcfg->src_mask,
@@ -407,6 +413,8 @@ static int imx_rproc_stop(struct rproc *rproc)
if (ret)
dev_err(dev, "Failed to stop remote core\n");
+ else
+ imx_rproc_free_mbox(rproc);
return ret;
}
@@ -592,7 +600,7 @@ static void imx_rproc_kick(struct rproc *rproc, int vqid)
static int imx_rproc_attach(struct rproc *rproc)
{
- return 0;
+ return imx_rproc_xtr_mbox_init(rproc);
}
static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz)
@@ -720,6 +728,9 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
struct device *dev = priv->dev;
struct mbox_client *cl;
+ if (priv->tx_ch && priv->rx_ch)
+ return 0;
+
if (!of_get_property(dev->of_node, "mbox-names", NULL))
return 0;
@@ -749,8 +760,15 @@ static void imx_rproc_free_mbox(struct rproc *rproc)
{
struct imx_rproc *priv = rproc->priv;
- mbox_free_channel(priv->tx_ch);
- mbox_free_channel(priv->rx_ch);
+ if (priv->tx_ch) {
+ mbox_free_channel(priv->tx_ch);
+ priv->tx_ch = NULL;
+ }
+
+ if (priv->rx_ch) {
+ mbox_free_channel(priv->rx_ch);
+ priv->rx_ch = NULL;
+ }
}
static void imx_rproc_put_scu(struct rproc *rproc)
@@ -777,6 +795,8 @@ static int imx_rproc_partition_notify(struct notifier_block *nb,
if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED)))
return 0;
+ imx_rproc_free_mbox(priv->rproc);
+
rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
pr_info("Partition%d reset!\n", priv->rproc_pt);
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 40+ messages in thread
* RE: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
2022-08-24 1:10 ` Peng Fan (OSS)
@ 2022-09-20 3:09 ` Peng Fan
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-20 3:09 UTC (permalink / raw)
To: Peng Fan (OSS),
bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel
Hi Bjorn, Mathieu
Is this patchset fine for you?
V4 was sent out 2 months ago and no comments,
V5 was sent out near 1 month with only a minor rebase conflict.
Thanks,
Peng.
> Subject: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
>
> From: Peng Fan <peng.fan@nxp.com>
>
> V5:
> The patchset could not apply on latest remoteproc for-next branch, so
> rebased. Only patch 6 has a minor conflict, other patches are not changed.
>
> V4:
> https://lore.kernel.org/all/20220701104725.557314-1-
> peng.fan@oss.nxp.com/
> Add R-b from DT maintainer
> Fix probe failure and driver remove path in patch 3, 4 Add comments
> about i.MX8QM entries filter in patch 5
>
> V3:
> Drop the dependency in V2.
> Tested on i.MX8QM/8MM
> Use 'fsl,resource-id' and 'fsl,entry-address' Per dt maintainer Drop 'reg'
> property Per remoteproc maintainer Drop mcore self recovery, until we
> land in common framework support.
> https://patchwork.kernel.org/project/linux-
> remoteproc/cover/20220517064937.4033441-1-peng.fan@oss.nxp.com/
>
> V2:
> https://patchwork.kernel.org/project/linux-
> remoteproc/cover/20220309102118.8131-1-peng.fan@oss.nxp.com/
> Depends on https://patchwork.kernel.org/project/linux-
> remoteproc/list/?series=621311
> Tested on i.MX8QXP/QM/8MP
> Addressed Mathieu's comments
> Drop V1 patch 5/9, patch 3/9 is replaced with upper dependency patchset
> Move V1 patch 4/9 out to https://patchwork.kernel.org/project/linux-
> remoteproc/patch/20220308065754.3355-1-peng.fan@oss.nxp.com/
> Update commit log
> Drop magic number to get entry address from device tree in patch 4/6
>
> The V1 patchset:
> https://patchwork.kernel.org/project/linux-
> remoteproc/patch/20220111033333.403448-4-peng.fan@oss.nxp.com/
>
> Peng Fan (6):
> dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
> dt-bindings: remoteproc: imx_rproc: support i.MX8QM
> remoteproc: imx_rproc: support attaching to i.MX8QXP M4
> remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
> remoteproc: imx_rproc: support i.MX8QM
> remoteproc: imx_rproc: request mbox channel later
>
> .../bindings/remoteproc/fsl,imx-rproc.yaml | 16 ++
> drivers/remoteproc/imx_rproc.c | 261 +++++++++++++++++-
> 2 files changed, 270 insertions(+), 7 deletions(-)
>
> --
> 2.37.1
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
@ 2022-09-20 3:09 ` Peng Fan
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-20 3:09 UTC (permalink / raw)
To: Peng Fan (OSS),
bjorn.andersson, mathieu.poirier, robh+dt,
krzysztof.kozlowski+dt, shawnguo, s.hauer
Cc: kernel, festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel
Hi Bjorn, Mathieu
Is this patchset fine for you?
V4 was sent out 2 months ago and no comments,
V5 was sent out near 1 month with only a minor rebase conflict.
Thanks,
Peng.
> Subject: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
>
> From: Peng Fan <peng.fan@nxp.com>
>
> V5:
> The patchset could not apply on latest remoteproc for-next branch, so
> rebased. Only patch 6 has a minor conflict, other patches are not changed.
>
> V4:
> https://lore.kernel.org/all/20220701104725.557314-1-
> peng.fan@oss.nxp.com/
> Add R-b from DT maintainer
> Fix probe failure and driver remove path in patch 3, 4 Add comments
> about i.MX8QM entries filter in patch 5
>
> V3:
> Drop the dependency in V2.
> Tested on i.MX8QM/8MM
> Use 'fsl,resource-id' and 'fsl,entry-address' Per dt maintainer Drop 'reg'
> property Per remoteproc maintainer Drop mcore self recovery, until we
> land in common framework support.
> https://patchwork.kernel.org/project/linux-
> remoteproc/cover/20220517064937.4033441-1-peng.fan@oss.nxp.com/
>
> V2:
> https://patchwork.kernel.org/project/linux-
> remoteproc/cover/20220309102118.8131-1-peng.fan@oss.nxp.com/
> Depends on https://patchwork.kernel.org/project/linux-
> remoteproc/list/?series=621311
> Tested on i.MX8QXP/QM/8MP
> Addressed Mathieu's comments
> Drop V1 patch 5/9, patch 3/9 is replaced with upper dependency patchset
> Move V1 patch 4/9 out to https://patchwork.kernel.org/project/linux-
> remoteproc/patch/20220308065754.3355-1-peng.fan@oss.nxp.com/
> Update commit log
> Drop magic number to get entry address from device tree in patch 4/6
>
> The V1 patchset:
> https://patchwork.kernel.org/project/linux-
> remoteproc/patch/20220111033333.403448-4-peng.fan@oss.nxp.com/
>
> Peng Fan (6):
> dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
> dt-bindings: remoteproc: imx_rproc: support i.MX8QM
> remoteproc: imx_rproc: support attaching to i.MX8QXP M4
> remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
> remoteproc: imx_rproc: support i.MX8QM
> remoteproc: imx_rproc: request mbox channel later
>
> .../bindings/remoteproc/fsl,imx-rproc.yaml | 16 ++
> drivers/remoteproc/imx_rproc.c | 261 +++++++++++++++++-
> 2 files changed, 270 insertions(+), 7 deletions(-)
>
> --
> 2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
2022-09-20 3:09 ` Peng Fan
@ 2022-09-20 6:35 ` Peng Fan
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-20 6:35 UTC (permalink / raw)
To: Peng Fan (OSS),
andersson, mathieu.poirier, robh+dt, krzysztof.kozlowski+dt,
shawnguo, s.hauer
Cc: kernel, festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel
Correct Bjorn's mail address.
> -----Original Message-----
> From: Peng Fan <peng.fan@nxp.com>
> Sent: 2022年9月20日 11:09
> To: Peng Fan (OSS) <peng.fan@oss.nxp.com>; bjorn.andersson@kernel.org;
> mathieu.poirier@linaro.org; robh+dt@kernel.org;
> krzysztof.kozlowski+dt@linaro.org; shawnguo@kernel.org;
> s.hauer@pengutronix.de
> Cc: kernel@pengutronix.de; festevam@gmail.com; dl-linux-imx <linux-
> imx@nxp.com>; linux-remoteproc@vger.kernel.org;
> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org
> Subject: RE: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
>
> Hi Bjorn, Mathieu
>
> Is this patchset fine for you?
> V4 was sent out 2 months ago and no comments,
> V5 was sent out near 1 month with only a minor rebase conflict.
>
> Thanks,
> Peng.
Thanks,
Peng.
>
> > Subject: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
> >
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > V5:
> > The patchset could not apply on latest remoteproc for-next branch,
> > so rebased. Only patch 6 has a minor conflict, other patches are not
> changed.
> >
> > V4:
> > https://lore.kernel.org/all/20220701104725.557314-1-
> > peng.fan@oss.nxp.com/
> > Add R-b from DT maintainer
> > Fix probe failure and driver remove path in patch 3, 4 Add comments
> > about i.MX8QM entries filter in patch 5
> >
> > V3:
> > Drop the dependency in V2.
> > Tested on i.MX8QM/8MM
> > Use 'fsl,resource-id' and 'fsl,entry-address' Per dt maintainer Drop 'reg'
> > property Per remoteproc maintainer Drop mcore self recovery, until we
> > land in common framework support.
> > https://patchwork.kernel.org/project/linux-
> > remoteproc/cover/20220517064937.4033441-1-peng.fan@oss.nxp.com/
> >
> > V2:
> > https://patchwork.kernel.org/project/linux-
> > remoteproc/cover/20220309102118.8131-1-peng.fan@oss.nxp.com/
> > Depends on https://patchwork.kernel.org/project/linux-
> > remoteproc/list/?series=621311
> > Tested on i.MX8QXP/QM/8MP
> > Addressed Mathieu's comments
> > Drop V1 patch 5/9, patch 3/9 is replaced with upper dependency
> > patchset Move V1 patch 4/9 out to
> > https://patchwork.kernel.org/project/linux-
> > remoteproc/patch/20220308065754.3355-1-peng.fan@oss.nxp.com/
> > Update commit log
> > Drop magic number to get entry address from device tree in patch 4/6
> >
> > The V1 patchset:
> > https://patchwork.kernel.org/project/linux-
> > remoteproc/patch/20220111033333.403448-4-peng.fan@oss.nxp.com/
> >
> > Peng Fan (6):
> > dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
> > dt-bindings: remoteproc: imx_rproc: support i.MX8QM
> > remoteproc: imx_rproc: support attaching to i.MX8QXP M4
> > remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
> > remoteproc: imx_rproc: support i.MX8QM
> > remoteproc: imx_rproc: request mbox channel later
> >
> > .../bindings/remoteproc/fsl,imx-rproc.yaml | 16 ++
> > drivers/remoteproc/imx_rproc.c | 261 +++++++++++++++++-
> > 2 files changed, 270 insertions(+), 7 deletions(-)
> >
> > --
> > 2.37.1
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
@ 2022-09-20 6:35 ` Peng Fan
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-20 6:35 UTC (permalink / raw)
To: Peng Fan (OSS),
andersson, mathieu.poirier, robh+dt, krzysztof.kozlowski+dt,
shawnguo, s.hauer
Cc: kernel, festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel
Correct Bjorn's mail address.
> -----Original Message-----
> From: Peng Fan <peng.fan@nxp.com>
> Sent: 2022年9月20日 11:09
> To: Peng Fan (OSS) <peng.fan@oss.nxp.com>; bjorn.andersson@kernel.org;
> mathieu.poirier@linaro.org; robh+dt@kernel.org;
> krzysztof.kozlowski+dt@linaro.org; shawnguo@kernel.org;
> s.hauer@pengutronix.de
> Cc: kernel@pengutronix.de; festevam@gmail.com; dl-linux-imx <linux-
> imx@nxp.com>; linux-remoteproc@vger.kernel.org;
> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org
> Subject: RE: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
>
> Hi Bjorn, Mathieu
>
> Is this patchset fine for you?
> V4 was sent out 2 months ago and no comments,
> V5 was sent out near 1 month with only a minor rebase conflict.
>
> Thanks,
> Peng.
Thanks,
Peng.
>
> > Subject: [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP
> >
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > V5:
> > The patchset could not apply on latest remoteproc for-next branch,
> > so rebased. Only patch 6 has a minor conflict, other patches are not
> changed.
> >
> > V4:
> > https://lore.kernel.org/all/20220701104725.557314-1-
> > peng.fan@oss.nxp.com/
> > Add R-b from DT maintainer
> > Fix probe failure and driver remove path in patch 3, 4 Add comments
> > about i.MX8QM entries filter in patch 5
> >
> > V3:
> > Drop the dependency in V2.
> > Tested on i.MX8QM/8MM
> > Use 'fsl,resource-id' and 'fsl,entry-address' Per dt maintainer Drop 'reg'
> > property Per remoteproc maintainer Drop mcore self recovery, until we
> > land in common framework support.
> > https://patchwork.kernel.org/project/linux-
> > remoteproc/cover/20220517064937.4033441-1-peng.fan@oss.nxp.com/
> >
> > V2:
> > https://patchwork.kernel.org/project/linux-
> > remoteproc/cover/20220309102118.8131-1-peng.fan@oss.nxp.com/
> > Depends on https://patchwork.kernel.org/project/linux-
> > remoteproc/list/?series=621311
> > Tested on i.MX8QXP/QM/8MP
> > Addressed Mathieu's comments
> > Drop V1 patch 5/9, patch 3/9 is replaced with upper dependency
> > patchset Move V1 patch 4/9 out to
> > https://patchwork.kernel.org/project/linux-
> > remoteproc/patch/20220308065754.3355-1-peng.fan@oss.nxp.com/
> > Update commit log
> > Drop magic number to get entry address from device tree in patch 4/6
> >
> > The V1 patchset:
> > https://patchwork.kernel.org/project/linux-
> > remoteproc/patch/20220111033333.403448-4-peng.fan@oss.nxp.com/
> >
> > Peng Fan (6):
> > dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
> > dt-bindings: remoteproc: imx_rproc: support i.MX8QM
> > remoteproc: imx_rproc: support attaching to i.MX8QXP M4
> > remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
> > remoteproc: imx_rproc: support i.MX8QM
> > remoteproc: imx_rproc: request mbox channel later
> >
> > .../bindings/remoteproc/fsl,imx-rproc.yaml | 16 ++
> > drivers/remoteproc/imx_rproc.c | 261 +++++++++++++++++-
> > 2 files changed, 270 insertions(+), 7 deletions(-)
> >
> > --
> > 2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-08-24 1:10 ` Peng Fan (OSS)
@ 2022-09-26 23:21 ` Mathieu Poirier
-1 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-26 23:21 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: bjorn.andersson, robh+dt, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, linux-imx, linux-remoteproc,
devicetree, linux-arm-kernel, linux-kernel, Peng Fan
On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> When M4 is kicked by SCFW, M4 runs in its own hardware partition, Linux
> could only do IPC with M4, it could not start, stop, update image.
>
> We disable recovery reboot when M4 is managed by SCFW, because
> remoteproc core still not support M4 auto-recovery without loading
> image.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> drivers/remoteproc/imx_rproc.c | 108 ++++++++++++++++++++++++++++++++-
> 1 file changed, 107 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index 7cc4fd207e2d..bcba74e90020 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -6,6 +6,7 @@
> #include <linux/arm-smccc.h>
> #include <linux/clk.h>
> #include <linux/err.h>
> +#include <linux/firmware/imx/sci.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> #include <linux/mailbox_client.h>
> @@ -59,6 +60,8 @@
> #define IMX_SIP_RPROC_STARTED 0x01
> #define IMX_SIP_RPROC_STOP 0x02
>
> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> +
> /**
> * struct imx_rproc_mem - slim internal memory structure
> * @cpu_addr: MPU virtual address of the memory region
> @@ -89,6 +92,10 @@ struct imx_rproc {
> struct work_struct rproc_work;
> struct workqueue_struct *workqueue;
> void __iomem *rsc_table;
> + struct imx_sc_ipc *ipc_handle;
> + struct notifier_block rproc_nb;
> + u32 rproc_pt; /* partition id */
> + u32 rsrc_id; /* resource id */
> };
>
> static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> @@ -117,6 +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> { 0xD0000000, 0xa0000000, 0x10000000, 0 },
> };
>
> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
> + { 0x08000000, 0x08000000, 0x10000000, 0 },
> + /* TCML/U */
> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
> + /* OCRAM(Low 96KB) */
> + { 0x21000000, 0x00100000, 0x00018000, 0 },
> + /* OCRAM */
> + { 0x21100000, 0x00100000, 0x00040000, 0 },
> + /* DDR (Data) */
> + { 0x80000000, 0x80000000, 0x60000000, 0 },
> +};
> +
> static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
> /* dev addr , sys addr , size , flags */
> /* ITCM */
> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
> .method = IMX_RPROC_MMIO,
> };
>
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> + .att = imx_rproc_att_imx8qxp,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> + .method = IMX_RPROC_SCU_API,
> +};
> +
> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> .att = imx_rproc_att_imx8ulp,
> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc *rproc)
> mbox_free_channel(priv->rx_ch);
> }
>
> +static void imx_rproc_put_scu(struct rproc *rproc)
> +{
> + struct imx_rproc *priv = rproc->priv;
> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> +
> + if (dcfg->method != IMX_RPROC_SCU_API)
> + return;
> +
> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> + return;
> +
> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), false);
> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> +}
> +
> +static int imx_rproc_partition_notify(struct notifier_block *nb,
> + unsigned long event, void *group)
> +{
> + struct imx_rproc *priv = container_of(nb, struct imx_rproc, rproc_nb);
> +
> + /* Ignore other irqs */
> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED)))
> + return 0;
> +
> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> +
> + pr_info("Partition%d reset!\n", priv->rproc_pt);
> +
> + return 0;
> +}
> +
> static int imx_rproc_detect_mode(struct imx_rproc *priv)
> {
> struct regmap_config config = { .name = "imx-rproc" };
> @@ -689,6 +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> struct arm_smccc_res res;
> int ret;
> u32 val;
> + u8 pt;
>
> switch (dcfg->method) {
> case IMX_RPROC_NONE:
> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> if (res.a0)
> priv->rproc->state = RPROC_DETACHED;
> return 0;
> + case IMX_RPROC_SCU_API:
> + ret = imx_scu_get_handle(&priv->ipc_handle);
> + if (ret)
> + return ret;
> + ret = of_property_read_u32(dev->of_node, "fsl,resource-id", &priv->rsrc_id);
> + if (ret) {
> + dev_err(dev, "No fsl,resource-id property\n");
> + return ret;
> + }
> +
> + /*
> + * If Mcore resource is not owned by Acore partition, It is kicked by ROM,
> + * and Linux could only do IPC with Mcore and nothing else.
> + */
> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> + return 0;
If imx_sc_rm_is_resource_owned() return '1' than the remote processor is under
Linux's control and what follows below is not needed. That is also coherent
with the comment in [1].
That is in contrast with what is happening in imx_rproc_put_scu(). There, if
the remote processor is _not_ owned by Linux than the condition returns without
calling imx_scu_irq_group_enable() and imx_scu_irq_unregister_notifier(). That
seems to be a bug.
There is also a problem in patch 4/6 associated to that.
Thanks,
Mathieu
[1]. https://elixir.bootlin.com/linux/v6.0-rc7/source/drivers/firmware/imx/rm.c#L24
> +
> + priv->rproc->state = RPROC_DETACHED;
> + priv->rproc->recovery_disabled = true;
> +
> + /* Get partition id and enable irq in SCFW */
> + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc_id, &pt);
> + if (ret) {
> + dev_err(dev, "not able to get resource owner\n");
> + return ret;
> + }
> +
> + priv->rproc_pt = pt;
> + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
> +
> + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
> + if (ret) {
> + dev_warn(dev, "register scu notifier failed.\n");
> + return ret;
> + }
> +
> + ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt),
> + true);
> + if (ret) {
> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> + dev_warn(dev, "Enable irq failed.\n");
> + return ret;
> + }
> +
> + return 0;
> default:
> break;
> }
> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device *pdev)
>
> ret = imx_rproc_clk_enable(priv);
> if (ret)
> - goto err_put_mbox;
> + goto err_put_scu;
>
> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>
> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device *pdev)
>
> err_put_clk:
> clk_disable_unprepare(priv->clk);
> +err_put_scu:
> + imx_rproc_put_scu(rproc);
> err_put_mbox:
> imx_rproc_free_mbox(rproc);
> err_put_wkq:
> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct platform_device *pdev)
>
> clk_disable_unprepare(priv->clk);
> rproc_del(rproc);
> + imx_rproc_put_scu(rproc);
> imx_rproc_free_mbox(rproc);
> destroy_workqueue(priv->workqueue);
> rproc_free(rproc);
> @@ -852,6 +957,7 @@ static const struct of_device_id imx_rproc_of_match[] = {
> { .compatible = "fsl,imx8mm-cm4", .data = &imx_rproc_cfg_imx8mq },
> { .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn },
> { .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn },
> + { .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp },
> { .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp },
> { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
> {},
> --
> 2.37.1
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-26 23:21 ` Mathieu Poirier
0 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-26 23:21 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: bjorn.andersson, robh+dt, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, linux-imx, linux-remoteproc,
devicetree, linux-arm-kernel, linux-kernel, Peng Fan
On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> When M4 is kicked by SCFW, M4 runs in its own hardware partition, Linux
> could only do IPC with M4, it could not start, stop, update image.
>
> We disable recovery reboot when M4 is managed by SCFW, because
> remoteproc core still not support M4 auto-recovery without loading
> image.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> drivers/remoteproc/imx_rproc.c | 108 ++++++++++++++++++++++++++++++++-
> 1 file changed, 107 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index 7cc4fd207e2d..bcba74e90020 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -6,6 +6,7 @@
> #include <linux/arm-smccc.h>
> #include <linux/clk.h>
> #include <linux/err.h>
> +#include <linux/firmware/imx/sci.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> #include <linux/mailbox_client.h>
> @@ -59,6 +60,8 @@
> #define IMX_SIP_RPROC_STARTED 0x01
> #define IMX_SIP_RPROC_STOP 0x02
>
> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> +
> /**
> * struct imx_rproc_mem - slim internal memory structure
> * @cpu_addr: MPU virtual address of the memory region
> @@ -89,6 +92,10 @@ struct imx_rproc {
> struct work_struct rproc_work;
> struct workqueue_struct *workqueue;
> void __iomem *rsc_table;
> + struct imx_sc_ipc *ipc_handle;
> + struct notifier_block rproc_nb;
> + u32 rproc_pt; /* partition id */
> + u32 rsrc_id; /* resource id */
> };
>
> static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> @@ -117,6 +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> { 0xD0000000, 0xa0000000, 0x10000000, 0 },
> };
>
> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
> + { 0x08000000, 0x08000000, 0x10000000, 0 },
> + /* TCML/U */
> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
> + /* OCRAM(Low 96KB) */
> + { 0x21000000, 0x00100000, 0x00018000, 0 },
> + /* OCRAM */
> + { 0x21100000, 0x00100000, 0x00040000, 0 },
> + /* DDR (Data) */
> + { 0x80000000, 0x80000000, 0x60000000, 0 },
> +};
> +
> static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
> /* dev addr , sys addr , size , flags */
> /* ITCM */
> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
> .method = IMX_RPROC_MMIO,
> };
>
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> + .att = imx_rproc_att_imx8qxp,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> + .method = IMX_RPROC_SCU_API,
> +};
> +
> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> .att = imx_rproc_att_imx8ulp,
> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc *rproc)
> mbox_free_channel(priv->rx_ch);
> }
>
> +static void imx_rproc_put_scu(struct rproc *rproc)
> +{
> + struct imx_rproc *priv = rproc->priv;
> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> +
> + if (dcfg->method != IMX_RPROC_SCU_API)
> + return;
> +
> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> + return;
> +
> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), false);
> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> +}
> +
> +static int imx_rproc_partition_notify(struct notifier_block *nb,
> + unsigned long event, void *group)
> +{
> + struct imx_rproc *priv = container_of(nb, struct imx_rproc, rproc_nb);
> +
> + /* Ignore other irqs */
> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED)))
> + return 0;
> +
> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> +
> + pr_info("Partition%d reset!\n", priv->rproc_pt);
> +
> + return 0;
> +}
> +
> static int imx_rproc_detect_mode(struct imx_rproc *priv)
> {
> struct regmap_config config = { .name = "imx-rproc" };
> @@ -689,6 +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> struct arm_smccc_res res;
> int ret;
> u32 val;
> + u8 pt;
>
> switch (dcfg->method) {
> case IMX_RPROC_NONE:
> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> if (res.a0)
> priv->rproc->state = RPROC_DETACHED;
> return 0;
> + case IMX_RPROC_SCU_API:
> + ret = imx_scu_get_handle(&priv->ipc_handle);
> + if (ret)
> + return ret;
> + ret = of_property_read_u32(dev->of_node, "fsl,resource-id", &priv->rsrc_id);
> + if (ret) {
> + dev_err(dev, "No fsl,resource-id property\n");
> + return ret;
> + }
> +
> + /*
> + * If Mcore resource is not owned by Acore partition, It is kicked by ROM,
> + * and Linux could only do IPC with Mcore and nothing else.
> + */
> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> + return 0;
If imx_sc_rm_is_resource_owned() return '1' than the remote processor is under
Linux's control and what follows below is not needed. That is also coherent
with the comment in [1].
That is in contrast with what is happening in imx_rproc_put_scu(). There, if
the remote processor is _not_ owned by Linux than the condition returns without
calling imx_scu_irq_group_enable() and imx_scu_irq_unregister_notifier(). That
seems to be a bug.
There is also a problem in patch 4/6 associated to that.
Thanks,
Mathieu
[1]. https://elixir.bootlin.com/linux/v6.0-rc7/source/drivers/firmware/imx/rm.c#L24
> +
> + priv->rproc->state = RPROC_DETACHED;
> + priv->rproc->recovery_disabled = true;
> +
> + /* Get partition id and enable irq in SCFW */
> + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc_id, &pt);
> + if (ret) {
> + dev_err(dev, "not able to get resource owner\n");
> + return ret;
> + }
> +
> + priv->rproc_pt = pt;
> + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
> +
> + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
> + if (ret) {
> + dev_warn(dev, "register scu notifier failed.\n");
> + return ret;
> + }
> +
> + ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt),
> + true);
> + if (ret) {
> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> + dev_warn(dev, "Enable irq failed.\n");
> + return ret;
> + }
> +
> + return 0;
> default:
> break;
> }
> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device *pdev)
>
> ret = imx_rproc_clk_enable(priv);
> if (ret)
> - goto err_put_mbox;
> + goto err_put_scu;
>
> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>
> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device *pdev)
>
> err_put_clk:
> clk_disable_unprepare(priv->clk);
> +err_put_scu:
> + imx_rproc_put_scu(rproc);
> err_put_mbox:
> imx_rproc_free_mbox(rproc);
> err_put_wkq:
> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct platform_device *pdev)
>
> clk_disable_unprepare(priv->clk);
> rproc_del(rproc);
> + imx_rproc_put_scu(rproc);
> imx_rproc_free_mbox(rproc);
> destroy_workqueue(priv->workqueue);
> rproc_free(rproc);
> @@ -852,6 +957,7 @@ static const struct of_device_id imx_rproc_of_match[] = {
> { .compatible = "fsl,imx8mm-cm4", .data = &imx_rproc_cfg_imx8mq },
> { .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn },
> { .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn },
> + { .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp },
> { .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp },
> { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
> {},
> --
> 2.37.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-26 23:21 ` Mathieu Poirier
@ 2022-09-27 2:48 ` Peng Fan
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-27 2:48 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan (OSS)
Cc: bjorn.andersson, robh+dt, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, dl-linux-imx, linux-remoteproc,
devicetree, linux-arm-kernel, linux-kernel
Hi Mathieu,
Thanks for reviewing this patchset.
> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> i.MX8QXP M4
>
> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > When M4 is kicked by SCFW, M4 runs in its own hardware partition,
> > Linux could only do IPC with M4, it could not start, stop, update image.
> >
> > We disable recovery reboot when M4 is managed by SCFW, because
> > remoteproc core still not support M4 auto-recovery without loading
> > image.
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> > drivers/remoteproc/imx_rproc.c | 108
> > ++++++++++++++++++++++++++++++++-
> > 1 file changed, 107 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/remoteproc/imx_rproc.c
> > b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
> > 100644
> > --- a/drivers/remoteproc/imx_rproc.c
> > +++ b/drivers/remoteproc/imx_rproc.c
> > @@ -6,6 +6,7 @@
> > #include <linux/arm-smccc.h>
> > #include <linux/clk.h>
> > #include <linux/err.h>
> > +#include <linux/firmware/imx/sci.h>
> > #include <linux/interrupt.h>
> > #include <linux/kernel.h>
> > #include <linux/mailbox_client.h>
> > @@ -59,6 +60,8 @@
> > #define IMX_SIP_RPROC_STARTED 0x01
> > #define IMX_SIP_RPROC_STOP 0x02
> >
> > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > +
> > /**
> > * struct imx_rproc_mem - slim internal memory structure
> > * @cpu_addr: MPU virtual address of the memory region @@ -89,6
> > +92,10 @@ struct imx_rproc {
> > struct work_struct rproc_work;
> > struct workqueue_struct *workqueue;
> > void __iomem *rsc_table;
> > + struct imx_sc_ipc *ipc_handle;
> > + struct notifier_block rproc_nb;
> > + u32 rproc_pt; /* partition id */
> > + u32 rsrc_id; /* resource id */
> > };
> >
> > static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -117,6
> > +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> >
> > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
> > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > + /* TCML/U */
> > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
> > + /* OCRAM(Low 96KB) */
> > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > + /* OCRAM */
> > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > + /* DDR (Data) */
> > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > +
> > static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
> > /* dev addr , sys addr , size , flags */
> > /* ITCM */
> > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> imx_rproc_cfg_imx8mq = {
> > .method = IMX_RPROC_MMIO,
> > };
> >
> > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> > + .att = imx_rproc_att_imx8qxp,
> > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > + .method = IMX_RPROC_SCU_API,
> > +};
> > +
> > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> > .att = imx_rproc_att_imx8ulp,
> > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
> *rproc)
> > mbox_free_channel(priv->rx_ch);
> > }
> >
> > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > + struct imx_rproc *priv = rproc->priv;
> > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > +
> > + if (dcfg->method != IMX_RPROC_SCU_API)
> > + return;
> > +
> > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> > + return;
> > +
> > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> BIT(priv->rproc_pt), false);
> > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > +}
> > +
> > +static int imx_rproc_partition_notify(struct notifier_block *nb,
> > + unsigned long event, void *group) {
> > + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
> > +rproc_nb);
> > +
> > + /* Ignore other irqs */
> > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> IMX_SC_IRQ_GROUP_REBOOTED)))
> > + return 0;
> > +
> > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > +
> > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > +
> > + return 0;
> > +}
> > +
> > static int imx_rproc_detect_mode(struct imx_rproc *priv) {
> > struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
> > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > struct arm_smccc_res res;
> > int ret;
> > u32 val;
> > + u8 pt;
> >
> > switch (dcfg->method) {
> > case IMX_RPROC_NONE:
> > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> imx_rproc *priv)
> > if (res.a0)
> > priv->rproc->state = RPROC_DETACHED;
> > return 0;
> > + case IMX_RPROC_SCU_API:
> > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > + if (ret)
> > + return ret;
> > + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
> &priv->rsrc_id);
> > + if (ret) {
> > + dev_err(dev, "No fsl,resource-id property\n");
> > + return ret;
> > + }
> > +
> > + /*
> > + * If Mcore resource is not owned by Acore partition, It is
> kicked by ROM,
> > + * and Linux could only do IPC with Mcore and nothing else.
> > + */
> > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
> >rsrc_id))
> > + return 0;
>
> If imx_sc_rm_is_resource_owned() return '1' than the remote processor is
> under Linux's control and what follows below is not needed. That is also
> coherent with the comment in [1].
Case 1: If M4 is owned by Linux, here directly return 0.
Case 2: If M4 is not owned by Linux, the following code after this line will set
state as RPROC_DETACHED.
Patch 3/6(this patch) is only to support case 2.
Patch 4/6 is to support case 1.
>
> That is in contrast with what is happening in imx_rproc_put_scu(). There, if
> the remote processor is _not_ owned by Linux than the condition returns
> without calling imx_scu_irq_group_enable() and
> imx_scu_irq_unregister_notifier(). That seems to be a bug.
No. The two functions only needed when M4 is in a separate hardware partition.
The scu irq is only needed when M4 is out of linux control and need some
notification such as M4 is reset by SCU(System Control Unit). That linux got
notification that M4 is reset by SCU.
>
> There is also a problem in patch 4/6 associated to that.
If the upper explanation eliminate your concern, "a problem in patch 4/6" should
not be a problem.
When M4 is owned by Linux, Linux need handle the power domain. If M4 is not owned
by Linux, SCU firmware will handle the power domain, and Linux has no permission to
touch that.
Thanks
Peng
>
> Thanks,
> Mathieu
>
>
> [1].
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
> .bootlin.com%2Flinux%2Fv6.0-
> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> =0
>
> > +
> > + priv->rproc->state = RPROC_DETACHED;
> > + priv->rproc->recovery_disabled = true;
> > +
> > + /* Get partition id and enable irq in SCFW */
> > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
> priv->rsrc_id, &pt);
> > + if (ret) {
> > + dev_err(dev, "not able to get resource owner\n");
> > + return ret;
> > + }
> > +
> > + priv->rproc_pt = pt;
> > + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
> > +
> > + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
> > + if (ret) {
> > + dev_warn(dev, "register scu notifier failed.\n");
> > + return ret;
> > + }
> > +
> > + ret =
> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
> >rproc_pt),
> > + true);
> > + if (ret) {
> > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > + dev_warn(dev, "Enable irq failed.\n");
> > + return ret;
> > + }
> > +
> > + return 0;
> > default:
> > break;
> > }
> > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
> > *pdev)
> >
> > ret = imx_rproc_clk_enable(priv);
> > if (ret)
> > - goto err_put_mbox;
> > + goto err_put_scu;
> >
> > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> >
> > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
> > *pdev)
> >
> > err_put_clk:
> > clk_disable_unprepare(priv->clk);
> > +err_put_scu:
> > + imx_rproc_put_scu(rproc);
> > err_put_mbox:
> > imx_rproc_free_mbox(rproc);
> > err_put_wkq:
> > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> platform_device
> > *pdev)
> >
> > clk_disable_unprepare(priv->clk);
> > rproc_del(rproc);
> > + imx_rproc_put_scu(rproc);
> > imx_rproc_free_mbox(rproc);
> > destroy_workqueue(priv->workqueue);
> > rproc_free(rproc);
> > @@ -852,6 +957,7 @@ static const struct of_device_id
> imx_rproc_of_match[] = {
> > { .compatible = "fsl,imx8mm-cm4", .data =
> &imx_rproc_cfg_imx8mq },
> > { .compatible = "fsl,imx8mn-cm7", .data =
> &imx_rproc_cfg_imx8mn },
> > { .compatible = "fsl,imx8mp-cm7", .data =
> &imx_rproc_cfg_imx8mn },
> > + { .compatible = "fsl,imx8qxp-cm4", .data =
> &imx_rproc_cfg_imx8qxp },
> > { .compatible = "fsl,imx8ulp-cm33", .data =
> &imx_rproc_cfg_imx8ulp },
> > { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
> > {},
> > --
> > 2.37.1
> >
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-27 2:48 ` Peng Fan
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-27 2:48 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan (OSS)
Cc: bjorn.andersson, robh+dt, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, dl-linux-imx, linux-remoteproc,
devicetree, linux-arm-kernel, linux-kernel
Hi Mathieu,
Thanks for reviewing this patchset.
> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> i.MX8QXP M4
>
> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > When M4 is kicked by SCFW, M4 runs in its own hardware partition,
> > Linux could only do IPC with M4, it could not start, stop, update image.
> >
> > We disable recovery reboot when M4 is managed by SCFW, because
> > remoteproc core still not support M4 auto-recovery without loading
> > image.
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> > drivers/remoteproc/imx_rproc.c | 108
> > ++++++++++++++++++++++++++++++++-
> > 1 file changed, 107 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/remoteproc/imx_rproc.c
> > b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
> > 100644
> > --- a/drivers/remoteproc/imx_rproc.c
> > +++ b/drivers/remoteproc/imx_rproc.c
> > @@ -6,6 +6,7 @@
> > #include <linux/arm-smccc.h>
> > #include <linux/clk.h>
> > #include <linux/err.h>
> > +#include <linux/firmware/imx/sci.h>
> > #include <linux/interrupt.h>
> > #include <linux/kernel.h>
> > #include <linux/mailbox_client.h>
> > @@ -59,6 +60,8 @@
> > #define IMX_SIP_RPROC_STARTED 0x01
> > #define IMX_SIP_RPROC_STOP 0x02
> >
> > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > +
> > /**
> > * struct imx_rproc_mem - slim internal memory structure
> > * @cpu_addr: MPU virtual address of the memory region @@ -89,6
> > +92,10 @@ struct imx_rproc {
> > struct work_struct rproc_work;
> > struct workqueue_struct *workqueue;
> > void __iomem *rsc_table;
> > + struct imx_sc_ipc *ipc_handle;
> > + struct notifier_block rproc_nb;
> > + u32 rproc_pt; /* partition id */
> > + u32 rsrc_id; /* resource id */
> > };
> >
> > static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -117,6
> > +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> >
> > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
> > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > + /* TCML/U */
> > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
> > + /* OCRAM(Low 96KB) */
> > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > + /* OCRAM */
> > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > + /* DDR (Data) */
> > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > +
> > static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
> > /* dev addr , sys addr , size , flags */
> > /* ITCM */
> > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> imx_rproc_cfg_imx8mq = {
> > .method = IMX_RPROC_MMIO,
> > };
> >
> > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> > + .att = imx_rproc_att_imx8qxp,
> > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > + .method = IMX_RPROC_SCU_API,
> > +};
> > +
> > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> > .att = imx_rproc_att_imx8ulp,
> > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
> *rproc)
> > mbox_free_channel(priv->rx_ch);
> > }
> >
> > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > + struct imx_rproc *priv = rproc->priv;
> > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > +
> > + if (dcfg->method != IMX_RPROC_SCU_API)
> > + return;
> > +
> > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> > + return;
> > +
> > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> BIT(priv->rproc_pt), false);
> > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > +}
> > +
> > +static int imx_rproc_partition_notify(struct notifier_block *nb,
> > + unsigned long event, void *group) {
> > + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
> > +rproc_nb);
> > +
> > + /* Ignore other irqs */
> > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> IMX_SC_IRQ_GROUP_REBOOTED)))
> > + return 0;
> > +
> > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > +
> > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > +
> > + return 0;
> > +}
> > +
> > static int imx_rproc_detect_mode(struct imx_rproc *priv) {
> > struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
> > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > struct arm_smccc_res res;
> > int ret;
> > u32 val;
> > + u8 pt;
> >
> > switch (dcfg->method) {
> > case IMX_RPROC_NONE:
> > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> imx_rproc *priv)
> > if (res.a0)
> > priv->rproc->state = RPROC_DETACHED;
> > return 0;
> > + case IMX_RPROC_SCU_API:
> > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > + if (ret)
> > + return ret;
> > + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
> &priv->rsrc_id);
> > + if (ret) {
> > + dev_err(dev, "No fsl,resource-id property\n");
> > + return ret;
> > + }
> > +
> > + /*
> > + * If Mcore resource is not owned by Acore partition, It is
> kicked by ROM,
> > + * and Linux could only do IPC with Mcore and nothing else.
> > + */
> > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
> >rsrc_id))
> > + return 0;
>
> If imx_sc_rm_is_resource_owned() return '1' than the remote processor is
> under Linux's control and what follows below is not needed. That is also
> coherent with the comment in [1].
Case 1: If M4 is owned by Linux, here directly return 0.
Case 2: If M4 is not owned by Linux, the following code after this line will set
state as RPROC_DETACHED.
Patch 3/6(this patch) is only to support case 2.
Patch 4/6 is to support case 1.
>
> That is in contrast with what is happening in imx_rproc_put_scu(). There, if
> the remote processor is _not_ owned by Linux than the condition returns
> without calling imx_scu_irq_group_enable() and
> imx_scu_irq_unregister_notifier(). That seems to be a bug.
No. The two functions only needed when M4 is in a separate hardware partition.
The scu irq is only needed when M4 is out of linux control and need some
notification such as M4 is reset by SCU(System Control Unit). That linux got
notification that M4 is reset by SCU.
>
> There is also a problem in patch 4/6 associated to that.
If the upper explanation eliminate your concern, "a problem in patch 4/6" should
not be a problem.
When M4 is owned by Linux, Linux need handle the power domain. If M4 is not owned
by Linux, SCU firmware will handle the power domain, and Linux has no permission to
touch that.
Thanks
Peng
>
> Thanks,
> Mathieu
>
>
> [1].
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
> .bootlin.com%2Flinux%2Fv6.0-
> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> =0
>
> > +
> > + priv->rproc->state = RPROC_DETACHED;
> > + priv->rproc->recovery_disabled = true;
> > +
> > + /* Get partition id and enable irq in SCFW */
> > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
> priv->rsrc_id, &pt);
> > + if (ret) {
> > + dev_err(dev, "not able to get resource owner\n");
> > + return ret;
> > + }
> > +
> > + priv->rproc_pt = pt;
> > + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
> > +
> > + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
> > + if (ret) {
> > + dev_warn(dev, "register scu notifier failed.\n");
> > + return ret;
> > + }
> > +
> > + ret =
> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
> >rproc_pt),
> > + true);
> > + if (ret) {
> > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > + dev_warn(dev, "Enable irq failed.\n");
> > + return ret;
> > + }
> > +
> > + return 0;
> > default:
> > break;
> > }
> > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
> > *pdev)
> >
> > ret = imx_rproc_clk_enable(priv);
> > if (ret)
> > - goto err_put_mbox;
> > + goto err_put_scu;
> >
> > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> >
> > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
> > *pdev)
> >
> > err_put_clk:
> > clk_disable_unprepare(priv->clk);
> > +err_put_scu:
> > + imx_rproc_put_scu(rproc);
> > err_put_mbox:
> > imx_rproc_free_mbox(rproc);
> > err_put_wkq:
> > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> platform_device
> > *pdev)
> >
> > clk_disable_unprepare(priv->clk);
> > rproc_del(rproc);
> > + imx_rproc_put_scu(rproc);
> > imx_rproc_free_mbox(rproc);
> > destroy_workqueue(priv->workqueue);
> > rproc_free(rproc);
> > @@ -852,6 +957,7 @@ static const struct of_device_id
> imx_rproc_of_match[] = {
> > { .compatible = "fsl,imx8mm-cm4", .data =
> &imx_rproc_cfg_imx8mq },
> > { .compatible = "fsl,imx8mn-cm7", .data =
> &imx_rproc_cfg_imx8mn },
> > { .compatible = "fsl,imx8mp-cm7", .data =
> &imx_rproc_cfg_imx8mn },
> > + { .compatible = "fsl,imx8qxp-cm4", .data =
> &imx_rproc_cfg_imx8qxp },
> > { .compatible = "fsl,imx8ulp-cm33", .data =
> &imx_rproc_cfg_imx8ulp },
> > { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
> > {},
> > --
> > 2.37.1
> >
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-27 2:48 ` Peng Fan
@ 2022-09-27 17:56 ` Mathieu Poirier
-1 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-27 17:56 UTC (permalink / raw)
To: Peng Fan
Cc: Peng Fan (OSS),
bjorn.andersson, robh+dt, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, dl-linux-imx, linux-remoteproc,
devicetree, linux-arm-kernel, linux-kernel
On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> Hi Mathieu,
>
> Thanks for reviewing this patchset.
> > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> > i.MX8QXP M4
> >
> > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > From: Peng Fan <peng.fan@nxp.com>
> > >
> > > When M4 is kicked by SCFW, M4 runs in its own hardware partition,
> > > Linux could only do IPC with M4, it could not start, stop, update image.
> > >
> > > We disable recovery reboot when M4 is managed by SCFW, because
> > > remoteproc core still not support M4 auto-recovery without loading
> > > image.
> > >
> > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > ---
> > > drivers/remoteproc/imx_rproc.c | 108
> > > ++++++++++++++++++++++++++++++++-
> > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
> > > 100644
> > > --- a/drivers/remoteproc/imx_rproc.c
> > > +++ b/drivers/remoteproc/imx_rproc.c
> > > @@ -6,6 +6,7 @@
> > > #include <linux/arm-smccc.h>
> > > #include <linux/clk.h>
> > > #include <linux/err.h>
> > > +#include <linux/firmware/imx/sci.h>
> > > #include <linux/interrupt.h>
> > > #include <linux/kernel.h>
> > > #include <linux/mailbox_client.h>
> > > @@ -59,6 +60,8 @@
> > > #define IMX_SIP_RPROC_STARTED 0x01
> > > #define IMX_SIP_RPROC_STOP 0x02
> > >
> > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > +
> > > /**
> > > * struct imx_rproc_mem - slim internal memory structure
> > > * @cpu_addr: MPU virtual address of the memory region @@ -89,6
> > > +92,10 @@ struct imx_rproc {
> > > struct work_struct rproc_work;
> > > struct workqueue_struct *workqueue;
> > > void __iomem *rsc_table;
> > > + struct imx_sc_ipc *ipc_handle;
> > > + struct notifier_block rproc_nb;
> > > + u32 rproc_pt; /* partition id */
> > > + u32 rsrc_id; /* resource id */
> > > };
> > >
> > > static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -117,6
> > > +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > >
> > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
> > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > + /* TCML/U */
> > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
> > > + /* OCRAM(Low 96KB) */
> > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > + /* OCRAM */
> > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > + /* DDR (Data) */
> > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > +
> > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
> > > /* dev addr , sys addr , size , flags */
> > > /* ITCM */
> > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > imx_rproc_cfg_imx8mq = {
> > > .method = IMX_RPROC_MMIO,
> > > };
> > >
> > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> > > + .att = imx_rproc_att_imx8qxp,
> > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > + .method = IMX_RPROC_SCU_API,
> > > +};
> > > +
> > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> > > .att = imx_rproc_att_imx8ulp,
> > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
> > *rproc)
> > > mbox_free_channel(priv->rx_ch);
> > > }
> > >
> > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > + struct imx_rproc *priv = rproc->priv;
> > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > +
> > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > + return;
> > > +
> > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> > > + return;
> > > +
> > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > BIT(priv->rproc_pt), false);
> > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > +}
> > > +
> > > +static int imx_rproc_partition_notify(struct notifier_block *nb,
> > > + unsigned long event, void *group) {
> > > + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
> > > +rproc_nb);
> > > +
> > > + /* Ignore other irqs */
> > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > + return 0;
> > > +
> > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > +
> > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > static int imx_rproc_detect_mode(struct imx_rproc *priv) {
> > > struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
> > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > struct arm_smccc_res res;
> > > int ret;
> > > u32 val;
> > > + u8 pt;
> > >
> > > switch (dcfg->method) {
> > > case IMX_RPROC_NONE:
> > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > imx_rproc *priv)
> > > if (res.a0)
> > > priv->rproc->state = RPROC_DETACHED;
> > > return 0;
> > > + case IMX_RPROC_SCU_API:
> > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > + if (ret)
> > > + return ret;
> > > + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
> > &priv->rsrc_id);
> > > + if (ret) {
> > > + dev_err(dev, "No fsl,resource-id property\n");
> > > + return ret;
> > > + }
> > > +
> > > + /*
> > > + * If Mcore resource is not owned by Acore partition, It is
> > kicked by ROM,
> > > + * and Linux could only do IPC with Mcore and nothing else.
> > > + */
> > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
> > >rsrc_id))
> > > + return 0;
> >
> > If imx_sc_rm_is_resource_owned() return '1' than the remote processor is
> > under Linux's control and what follows below is not needed. That is also
> > coherent with the comment in [1].
>
> Case 1: If M4 is owned by Linux, here directly return 0.
> Case 2: If M4 is not owned by Linux, the following code after this line will set
> state as RPROC_DETACHED.
I understand that part.
>
> Patch 3/6(this patch) is only to support case 2.
> Patch 4/6 is to support case 1.
>
Let's leave the subsequent patches alone for now.
> >
> > That is in contrast with what is happening in imx_rproc_put_scu(). There, if
> > the remote processor is _not_ owned by Linux than the condition returns
> > without calling imx_scu_irq_group_enable() and
> > imx_scu_irq_unregister_notifier(). That seems to be a bug.
>
> No. The two functions only needed when M4 is in a separate hardware partition.
>
> The scu irq is only needed when M4 is out of linux control and need some
> notification such as M4 is reset by SCU(System Control Unit). That linux got
> notification that M4 is reset by SCU.
I also understand that part.
What I am underlining here is that when the M4 is independent, function
imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are called but
their cleanup equivalent are not called in imx_rproc_put_scu() because of the '!'
in the if() statement.
>
> >
> > There is also a problem in patch 4/6 associated to that.
>
> If the upper explanation eliminate your concern, "a problem in patch 4/6" should
> not be a problem.
>
> When M4 is owned by Linux, Linux need handle the power domain. If M4 is not owned
> by Linux, SCU firmware will handle the power domain, and Linux has no permission to
> touch that.
>
> Thanks
> Peng
>
> >
> > Thanks,
> > Mathieu
> >
> >
> > [1].
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
> > .bootlin.com%2Flinux%2Fv6.0-
> > rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
> > 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > =0
> >
> > > +
> > > + priv->rproc->state = RPROC_DETACHED;
> > > + priv->rproc->recovery_disabled = true;
> > > +
> > > + /* Get partition id and enable irq in SCFW */
> > > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > priv->rsrc_id, &pt);
> > > + if (ret) {
> > > + dev_err(dev, "not able to get resource owner\n");
> > > + return ret;
> > > + }
> > > +
> > > + priv->rproc_pt = pt;
> > > + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
> > > +
> > > + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > + if (ret) {
> > > + dev_warn(dev, "register scu notifier failed.\n");
> > > + return ret;
> > > + }
> > > +
> > > + ret =
> > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
> > >rproc_pt),
> > > + true);
> > > + if (ret) {
> > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > + dev_warn(dev, "Enable irq failed.\n");
> > > + return ret;
> > > + }
> > > +
> > > + return 0;
> > > default:
> > > break;
> > > }
> > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
> > > *pdev)
> > >
> > > ret = imx_rproc_clk_enable(priv);
> > > if (ret)
> > > - goto err_put_mbox;
> > > + goto err_put_scu;
> > >
> > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > >
> > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
> > > *pdev)
> > >
> > > err_put_clk:
> > > clk_disable_unprepare(priv->clk);
> > > +err_put_scu:
> > > + imx_rproc_put_scu(rproc);
> > > err_put_mbox:
> > > imx_rproc_free_mbox(rproc);
> > > err_put_wkq:
> > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > platform_device
> > > *pdev)
> > >
> > > clk_disable_unprepare(priv->clk);
> > > rproc_del(rproc);
> > > + imx_rproc_put_scu(rproc);
> > > imx_rproc_free_mbox(rproc);
> > > destroy_workqueue(priv->workqueue);
> > > rproc_free(rproc);
> > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > imx_rproc_of_match[] = {
> > > { .compatible = "fsl,imx8mm-cm4", .data =
> > &imx_rproc_cfg_imx8mq },
> > > { .compatible = "fsl,imx8mn-cm7", .data =
> > &imx_rproc_cfg_imx8mn },
> > > { .compatible = "fsl,imx8mp-cm7", .data =
> > &imx_rproc_cfg_imx8mn },
> > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > &imx_rproc_cfg_imx8qxp },
> > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > &imx_rproc_cfg_imx8ulp },
> > > { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
> > > {},
> > > --
> > > 2.37.1
> > >
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-27 17:56 ` Mathieu Poirier
0 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-27 17:56 UTC (permalink / raw)
To: Peng Fan
Cc: Peng Fan (OSS),
bjorn.andersson, robh+dt, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, dl-linux-imx, linux-remoteproc,
devicetree, linux-arm-kernel, linux-kernel
On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> Hi Mathieu,
>
> Thanks for reviewing this patchset.
> > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> > i.MX8QXP M4
> >
> > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > From: Peng Fan <peng.fan@nxp.com>
> > >
> > > When M4 is kicked by SCFW, M4 runs in its own hardware partition,
> > > Linux could only do IPC with M4, it could not start, stop, update image.
> > >
> > > We disable recovery reboot when M4 is managed by SCFW, because
> > > remoteproc core still not support M4 auto-recovery without loading
> > > image.
> > >
> > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > ---
> > > drivers/remoteproc/imx_rproc.c | 108
> > > ++++++++++++++++++++++++++++++++-
> > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
> > > 100644
> > > --- a/drivers/remoteproc/imx_rproc.c
> > > +++ b/drivers/remoteproc/imx_rproc.c
> > > @@ -6,6 +6,7 @@
> > > #include <linux/arm-smccc.h>
> > > #include <linux/clk.h>
> > > #include <linux/err.h>
> > > +#include <linux/firmware/imx/sci.h>
> > > #include <linux/interrupt.h>
> > > #include <linux/kernel.h>
> > > #include <linux/mailbox_client.h>
> > > @@ -59,6 +60,8 @@
> > > #define IMX_SIP_RPROC_STARTED 0x01
> > > #define IMX_SIP_RPROC_STOP 0x02
> > >
> > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > +
> > > /**
> > > * struct imx_rproc_mem - slim internal memory structure
> > > * @cpu_addr: MPU virtual address of the memory region @@ -89,6
> > > +92,10 @@ struct imx_rproc {
> > > struct work_struct rproc_work;
> > > struct workqueue_struct *workqueue;
> > > void __iomem *rsc_table;
> > > + struct imx_sc_ipc *ipc_handle;
> > > + struct notifier_block rproc_nb;
> > > + u32 rproc_pt; /* partition id */
> > > + u32 rsrc_id; /* resource id */
> > > };
> > >
> > > static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -117,6
> > > +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > >
> > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
> > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > + /* TCML/U */
> > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
> > > + /* OCRAM(Low 96KB) */
> > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > + /* OCRAM */
> > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > + /* DDR (Data) */
> > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > +
> > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
> > > /* dev addr , sys addr , size , flags */
> > > /* ITCM */
> > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > imx_rproc_cfg_imx8mq = {
> > > .method = IMX_RPROC_MMIO,
> > > };
> > >
> > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> > > + .att = imx_rproc_att_imx8qxp,
> > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > + .method = IMX_RPROC_SCU_API,
> > > +};
> > > +
> > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> > > .att = imx_rproc_att_imx8ulp,
> > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
> > *rproc)
> > > mbox_free_channel(priv->rx_ch);
> > > }
> > >
> > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > + struct imx_rproc *priv = rproc->priv;
> > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > +
> > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > + return;
> > > +
> > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> > > + return;
> > > +
> > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > BIT(priv->rproc_pt), false);
> > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > +}
> > > +
> > > +static int imx_rproc_partition_notify(struct notifier_block *nb,
> > > + unsigned long event, void *group) {
> > > + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
> > > +rproc_nb);
> > > +
> > > + /* Ignore other irqs */
> > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > + return 0;
> > > +
> > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > +
> > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > static int imx_rproc_detect_mode(struct imx_rproc *priv) {
> > > struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
> > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > struct arm_smccc_res res;
> > > int ret;
> > > u32 val;
> > > + u8 pt;
> > >
> > > switch (dcfg->method) {
> > > case IMX_RPROC_NONE:
> > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > imx_rproc *priv)
> > > if (res.a0)
> > > priv->rproc->state = RPROC_DETACHED;
> > > return 0;
> > > + case IMX_RPROC_SCU_API:
> > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > + if (ret)
> > > + return ret;
> > > + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
> > &priv->rsrc_id);
> > > + if (ret) {
> > > + dev_err(dev, "No fsl,resource-id property\n");
> > > + return ret;
> > > + }
> > > +
> > > + /*
> > > + * If Mcore resource is not owned by Acore partition, It is
> > kicked by ROM,
> > > + * and Linux could only do IPC with Mcore and nothing else.
> > > + */
> > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
> > >rsrc_id))
> > > + return 0;
> >
> > If imx_sc_rm_is_resource_owned() return '1' than the remote processor is
> > under Linux's control and what follows below is not needed. That is also
> > coherent with the comment in [1].
>
> Case 1: If M4 is owned by Linux, here directly return 0.
> Case 2: If M4 is not owned by Linux, the following code after this line will set
> state as RPROC_DETACHED.
I understand that part.
>
> Patch 3/6(this patch) is only to support case 2.
> Patch 4/6 is to support case 1.
>
Let's leave the subsequent patches alone for now.
> >
> > That is in contrast with what is happening in imx_rproc_put_scu(). There, if
> > the remote processor is _not_ owned by Linux than the condition returns
> > without calling imx_scu_irq_group_enable() and
> > imx_scu_irq_unregister_notifier(). That seems to be a bug.
>
> No. The two functions only needed when M4 is in a separate hardware partition.
>
> The scu irq is only needed when M4 is out of linux control and need some
> notification such as M4 is reset by SCU(System Control Unit). That linux got
> notification that M4 is reset by SCU.
I also understand that part.
What I am underlining here is that when the M4 is independent, function
imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are called but
their cleanup equivalent are not called in imx_rproc_put_scu() because of the '!'
in the if() statement.
>
> >
> > There is also a problem in patch 4/6 associated to that.
>
> If the upper explanation eliminate your concern, "a problem in patch 4/6" should
> not be a problem.
>
> When M4 is owned by Linux, Linux need handle the power domain. If M4 is not owned
> by Linux, SCU firmware will handle the power domain, and Linux has no permission to
> touch that.
>
> Thanks
> Peng
>
> >
> > Thanks,
> > Mathieu
> >
> >
> > [1].
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
> > .bootlin.com%2Flinux%2Fv6.0-
> > rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
> > 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > =0
> >
> > > +
> > > + priv->rproc->state = RPROC_DETACHED;
> > > + priv->rproc->recovery_disabled = true;
> > > +
> > > + /* Get partition id and enable irq in SCFW */
> > > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > priv->rsrc_id, &pt);
> > > + if (ret) {
> > > + dev_err(dev, "not able to get resource owner\n");
> > > + return ret;
> > > + }
> > > +
> > > + priv->rproc_pt = pt;
> > > + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
> > > +
> > > + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > + if (ret) {
> > > + dev_warn(dev, "register scu notifier failed.\n");
> > > + return ret;
> > > + }
> > > +
> > > + ret =
> > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
> > >rproc_pt),
> > > + true);
> > > + if (ret) {
> > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > + dev_warn(dev, "Enable irq failed.\n");
> > > + return ret;
> > > + }
> > > +
> > > + return 0;
> > > default:
> > > break;
> > > }
> > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
> > > *pdev)
> > >
> > > ret = imx_rproc_clk_enable(priv);
> > > if (ret)
> > > - goto err_put_mbox;
> > > + goto err_put_scu;
> > >
> > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > >
> > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
> > > *pdev)
> > >
> > > err_put_clk:
> > > clk_disable_unprepare(priv->clk);
> > > +err_put_scu:
> > > + imx_rproc_put_scu(rproc);
> > > err_put_mbox:
> > > imx_rproc_free_mbox(rproc);
> > > err_put_wkq:
> > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > platform_device
> > > *pdev)
> > >
> > > clk_disable_unprepare(priv->clk);
> > > rproc_del(rproc);
> > > + imx_rproc_put_scu(rproc);
> > > imx_rproc_free_mbox(rproc);
> > > destroy_workqueue(priv->workqueue);
> > > rproc_free(rproc);
> > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > imx_rproc_of_match[] = {
> > > { .compatible = "fsl,imx8mm-cm4", .data =
> > &imx_rproc_cfg_imx8mq },
> > > { .compatible = "fsl,imx8mn-cm7", .data =
> > &imx_rproc_cfg_imx8mn },
> > > { .compatible = "fsl,imx8mp-cm7", .data =
> > &imx_rproc_cfg_imx8mn },
> > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > &imx_rproc_cfg_imx8qxp },
> > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > &imx_rproc_cfg_imx8ulp },
> > > { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
> > > {},
> > > --
> > > 2.37.1
> > >
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-27 17:56 ` Mathieu Poirier
@ 2022-09-28 7:39 ` Peng Fan
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-28 7:39 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan
Cc: bjorn.andersson, robh+dt, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, dl-linux-imx, linux-remoteproc,
devicetree, linux-arm-kernel, linux-kernel
On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
>> Hi Mathieu,
>>
>> Thanks for reviewing this patchset.
>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
>>> i.MX8QXP M4
>>>
>>> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
>>>> From: Peng Fan <peng.fan@nxp.com>
>>>>
>>>> When M4 is kicked by SCFW, M4 runs in its own hardware partition,
>>>> Linux could only do IPC with M4, it could not start, stop, update image.
>>>>
>>>> We disable recovery reboot when M4 is managed by SCFW, because
>>>> remoteproc core still not support M4 auto-recovery without loading
>>>> image.
>>>>
>>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>>> ---
>>>> drivers/remoteproc/imx_rproc.c | 108
>>>> ++++++++++++++++++++++++++++++++-
>>>> 1 file changed, 107 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/remoteproc/imx_rproc.c
>>>> b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
>>>> 100644
>>>> --- a/drivers/remoteproc/imx_rproc.c
>>>> +++ b/drivers/remoteproc/imx_rproc.c
>>>> @@ -6,6 +6,7 @@
>>>> #include <linux/arm-smccc.h>
>>>> #include <linux/clk.h>
>>>> #include <linux/err.h>
>>>> +#include <linux/firmware/imx/sci.h>
>>>> #include <linux/interrupt.h>
>>>> #include <linux/kernel.h>
>>>> #include <linux/mailbox_client.h>
>>>> @@ -59,6 +60,8 @@
>>>> #define IMX_SIP_RPROC_STARTED 0x01
>>>> #define IMX_SIP_RPROC_STOP 0x02
>>>>
>>>> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
>>>> +
>>>> /**
>>>> * struct imx_rproc_mem - slim internal memory structure
>>>> * @cpu_addr: MPU virtual address of the memory region @@ -89,6
>>>> +92,10 @@ struct imx_rproc {
>>>> struct work_struct rproc_work;
>>>> struct workqueue_struct *workqueue;
>>>> void __iomem *rsc_table;
>>>> + struct imx_sc_ipc *ipc_handle;
>>>> + struct notifier_block rproc_nb;
>>>> + u32 rproc_pt; /* partition id */
>>>> + u32 rsrc_id; /* resource id */
>>>> };
>>>>
>>>> static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -117,6
>>>> +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
>>>> { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
>>>>
>>>> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
>>>> + { 0x08000000, 0x08000000, 0x10000000, 0 },
>>>> + /* TCML/U */
>>>> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
>>>> + /* OCRAM(Low 96KB) */
>>>> + { 0x21000000, 0x00100000, 0x00018000, 0 },
>>>> + /* OCRAM */
>>>> + { 0x21100000, 0x00100000, 0x00040000, 0 },
>>>> + /* DDR (Data) */
>>>> + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
>>>> +
>>>> static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
>>>> /* dev addr , sys addr , size , flags */
>>>> /* ITCM */
>>>> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
>>> imx_rproc_cfg_imx8mq = {
>>>> .method = IMX_RPROC_MMIO,
>>>> };
>>>>
>>>> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
>>>> + .att = imx_rproc_att_imx8qxp,
>>>> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
>>>> + .method = IMX_RPROC_SCU_API,
>>>> +};
>>>> +
>>>> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
>>>> .att = imx_rproc_att_imx8ulp,
>>>> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
>>>> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
>>> *rproc)
>>>> mbox_free_channel(priv->rx_ch);
>>>> }
>>>>
>>>> +static void imx_rproc_put_scu(struct rproc *rproc) {
>>>> + struct imx_rproc *priv = rproc->priv;
>>>> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
>>>> +
>>>> + if (dcfg->method != IMX_RPROC_SCU_API)
>>>> + return;
>>>> +
>>>> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
>>>> + return;
>>>> +
>>>> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
>>> BIT(priv->rproc_pt), false);
>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>> +}
>>>> +
>>>> +static int imx_rproc_partition_notify(struct notifier_block *nb,
>>>> + unsigned long event, void *group) {
>>>> + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
>>>> +rproc_nb);
>>>> +
>>>> + /* Ignore other irqs */
>>>> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
>>> IMX_SC_IRQ_GROUP_REBOOTED)))
>>>> + return 0;
>>>> +
>>>> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
>>>> +
>>>> + pr_info("Partition%d reset!\n", priv->rproc_pt);
>>>> +
>>>> + return 0;
>>>> +}
>>>> +
>>>> static int imx_rproc_detect_mode(struct imx_rproc *priv) {
>>>> struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
>>>> +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
>>>> struct arm_smccc_res res;
>>>> int ret;
>>>> u32 val;
>>>> + u8 pt;
>>>>
>>>> switch (dcfg->method) {
>>>> case IMX_RPROC_NONE:
>>>> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
>>> imx_rproc *priv)
>>>> if (res.a0)
>>>> priv->rproc->state = RPROC_DETACHED;
>>>> return 0;
>>>> + case IMX_RPROC_SCU_API:
>>>> + ret = imx_scu_get_handle(&priv->ipc_handle);
>>>> + if (ret)
>>>> + return ret;
>>>> + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
>>> &priv->rsrc_id);
>>>> + if (ret) {
>>>> + dev_err(dev, "No fsl,resource-id property\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> + /*
>>>> + * If Mcore resource is not owned by Acore partition, It is
>>> kicked by ROM,
>>>> + * and Linux could only do IPC with Mcore and nothing else.
>>>> + */
>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
>>>> rsrc_id))
>>>> + return 0;
>>>
>>> If imx_sc_rm_is_resource_owned() return '1' than the remote processor is
>>> under Linux's control and what follows below is not needed. That is also
>>> coherent with the comment in [1].
>>
>> Case 1: If M4 is owned by Linux, here directly return 0.
>> Case 2: If M4 is not owned by Linux, the following code after this line will set
>> state as RPROC_DETACHED.
>
> I understand that part.
>
>>
>> Patch 3/6(this patch) is only to support case 2.
>> Patch 4/6 is to support case 1.
>>
>
> Let's leave the subsequent patches alone for now.
>
>>>
>>> That is in contrast with what is happening in imx_rproc_put_scu(). There, if
>>> the remote processor is _not_ owned by Linux than the condition returns
>>> without calling imx_scu_irq_group_enable() and
>>> imx_scu_irq_unregister_notifier(). That seems to be a bug.
>>
>> No. The two functions only needed when M4 is in a separate hardware partition.
>>
>> The scu irq is only needed when M4 is out of linux control and need some
>> notification such as M4 is reset by SCU(System Control Unit). That linux got
>> notification that M4 is reset by SCU.
>
> I also understand that part.
>
> What I am underlining here is that when the M4 is independent, function
> imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are called but
> their cleanup equivalent are not called in imx_rproc_put_scu() because of the '!'
> in the if() statement.
you are right, this is bug in my side. It should be as below based on
patch 3/6.
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index bcba74e90020..a56aecae00c6 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc *rproc)
if (dcfg->method != IMX_RPROC_SCU_API)
return;
- if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
return;
Thanks for detailed reviewing.
Thanks,
Peng.
>
>>
>>>
>>> There is also a problem in patch 4/6 associated to that.
>>
>> If the upper explanation eliminate your concern, "a problem in patch 4/6" should
>> not be a problem.
>>
>> When M4 is owned by Linux, Linux need handle the power domain. If M4 is not owned
>> by Linux, SCU firmware will handle the power domain, and Linux has no permission to
>> touch that.
>>
>> Thanks
>> Peng
>>
>>>
>>> Thanks,
>>> Mathieu
>>>
>>>
>>> [1].
>>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
>>> .bootlin.com%2Flinux%2Fv6.0-
>>> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
>>> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
>>> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
>>> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
>>> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
>>> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
>>> =0
>>>
>>>> +
>>>> + priv->rproc->state = RPROC_DETACHED;
>>>> + priv->rproc->recovery_disabled = true;
>>>> +
>>>> + /* Get partition id and enable irq in SCFW */
>>>> + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
>>> priv->rsrc_id, &pt);
>>>> + if (ret) {
>>>> + dev_err(dev, "not able to get resource owner\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> + priv->rproc_pt = pt;
>>>> + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
>>>> +
>>>> + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
>>>> + if (ret) {
>>>> + dev_warn(dev, "register scu notifier failed.\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> + ret =
>>> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
>>>> rproc_pt),
>>>> + true);
>>>> + if (ret) {
>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>> + dev_warn(dev, "Enable irq failed.\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> + return 0;
>>>> default:
>>>> break;
>>>> }
>>>> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
>>>> *pdev)
>>>>
>>>> ret = imx_rproc_clk_enable(priv);
>>>> if (ret)
>>>> - goto err_put_mbox;
>>>> + goto err_put_scu;
>>>>
>>>> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>>>>
>>>> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
>>>> *pdev)
>>>>
>>>> err_put_clk:
>>>> clk_disable_unprepare(priv->clk);
>>>> +err_put_scu:
>>>> + imx_rproc_put_scu(rproc);
>>>> err_put_mbox:
>>>> imx_rproc_free_mbox(rproc);
>>>> err_put_wkq:
>>>> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
>>> platform_device
>>>> *pdev)
>>>>
>>>> clk_disable_unprepare(priv->clk);
>>>> rproc_del(rproc);
>>>> + imx_rproc_put_scu(rproc);
>>>> imx_rproc_free_mbox(rproc);
>>>> destroy_workqueue(priv->workqueue);
>>>> rproc_free(rproc);
>>>> @@ -852,6 +957,7 @@ static const struct of_device_id
>>> imx_rproc_of_match[] = {
>>>> { .compatible = "fsl,imx8mm-cm4", .data =
>>> &imx_rproc_cfg_imx8mq },
>>>> { .compatible = "fsl,imx8mn-cm7", .data =
>>> &imx_rproc_cfg_imx8mn },
>>>> { .compatible = "fsl,imx8mp-cm7", .data =
>>> &imx_rproc_cfg_imx8mn },
>>>> + { .compatible = "fsl,imx8qxp-cm4", .data =
>>> &imx_rproc_cfg_imx8qxp },
>>>> { .compatible = "fsl,imx8ulp-cm33", .data =
>>> &imx_rproc_cfg_imx8ulp },
>>>> { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
>>>> {},
>>>> --
>>>> 2.37.1
>>>>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-28 7:39 ` Peng Fan
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-28 7:39 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan
Cc: bjorn.andersson, robh+dt, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, dl-linux-imx, linux-remoteproc,
devicetree, linux-arm-kernel, linux-kernel
On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
>> Hi Mathieu,
>>
>> Thanks for reviewing this patchset.
>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
>>> i.MX8QXP M4
>>>
>>> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
>>>> From: Peng Fan <peng.fan@nxp.com>
>>>>
>>>> When M4 is kicked by SCFW, M4 runs in its own hardware partition,
>>>> Linux could only do IPC with M4, it could not start, stop, update image.
>>>>
>>>> We disable recovery reboot when M4 is managed by SCFW, because
>>>> remoteproc core still not support M4 auto-recovery without loading
>>>> image.
>>>>
>>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>>> ---
>>>> drivers/remoteproc/imx_rproc.c | 108
>>>> ++++++++++++++++++++++++++++++++-
>>>> 1 file changed, 107 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/remoteproc/imx_rproc.c
>>>> b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
>>>> 100644
>>>> --- a/drivers/remoteproc/imx_rproc.c
>>>> +++ b/drivers/remoteproc/imx_rproc.c
>>>> @@ -6,6 +6,7 @@
>>>> #include <linux/arm-smccc.h>
>>>> #include <linux/clk.h>
>>>> #include <linux/err.h>
>>>> +#include <linux/firmware/imx/sci.h>
>>>> #include <linux/interrupt.h>
>>>> #include <linux/kernel.h>
>>>> #include <linux/mailbox_client.h>
>>>> @@ -59,6 +60,8 @@
>>>> #define IMX_SIP_RPROC_STARTED 0x01
>>>> #define IMX_SIP_RPROC_STOP 0x02
>>>>
>>>> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
>>>> +
>>>> /**
>>>> * struct imx_rproc_mem - slim internal memory structure
>>>> * @cpu_addr: MPU virtual address of the memory region @@ -89,6
>>>> +92,10 @@ struct imx_rproc {
>>>> struct work_struct rproc_work;
>>>> struct workqueue_struct *workqueue;
>>>> void __iomem *rsc_table;
>>>> + struct imx_sc_ipc *ipc_handle;
>>>> + struct notifier_block rproc_nb;
>>>> + u32 rproc_pt; /* partition id */
>>>> + u32 rsrc_id; /* resource id */
>>>> };
>>>>
>>>> static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -117,6
>>>> +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
>>>> { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
>>>>
>>>> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
>>>> + { 0x08000000, 0x08000000, 0x10000000, 0 },
>>>> + /* TCML/U */
>>>> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
>>>> + /* OCRAM(Low 96KB) */
>>>> + { 0x21000000, 0x00100000, 0x00018000, 0 },
>>>> + /* OCRAM */
>>>> + { 0x21100000, 0x00100000, 0x00040000, 0 },
>>>> + /* DDR (Data) */
>>>> + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
>>>> +
>>>> static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
>>>> /* dev addr , sys addr , size , flags */
>>>> /* ITCM */
>>>> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
>>> imx_rproc_cfg_imx8mq = {
>>>> .method = IMX_RPROC_MMIO,
>>>> };
>>>>
>>>> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
>>>> + .att = imx_rproc_att_imx8qxp,
>>>> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
>>>> + .method = IMX_RPROC_SCU_API,
>>>> +};
>>>> +
>>>> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
>>>> .att = imx_rproc_att_imx8ulp,
>>>> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
>>>> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
>>> *rproc)
>>>> mbox_free_channel(priv->rx_ch);
>>>> }
>>>>
>>>> +static void imx_rproc_put_scu(struct rproc *rproc) {
>>>> + struct imx_rproc *priv = rproc->priv;
>>>> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
>>>> +
>>>> + if (dcfg->method != IMX_RPROC_SCU_API)
>>>> + return;
>>>> +
>>>> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
>>>> + return;
>>>> +
>>>> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
>>> BIT(priv->rproc_pt), false);
>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>> +}
>>>> +
>>>> +static int imx_rproc_partition_notify(struct notifier_block *nb,
>>>> + unsigned long event, void *group) {
>>>> + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
>>>> +rproc_nb);
>>>> +
>>>> + /* Ignore other irqs */
>>>> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
>>> IMX_SC_IRQ_GROUP_REBOOTED)))
>>>> + return 0;
>>>> +
>>>> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
>>>> +
>>>> + pr_info("Partition%d reset!\n", priv->rproc_pt);
>>>> +
>>>> + return 0;
>>>> +}
>>>> +
>>>> static int imx_rproc_detect_mode(struct imx_rproc *priv) {
>>>> struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
>>>> +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
>>>> struct arm_smccc_res res;
>>>> int ret;
>>>> u32 val;
>>>> + u8 pt;
>>>>
>>>> switch (dcfg->method) {
>>>> case IMX_RPROC_NONE:
>>>> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
>>> imx_rproc *priv)
>>>> if (res.a0)
>>>> priv->rproc->state = RPROC_DETACHED;
>>>> return 0;
>>>> + case IMX_RPROC_SCU_API:
>>>> + ret = imx_scu_get_handle(&priv->ipc_handle);
>>>> + if (ret)
>>>> + return ret;
>>>> + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
>>> &priv->rsrc_id);
>>>> + if (ret) {
>>>> + dev_err(dev, "No fsl,resource-id property\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> + /*
>>>> + * If Mcore resource is not owned by Acore partition, It is
>>> kicked by ROM,
>>>> + * and Linux could only do IPC with Mcore and nothing else.
>>>> + */
>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
>>>> rsrc_id))
>>>> + return 0;
>>>
>>> If imx_sc_rm_is_resource_owned() return '1' than the remote processor is
>>> under Linux's control and what follows below is not needed. That is also
>>> coherent with the comment in [1].
>>
>> Case 1: If M4 is owned by Linux, here directly return 0.
>> Case 2: If M4 is not owned by Linux, the following code after this line will set
>> state as RPROC_DETACHED.
>
> I understand that part.
>
>>
>> Patch 3/6(this patch) is only to support case 2.
>> Patch 4/6 is to support case 1.
>>
>
> Let's leave the subsequent patches alone for now.
>
>>>
>>> That is in contrast with what is happening in imx_rproc_put_scu(). There, if
>>> the remote processor is _not_ owned by Linux than the condition returns
>>> without calling imx_scu_irq_group_enable() and
>>> imx_scu_irq_unregister_notifier(). That seems to be a bug.
>>
>> No. The two functions only needed when M4 is in a separate hardware partition.
>>
>> The scu irq is only needed when M4 is out of linux control and need some
>> notification such as M4 is reset by SCU(System Control Unit). That linux got
>> notification that M4 is reset by SCU.
>
> I also understand that part.
>
> What I am underlining here is that when the M4 is independent, function
> imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are called but
> their cleanup equivalent are not called in imx_rproc_put_scu() because of the '!'
> in the if() statement.
you are right, this is bug in my side. It should be as below based on
patch 3/6.
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index bcba74e90020..a56aecae00c6 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc *rproc)
if (dcfg->method != IMX_RPROC_SCU_API)
return;
- if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
return;
Thanks for detailed reviewing.
Thanks,
Peng.
>
>>
>>>
>>> There is also a problem in patch 4/6 associated to that.
>>
>> If the upper explanation eliminate your concern, "a problem in patch 4/6" should
>> not be a problem.
>>
>> When M4 is owned by Linux, Linux need handle the power domain. If M4 is not owned
>> by Linux, SCU firmware will handle the power domain, and Linux has no permission to
>> touch that.
>>
>> Thanks
>> Peng
>>
>>>
>>> Thanks,
>>> Mathieu
>>>
>>>
>>> [1].
>>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
>>> .bootlin.com%2Flinux%2Fv6.0-
>>> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
>>> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
>>> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
>>> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
>>> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
>>> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
>>> =0
>>>
>>>> +
>>>> + priv->rproc->state = RPROC_DETACHED;
>>>> + priv->rproc->recovery_disabled = true;
>>>> +
>>>> + /* Get partition id and enable irq in SCFW */
>>>> + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
>>> priv->rsrc_id, &pt);
>>>> + if (ret) {
>>>> + dev_err(dev, "not able to get resource owner\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> + priv->rproc_pt = pt;
>>>> + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
>>>> +
>>>> + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
>>>> + if (ret) {
>>>> + dev_warn(dev, "register scu notifier failed.\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> + ret =
>>> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
>>>> rproc_pt),
>>>> + true);
>>>> + if (ret) {
>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>> + dev_warn(dev, "Enable irq failed.\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> + return 0;
>>>> default:
>>>> break;
>>>> }
>>>> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
>>>> *pdev)
>>>>
>>>> ret = imx_rproc_clk_enable(priv);
>>>> if (ret)
>>>> - goto err_put_mbox;
>>>> + goto err_put_scu;
>>>>
>>>> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>>>>
>>>> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
>>>> *pdev)
>>>>
>>>> err_put_clk:
>>>> clk_disable_unprepare(priv->clk);
>>>> +err_put_scu:
>>>> + imx_rproc_put_scu(rproc);
>>>> err_put_mbox:
>>>> imx_rproc_free_mbox(rproc);
>>>> err_put_wkq:
>>>> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
>>> platform_device
>>>> *pdev)
>>>>
>>>> clk_disable_unprepare(priv->clk);
>>>> rproc_del(rproc);
>>>> + imx_rproc_put_scu(rproc);
>>>> imx_rproc_free_mbox(rproc);
>>>> destroy_workqueue(priv->workqueue);
>>>> rproc_free(rproc);
>>>> @@ -852,6 +957,7 @@ static const struct of_device_id
>>> imx_rproc_of_match[] = {
>>>> { .compatible = "fsl,imx8mm-cm4", .data =
>>> &imx_rproc_cfg_imx8mq },
>>>> { .compatible = "fsl,imx8mn-cm7", .data =
>>> &imx_rproc_cfg_imx8mn },
>>>> { .compatible = "fsl,imx8mp-cm7", .data =
>>> &imx_rproc_cfg_imx8mn },
>>>> + { .compatible = "fsl,imx8qxp-cm4", .data =
>>> &imx_rproc_cfg_imx8qxp },
>>>> { .compatible = "fsl,imx8ulp-cm33", .data =
>>> &imx_rproc_cfg_imx8ulp },
>>>> { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 },
>>>> {},
>>>> --
>>>> 2.37.1
>>>>
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-28 7:39 ` Peng Fan
@ 2022-09-28 10:01 ` Peng Fan
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-28 10:01 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
Hi Mathieu,
On 9/28/2022 3:39 PM, Peng Fan wrote:
>
>
> On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
>> On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
>>> Hi Mathieu,
>>>
>>> Thanks for reviewing this patchset.
>>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
>>>> i.MX8QXP M4
>>>>
>>>> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
>>>>> From: Peng Fan <peng.fan@nxp.com>
>>>>>
>>>>> When M4 is kicked by SCFW, M4 runs in its own hardware partition,
>>>>> Linux could only do IPC with M4, it could not start, stop, update
>>>>> image.
>>>>>
>>>>> We disable recovery reboot when M4 is managed by SCFW, because
>>>>> remoteproc core still not support M4 auto-recovery without loading
>>>>> image.
>>>>>
>>>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>>>> ---
>>>>> drivers/remoteproc/imx_rproc.c | 108
>>>>> ++++++++++++++++++++++++++++++++-
>>>>> 1 file changed, 107 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/remoteproc/imx_rproc.c
>>>>> b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
>>>>> 100644
>>>>> --- a/drivers/remoteproc/imx_rproc.c
>>>>> +++ b/drivers/remoteproc/imx_rproc.c
>>>>> @@ -6,6 +6,7 @@
>>>>> #include <linux/arm-smccc.h>
>>>>> #include <linux/clk.h>
>>>>> #include <linux/err.h>
>>>>> +#include <linux/firmware/imx/sci.h>
>>>>> #include <linux/interrupt.h>
>>>>> #include <linux/kernel.h>
>>>>> #include <linux/mailbox_client.h>
>>>>> @@ -59,6 +60,8 @@
>>>>> #define IMX_SIP_RPROC_STARTED 0x01
>>>>> #define IMX_SIP_RPROC_STOP 0x02
>>>>>
>>>>> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
>>>>> +
>>>>> /**
>>>>> * struct imx_rproc_mem - slim internal memory structure
>>>>> * @cpu_addr: MPU virtual address of the memory region @@ -89,6
>>>>> +92,10 @@ struct imx_rproc {
>>>>> struct work_struct rproc_work;
>>>>> struct workqueue_struct *workqueue;
>>>>> void __iomem *rsc_table;
>>>>> + struct imx_sc_ipc *ipc_handle;
>>>>> + struct notifier_block rproc_nb;
>>>>> + u32 rproc_pt; /* partition id */
>>>>> + u32 rsrc_id; /* resource id */
>>>>> };
>>>>>
>>>>> static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@
>>>>> -117,6
>>>>> +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
>>>>> { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
>>>>>
>>>>> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
>>>>> + { 0x08000000, 0x08000000, 0x10000000, 0 },
>>>>> + /* TCML/U */
>>>>> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
>>>>> + /* OCRAM(Low 96KB) */
>>>>> + { 0x21000000, 0x00100000, 0x00018000, 0 },
>>>>> + /* OCRAM */
>>>>> + { 0x21100000, 0x00100000, 0x00040000, 0 },
>>>>> + /* DDR (Data) */
>>>>> + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
>>>>> +
>>>>> static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
>>>>> /* dev addr , sys addr , size , flags */
>>>>> /* ITCM */
>>>>> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
>>>> imx_rproc_cfg_imx8mq = {
>>>>> .method = IMX_RPROC_MMIO,
>>>>> };
>>>>>
>>>>> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
>>>>> + .att = imx_rproc_att_imx8qxp,
>>>>> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
>>>>> + .method = IMX_RPROC_SCU_API,
>>>>> +};
>>>>> +
>>>>> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
>>>>> .att = imx_rproc_att_imx8ulp,
>>>>> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
>>>>> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
>>>> *rproc)
>>>>> mbox_free_channel(priv->rx_ch);
>>>>> }
>>>>>
>>>>> +static void imx_rproc_put_scu(struct rproc *rproc) {
>>>>> + struct imx_rproc *priv = rproc->priv;
>>>>> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
>>>>> +
>>>>> + if (dcfg->method != IMX_RPROC_SCU_API)
>>>>> + return;
>>>>> +
>>>>> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>> priv->rsrc_id))
>>>>> + return;
>>>>> +
>>>>> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
>>>> BIT(priv->rproc_pt), false);
>>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>>> +}
>>>>> +
>>>>> +static int imx_rproc_partition_notify(struct notifier_block *nb,
>>>>> + unsigned long event, void *group) {
>>>>> + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
>>>>> +rproc_nb);
>>>>> +
>>>>> + /* Ignore other irqs */
>>>>> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
>>>> IMX_SC_IRQ_GROUP_REBOOTED)))
>>>>> + return 0;
>>>>> +
>>>>> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
>>>>> +
>>>>> + pr_info("Partition%d reset!\n", priv->rproc_pt);
>>>>> +
>>>>> + return 0;
>>>>> +}
>>>>> +
>>>>> static int imx_rproc_detect_mode(struct imx_rproc *priv) {
>>>>> struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
>>>>> +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
>>>>> struct arm_smccc_res res;
>>>>> int ret;
>>>>> u32 val;
>>>>> + u8 pt;
>>>>>
>>>>> switch (dcfg->method) {
>>>>> case IMX_RPROC_NONE:
>>>>> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
>>>> imx_rproc *priv)
>>>>> if (res.a0)
>>>>> priv->rproc->state = RPROC_DETACHED;
>>>>> return 0;
>>>>> + case IMX_RPROC_SCU_API:
>>>>> + ret = imx_scu_get_handle(&priv->ipc_handle);
>>>>> + if (ret)
>>>>> + return ret;
>>>>> + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
>>>> &priv->rsrc_id);
>>>>> + if (ret) {
>>>>> + dev_err(dev, "No fsl,resource-id property\n");
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + /*
>>>>> + * If Mcore resource is not owned by Acore partition, It is
>>>> kicked by ROM,
>>>>> + * and Linux could only do IPC with Mcore and nothing else.
>>>>> + */
>>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
>>>>> rsrc_id))
>>>>> + return 0;
>>>>
>>>> If imx_sc_rm_is_resource_owned() return '1' than the remote
>>>> processor is
>>>> under Linux's control and what follows below is not needed. That is
>>>> also
>>>> coherent with the comment in [1].
>>>
>>> Case 1: If M4 is owned by Linux, here directly return 0.
>>> Case 2: If M4 is not owned by Linux, the following code after this
>>> line will set
>>> state as RPROC_DETACHED.
>>
>> I understand that part.
>>
>>>
>>> Patch 3/6(this patch) is only to support case 2.
>>> Patch 4/6 is to support case 1.
>>>
>>
>> Let's leave the subsequent patches alone for now.
>>
>>>>
>>>> That is in contrast with what is happening in imx_rproc_put_scu().
>>>> There, if
>>>> the remote processor is _not_ owned by Linux than the condition returns
>>>> without calling imx_scu_irq_group_enable() and
>>>> imx_scu_irq_unregister_notifier(). That seems to be a bug.
>>>
>>> No. The two functions only needed when M4 is in a separate hardware
>>> partition.
>>>
>>> The scu irq is only needed when M4 is out of linux control and need some
>>> notification such as M4 is reset by SCU(System Control Unit). That
>>> linux got
>>> notification that M4 is reset by SCU.
>>
>> I also understand that part.
>>
>> What I am underlining here is that when the M4 is independent, function
>> imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
>> called but
>> their cleanup equivalent are not called in imx_rproc_put_scu() because
>> of the '!'
>> in the if() statement.
>
> you are right, this is bug in my side. It should be as below based on
> patch 3/6.
>
> diff --git a/drivers/remoteproc/imx_rproc.c
> b/drivers/remoteproc/imx_rproc.c
> index bcba74e90020..a56aecae00c6 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc *rproc)
> if (dcfg->method != IMX_RPROC_SCU_API)
> return;
>
> - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> return;
>
> Thanks for detailed reviewing.
If you are fine with this change, I could send out V6. Anyway, I'll wait
to see if you have other comments in this patchset.
Thanks,
Peng.
>
> Thanks,
> Peng.
>
>>
>>>
>>>>
>>>> There is also a problem in patch 4/6 associated to that.
>>>
>>> If the upper explanation eliminate your concern, "a problem in patch
>>> 4/6" should
>>> not be a problem.
>>>
>>> When M4 is owned by Linux, Linux need handle the power domain. If M4
>>> is not owned
>>> by Linux, SCU firmware will handle the power domain, and Linux has no
>>> permission to
>>> touch that.
>>>
>>> Thanks
>>> Peng
>>>
>>>>
>>>> Thanks,
>>>> Mathieu
>>>>
>>>>
>>>> [1].
>>>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
>>>> .bootlin.com%2Flinux%2Fv6.0-
>>>> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
>>>> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
>>>> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
>>>> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
>>>> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
>>>> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
>>>> =0
>>>>
>>>>> +
>>>>> + priv->rproc->state = RPROC_DETACHED;
>>>>> + priv->rproc->recovery_disabled = true;
>>>>> +
>>>>> + /* Get partition id and enable irq in SCFW */
>>>>> + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
>>>> priv->rsrc_id, &pt);
>>>>> + if (ret) {
>>>>> + dev_err(dev, "not able to get resource owner\n");
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + priv->rproc_pt = pt;
>>>>> + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
>>>>> +
>>>>> + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
>>>>> + if (ret) {
>>>>> + dev_warn(dev, "register scu notifier failed.\n");
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + ret =
>>>> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
>>>>> rproc_pt),
>>>>> + true);
>>>>> + if (ret) {
>>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>>> + dev_warn(dev, "Enable irq failed.\n");
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + return 0;
>>>>> default:
>>>>> break;
>>>>> }
>>>>> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
>>>>> *pdev)
>>>>>
>>>>> ret = imx_rproc_clk_enable(priv);
>>>>> if (ret)
>>>>> - goto err_put_mbox;
>>>>> + goto err_put_scu;
>>>>>
>>>>> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>>>>>
>>>>> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
>>>>> *pdev)
>>>>>
>>>>> err_put_clk:
>>>>> clk_disable_unprepare(priv->clk);
>>>>> +err_put_scu:
>>>>> + imx_rproc_put_scu(rproc);
>>>>> err_put_mbox:
>>>>> imx_rproc_free_mbox(rproc);
>>>>> err_put_wkq:
>>>>> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
>>>> platform_device
>>>>> *pdev)
>>>>>
>>>>> clk_disable_unprepare(priv->clk);
>>>>> rproc_del(rproc);
>>>>> + imx_rproc_put_scu(rproc);
>>>>> imx_rproc_free_mbox(rproc);
>>>>> destroy_workqueue(priv->workqueue);
>>>>> rproc_free(rproc);
>>>>> @@ -852,6 +957,7 @@ static const struct of_device_id
>>>> imx_rproc_of_match[] = {
>>>>> { .compatible = "fsl,imx8mm-cm4", .data =
>>>> &imx_rproc_cfg_imx8mq },
>>>>> { .compatible = "fsl,imx8mn-cm7", .data =
>>>> &imx_rproc_cfg_imx8mn },
>>>>> { .compatible = "fsl,imx8mp-cm7", .data =
>>>> &imx_rproc_cfg_imx8mn },
>>>>> + { .compatible = "fsl,imx8qxp-cm4", .data =
>>>> &imx_rproc_cfg_imx8qxp },
>>>>> { .compatible = "fsl,imx8ulp-cm33", .data =
>>>> &imx_rproc_cfg_imx8ulp },
>>>>> { .compatible = "fsl,imx93-cm33", .data =
>>>>> &imx_rproc_cfg_imx93 },
>>>>> {},
>>>>> --
>>>>> 2.37.1
>>>>>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-28 10:01 ` Peng Fan
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-28 10:01 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
Hi Mathieu,
On 9/28/2022 3:39 PM, Peng Fan wrote:
>
>
> On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
>> On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
>>> Hi Mathieu,
>>>
>>> Thanks for reviewing this patchset.
>>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
>>>> i.MX8QXP M4
>>>>
>>>> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
>>>>> From: Peng Fan <peng.fan@nxp.com>
>>>>>
>>>>> When M4 is kicked by SCFW, M4 runs in its own hardware partition,
>>>>> Linux could only do IPC with M4, it could not start, stop, update
>>>>> image.
>>>>>
>>>>> We disable recovery reboot when M4 is managed by SCFW, because
>>>>> remoteproc core still not support M4 auto-recovery without loading
>>>>> image.
>>>>>
>>>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>>>> ---
>>>>> drivers/remoteproc/imx_rproc.c | 108
>>>>> ++++++++++++++++++++++++++++++++-
>>>>> 1 file changed, 107 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/remoteproc/imx_rproc.c
>>>>> b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
>>>>> 100644
>>>>> --- a/drivers/remoteproc/imx_rproc.c
>>>>> +++ b/drivers/remoteproc/imx_rproc.c
>>>>> @@ -6,6 +6,7 @@
>>>>> #include <linux/arm-smccc.h>
>>>>> #include <linux/clk.h>
>>>>> #include <linux/err.h>
>>>>> +#include <linux/firmware/imx/sci.h>
>>>>> #include <linux/interrupt.h>
>>>>> #include <linux/kernel.h>
>>>>> #include <linux/mailbox_client.h>
>>>>> @@ -59,6 +60,8 @@
>>>>> #define IMX_SIP_RPROC_STARTED 0x01
>>>>> #define IMX_SIP_RPROC_STOP 0x02
>>>>>
>>>>> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
>>>>> +
>>>>> /**
>>>>> * struct imx_rproc_mem - slim internal memory structure
>>>>> * @cpu_addr: MPU virtual address of the memory region @@ -89,6
>>>>> +92,10 @@ struct imx_rproc {
>>>>> struct work_struct rproc_work;
>>>>> struct workqueue_struct *workqueue;
>>>>> void __iomem *rsc_table;
>>>>> + struct imx_sc_ipc *ipc_handle;
>>>>> + struct notifier_block rproc_nb;
>>>>> + u32 rproc_pt; /* partition id */
>>>>> + u32 rsrc_id; /* resource id */
>>>>> };
>>>>>
>>>>> static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@
>>>>> -117,6
>>>>> +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
>>>>> { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
>>>>>
>>>>> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
>>>>> + { 0x08000000, 0x08000000, 0x10000000, 0 },
>>>>> + /* TCML/U */
>>>>> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
>>>>> + /* OCRAM(Low 96KB) */
>>>>> + { 0x21000000, 0x00100000, 0x00018000, 0 },
>>>>> + /* OCRAM */
>>>>> + { 0x21100000, 0x00100000, 0x00040000, 0 },
>>>>> + /* DDR (Data) */
>>>>> + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
>>>>> +
>>>>> static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
>>>>> /* dev addr , sys addr , size , flags */
>>>>> /* ITCM */
>>>>> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
>>>> imx_rproc_cfg_imx8mq = {
>>>>> .method = IMX_RPROC_MMIO,
>>>>> };
>>>>>
>>>>> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
>>>>> + .att = imx_rproc_att_imx8qxp,
>>>>> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
>>>>> + .method = IMX_RPROC_SCU_API,
>>>>> +};
>>>>> +
>>>>> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
>>>>> .att = imx_rproc_att_imx8ulp,
>>>>> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
>>>>> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
>>>> *rproc)
>>>>> mbox_free_channel(priv->rx_ch);
>>>>> }
>>>>>
>>>>> +static void imx_rproc_put_scu(struct rproc *rproc) {
>>>>> + struct imx_rproc *priv = rproc->priv;
>>>>> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
>>>>> +
>>>>> + if (dcfg->method != IMX_RPROC_SCU_API)
>>>>> + return;
>>>>> +
>>>>> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>> priv->rsrc_id))
>>>>> + return;
>>>>> +
>>>>> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
>>>> BIT(priv->rproc_pt), false);
>>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>>> +}
>>>>> +
>>>>> +static int imx_rproc_partition_notify(struct notifier_block *nb,
>>>>> + unsigned long event, void *group) {
>>>>> + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
>>>>> +rproc_nb);
>>>>> +
>>>>> + /* Ignore other irqs */
>>>>> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
>>>> IMX_SC_IRQ_GROUP_REBOOTED)))
>>>>> + return 0;
>>>>> +
>>>>> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
>>>>> +
>>>>> + pr_info("Partition%d reset!\n", priv->rproc_pt);
>>>>> +
>>>>> + return 0;
>>>>> +}
>>>>> +
>>>>> static int imx_rproc_detect_mode(struct imx_rproc *priv) {
>>>>> struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
>>>>> +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
>>>>> struct arm_smccc_res res;
>>>>> int ret;
>>>>> u32 val;
>>>>> + u8 pt;
>>>>>
>>>>> switch (dcfg->method) {
>>>>> case IMX_RPROC_NONE:
>>>>> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
>>>> imx_rproc *priv)
>>>>> if (res.a0)
>>>>> priv->rproc->state = RPROC_DETACHED;
>>>>> return 0;
>>>>> + case IMX_RPROC_SCU_API:
>>>>> + ret = imx_scu_get_handle(&priv->ipc_handle);
>>>>> + if (ret)
>>>>> + return ret;
>>>>> + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
>>>> &priv->rsrc_id);
>>>>> + if (ret) {
>>>>> + dev_err(dev, "No fsl,resource-id property\n");
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + /*
>>>>> + * If Mcore resource is not owned by Acore partition, It is
>>>> kicked by ROM,
>>>>> + * and Linux could only do IPC with Mcore and nothing else.
>>>>> + */
>>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
>>>>> rsrc_id))
>>>>> + return 0;
>>>>
>>>> If imx_sc_rm_is_resource_owned() return '1' than the remote
>>>> processor is
>>>> under Linux's control and what follows below is not needed. That is
>>>> also
>>>> coherent with the comment in [1].
>>>
>>> Case 1: If M4 is owned by Linux, here directly return 0.
>>> Case 2: If M4 is not owned by Linux, the following code after this
>>> line will set
>>> state as RPROC_DETACHED.
>>
>> I understand that part.
>>
>>>
>>> Patch 3/6(this patch) is only to support case 2.
>>> Patch 4/6 is to support case 1.
>>>
>>
>> Let's leave the subsequent patches alone for now.
>>
>>>>
>>>> That is in contrast with what is happening in imx_rproc_put_scu().
>>>> There, if
>>>> the remote processor is _not_ owned by Linux than the condition returns
>>>> without calling imx_scu_irq_group_enable() and
>>>> imx_scu_irq_unregister_notifier(). That seems to be a bug.
>>>
>>> No. The two functions only needed when M4 is in a separate hardware
>>> partition.
>>>
>>> The scu irq is only needed when M4 is out of linux control and need some
>>> notification such as M4 is reset by SCU(System Control Unit). That
>>> linux got
>>> notification that M4 is reset by SCU.
>>
>> I also understand that part.
>>
>> What I am underlining here is that when the M4 is independent, function
>> imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
>> called but
>> their cleanup equivalent are not called in imx_rproc_put_scu() because
>> of the '!'
>> in the if() statement.
>
> you are right, this is bug in my side. It should be as below based on
> patch 3/6.
>
> diff --git a/drivers/remoteproc/imx_rproc.c
> b/drivers/remoteproc/imx_rproc.c
> index bcba74e90020..a56aecae00c6 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc *rproc)
> if (dcfg->method != IMX_RPROC_SCU_API)
> return;
>
> - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> return;
>
> Thanks for detailed reviewing.
If you are fine with this change, I could send out V6. Anyway, I'll wait
to see if you have other comments in this patchset.
Thanks,
Peng.
>
> Thanks,
> Peng.
>
>>
>>>
>>>>
>>>> There is also a problem in patch 4/6 associated to that.
>>>
>>> If the upper explanation eliminate your concern, "a problem in patch
>>> 4/6" should
>>> not be a problem.
>>>
>>> When M4 is owned by Linux, Linux need handle the power domain. If M4
>>> is not owned
>>> by Linux, SCU firmware will handle the power domain, and Linux has no
>>> permission to
>>> touch that.
>>>
>>> Thanks
>>> Peng
>>>
>>>>
>>>> Thanks,
>>>> Mathieu
>>>>
>>>>
>>>> [1].
>>>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
>>>> .bootlin.com%2Flinux%2Fv6.0-
>>>> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
>>>> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
>>>> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
>>>> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
>>>> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
>>>> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
>>>> =0
>>>>
>>>>> +
>>>>> + priv->rproc->state = RPROC_DETACHED;
>>>>> + priv->rproc->recovery_disabled = true;
>>>>> +
>>>>> + /* Get partition id and enable irq in SCFW */
>>>>> + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
>>>> priv->rsrc_id, &pt);
>>>>> + if (ret) {
>>>>> + dev_err(dev, "not able to get resource owner\n");
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + priv->rproc_pt = pt;
>>>>> + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
>>>>> +
>>>>> + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
>>>>> + if (ret) {
>>>>> + dev_warn(dev, "register scu notifier failed.\n");
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + ret =
>>>> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
>>>>> rproc_pt),
>>>>> + true);
>>>>> + if (ret) {
>>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>>> + dev_warn(dev, "Enable irq failed.\n");
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + return 0;
>>>>> default:
>>>>> break;
>>>>> }
>>>>> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
>>>>> *pdev)
>>>>>
>>>>> ret = imx_rproc_clk_enable(priv);
>>>>> if (ret)
>>>>> - goto err_put_mbox;
>>>>> + goto err_put_scu;
>>>>>
>>>>> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>>>>>
>>>>> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
>>>>> *pdev)
>>>>>
>>>>> err_put_clk:
>>>>> clk_disable_unprepare(priv->clk);
>>>>> +err_put_scu:
>>>>> + imx_rproc_put_scu(rproc);
>>>>> err_put_mbox:
>>>>> imx_rproc_free_mbox(rproc);
>>>>> err_put_wkq:
>>>>> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
>>>> platform_device
>>>>> *pdev)
>>>>>
>>>>> clk_disable_unprepare(priv->clk);
>>>>> rproc_del(rproc);
>>>>> + imx_rproc_put_scu(rproc);
>>>>> imx_rproc_free_mbox(rproc);
>>>>> destroy_workqueue(priv->workqueue);
>>>>> rproc_free(rproc);
>>>>> @@ -852,6 +957,7 @@ static const struct of_device_id
>>>> imx_rproc_of_match[] = {
>>>>> { .compatible = "fsl,imx8mm-cm4", .data =
>>>> &imx_rproc_cfg_imx8mq },
>>>>> { .compatible = "fsl,imx8mn-cm7", .data =
>>>> &imx_rproc_cfg_imx8mn },
>>>>> { .compatible = "fsl,imx8mp-cm7", .data =
>>>> &imx_rproc_cfg_imx8mn },
>>>>> + { .compatible = "fsl,imx8qxp-cm4", .data =
>>>> &imx_rproc_cfg_imx8qxp },
>>>>> { .compatible = "fsl,imx8ulp-cm33", .data =
>>>> &imx_rproc_cfg_imx8ulp },
>>>>> { .compatible = "fsl,imx93-cm33", .data =
>>>>> &imx_rproc_cfg_imx93 },
>>>>> {},
>>>>> --
>>>>> 2.37.1
>>>>>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-28 10:01 ` Peng Fan
@ 2022-09-28 17:30 ` Mathieu Poirier
-1 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-28 17:30 UTC (permalink / raw)
To: Peng Fan
Cc: Peng Fan, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> Hi Mathieu,
>
> On 9/28/2022 3:39 PM, Peng Fan wrote:
> >
> >
> > On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> > > On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> > > > Hi Mathieu,
> > > >
> > > > Thanks for reviewing this patchset.
> > > > > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> > > > > i.MX8QXP M4
> > > > >
> > > > > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > > >
> > > > > > When M4 is kicked by SCFW, M4 runs in its own hardware partition,
> > > > > > Linux could only do IPC with M4, it could not start,
> > > > > > stop, update image.
> > > > > >
> > > > > > We disable recovery reboot when M4 is managed by SCFW, because
> > > > > > remoteproc core still not support M4 auto-recovery without loading
> > > > > > image.
> > > > > >
> > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > > > > ---
> > > > > > drivers/remoteproc/imx_rproc.c | 108
> > > > > > ++++++++++++++++++++++++++++++++-
> > > > > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > > > > >
> > > > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > > > b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
> > > > > > 100644
> > > > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > > > @@ -6,6 +6,7 @@
> > > > > > #include <linux/arm-smccc.h>
> > > > > > #include <linux/clk.h>
> > > > > > #include <linux/err.h>
> > > > > > +#include <linux/firmware/imx/sci.h>
> > > > > > #include <linux/interrupt.h>
> > > > > > #include <linux/kernel.h>
> > > > > > #include <linux/mailbox_client.h>
> > > > > > @@ -59,6 +60,8 @@
> > > > > > #define IMX_SIP_RPROC_STARTED 0x01
> > > > > > #define IMX_SIP_RPROC_STOP 0x02
> > > > > >
> > > > > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > > > > +
> > > > > > /**
> > > > > > * struct imx_rproc_mem - slim internal memory structure
> > > > > > * @cpu_addr: MPU virtual address of the memory region @@ -89,6
> > > > > > +92,10 @@ struct imx_rproc {
> > > > > > struct work_struct rproc_work;
> > > > > > struct workqueue_struct *workqueue;
> > > > > > void __iomem *rsc_table;
> > > > > > + struct imx_sc_ipc *ipc_handle;
> > > > > > + struct notifier_block rproc_nb;
> > > > > > + u32 rproc_pt; /* partition id */
> > > > > > + u32 rsrc_id; /* resource id */
> > > > > > };
> > > > > >
> > > > > > static const struct imx_rproc_att
> > > > > > imx_rproc_att_imx93[] = { @@ -117,6
> > > > > > +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> > > > > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > > > > >
> > > > > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
> > > > > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > > > > + /* TCML/U */
> > > > > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
> > > > > > + /* OCRAM(Low 96KB) */
> > > > > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > > > > + /* OCRAM */
> > > > > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > > > > + /* DDR (Data) */
> > > > > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > > > > +
> > > > > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
> > > > > > /* dev addr , sys addr , size , flags */
> > > > > > /* ITCM */
> > > > > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > > > > imx_rproc_cfg_imx8mq = {
> > > > > > .method = IMX_RPROC_MMIO,
> > > > > > };
> > > > > >
> > > > > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> > > > > > + .att = imx_rproc_att_imx8qxp,
> > > > > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > > > > + .method = IMX_RPROC_SCU_API,
> > > > > > +};
> > > > > > +
> > > > > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> > > > > > .att = imx_rproc_att_imx8ulp,
> > > > > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > > > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
> > > > > *rproc)
> > > > > > mbox_free_channel(priv->rx_ch);
> > > > > > }
> > > > > >
> > > > > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > > > > + struct imx_rproc *priv = rproc->priv;
> > > > > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > > > > +
> > > > > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > > > > + return;
> > > > > > +
> > > > > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > priv->rsrc_id))
> > > > > > + return;
> > > > > > +
> > > > > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > > > > BIT(priv->rproc_pt), false);
> > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > +}
> > > > > > +
> > > > > > +static int imx_rproc_partition_notify(struct notifier_block *nb,
> > > > > > + unsigned long event, void *group) {
> > > > > > + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
> > > > > > +rproc_nb);
> > > > > > +
> > > > > > + /* Ignore other irqs */
> > > > > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > > > > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > > > > + return 0;
> > > > > > +
> > > > > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > > > > +
> > > > > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > > > > +
> > > > > > + return 0;
> > > > > > +}
> > > > > > +
> > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv) {
> > > > > > struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
> > > > > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > > > > struct arm_smccc_res res;
> > > > > > int ret;
> > > > > > u32 val;
> > > > > > + u8 pt;
> > > > > >
> > > > > > switch (dcfg->method) {
> > > > > > case IMX_RPROC_NONE:
> > > > > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > > > > imx_rproc *priv)
> > > > > > if (res.a0)
> > > > > > priv->rproc->state = RPROC_DETACHED;
> > > > > > return 0;
> > > > > > + case IMX_RPROC_SCU_API:
> > > > > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > > > > + if (ret)
> > > > > > + return ret;
> > > > > > + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
> > > > > &priv->rsrc_id);
> > > > > > + if (ret) {
> > > > > > + dev_err(dev, "No fsl,resource-id property\n");
> > > > > > + return ret;
> > > > > > + }
> > > > > > +
> > > > > > + /*
> > > > > > + * If Mcore resource is not owned by Acore partition, It is
> > > > > kicked by ROM,
> > > > > > + * and Linux could only do IPC with Mcore and nothing else.
> > > > > > + */
> > > > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
> > > > > > rsrc_id))
> > > > > > + return 0;
> > > > >
> > > > > If imx_sc_rm_is_resource_owned() return '1' than the remote
> > > > > processor is
> > > > > under Linux's control and what follows below is not needed.
> > > > > That is also
> > > > > coherent with the comment in [1].
> > > >
> > > > Case 1: If M4 is owned by Linux, here directly return 0.
> > > > Case 2: If M4 is not owned by Linux, the following code after
> > > > this line will set
> > > > state as RPROC_DETACHED.
> > >
> > > I understand that part.
> > >
> > > >
> > > > Patch 3/6(this patch) is only to support case 2.
> > > > Patch 4/6 is to support case 1.
> > > >
> > >
> > > Let's leave the subsequent patches alone for now.
> > >
> > > > >
> > > > > That is in contrast with what is happening in
> > > > > imx_rproc_put_scu(). There, if
> > > > > the remote processor is _not_ owned by Linux than the condition returns
> > > > > without calling imx_scu_irq_group_enable() and
> > > > > imx_scu_irq_unregister_notifier(). That seems to be a bug.
> > > >
> > > > No. The two functions only needed when M4 is in a separate
> > > > hardware partition.
> > > >
> > > > The scu irq is only needed when M4 is out of linux control and need some
> > > > notification such as M4 is reset by SCU(System Control Unit).
> > > > That linux got
> > > > notification that M4 is reset by SCU.
> > >
> > > I also understand that part.
> > >
> > > What I am underlining here is that when the M4 is independent, function
> > > imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> > > called but
> > > their cleanup equivalent are not called in imx_rproc_put_scu()
> > > because of the '!'
> > > in the if() statement.
> >
> > you are right, this is bug in my side. It should be as below based on
> > patch 3/6.
> >
> > diff --git a/drivers/remoteproc/imx_rproc.c
> > b/drivers/remoteproc/imx_rproc.c
> > index bcba74e90020..a56aecae00c6 100644
> > --- a/drivers/remoteproc/imx_rproc.c
> > +++ b/drivers/remoteproc/imx_rproc.c
> > @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc *rproc)
> > if (dcfg->method != IMX_RPROC_SCU_API)
> > return;
> >
> > - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
Indeed, which raises questions about how this patchset was tested. And it is
not the first time we touch base on that.
> > return;
> >
> > Thanks for detailed reviewing.
>
> If you are fine with this change, I could send out V6. Anyway, I'll wait
> to see if you have other comments in this patchset.
>
I am out of time for this patchset and as such will not provide more comments
on this revision.
> Thanks,
> Peng.
>
> >
> > Thanks,
> > Peng.
> >
> > >
> > > >
> > > > >
> > > > > There is also a problem in patch 4/6 associated to that.
> > > >
> > > > If the upper explanation eliminate your concern, "a problem in
> > > > patch 4/6" should
> > > > not be a problem.
> > > >
> > > > When M4 is owned by Linux, Linux need handle the power domain.
> > > > If M4 is not owned
> > > > by Linux, SCU firmware will handle the power domain, and Linux
> > > > has no permission to
> > > > touch that.
> > > >
> > > > Thanks
> > > > Peng
> > > >
> > > > >
> > > > > Thanks,
> > > > > Mathieu
> > > > >
> > > > >
> > > > > [1].
> > > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
> > > > > .bootlin.com%2Flinux%2Fv6.0-
> > > > > rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
> > > > > 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > > > > c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > > > > 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > > > > MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > > > > JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > > > > =0
> > > > >
> > > > > > +
> > > > > > + priv->rproc->state = RPROC_DETACHED;
> > > > > > + priv->rproc->recovery_disabled = true;
> > > > > > +
> > > > > > + /* Get partition id and enable irq in SCFW */
> > > > > > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > > > > priv->rsrc_id, &pt);
> > > > > > + if (ret) {
> > > > > > + dev_err(dev, "not able to get resource owner\n");
> > > > > > + return ret;
> > > > > > + }
> > > > > > +
> > > > > > + priv->rproc_pt = pt;
> > > > > > + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
> > > > > > +
> > > > > > + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > > > > + if (ret) {
> > > > > > + dev_warn(dev, "register scu notifier failed.\n");
> > > > > > + return ret;
> > > > > > + }
> > > > > > +
> > > > > > + ret =
> > > > > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
> > > > > > rproc_pt),
> > > > > > + true);
> > > > > > + if (ret) {
> > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > + dev_warn(dev, "Enable irq failed.\n");
> > > > > > + return ret;
> > > > > > + }
> > > > > > +
> > > > > > + return 0;
> > > > > > default:
> > > > > > break;
> > > > > > }
> > > > > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
> > > > > > *pdev)
> > > > > >
> > > > > > ret = imx_rproc_clk_enable(priv);
> > > > > > if (ret)
> > > > > > - goto err_put_mbox;
> > > > > > + goto err_put_scu;
> > > > > >
> > > > > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > > > > >
> > > > > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
> > > > > > *pdev)
> > > > > >
> > > > > > err_put_clk:
> > > > > > clk_disable_unprepare(priv->clk);
> > > > > > +err_put_scu:
> > > > > > + imx_rproc_put_scu(rproc);
> > > > > > err_put_mbox:
> > > > > > imx_rproc_free_mbox(rproc);
> > > > > > err_put_wkq:
> > > > > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > > > > platform_device
> > > > > > *pdev)
> > > > > >
> > > > > > clk_disable_unprepare(priv->clk);
> > > > > > rproc_del(rproc);
> > > > > > + imx_rproc_put_scu(rproc);
> > > > > > imx_rproc_free_mbox(rproc);
> > > > > > destroy_workqueue(priv->workqueue);
> > > > > > rproc_free(rproc);
> > > > > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > > > > imx_rproc_of_match[] = {
> > > > > > { .compatible = "fsl,imx8mm-cm4", .data =
> > > > > &imx_rproc_cfg_imx8mq },
> > > > > > { .compatible = "fsl,imx8mn-cm7", .data =
> > > > > &imx_rproc_cfg_imx8mn },
> > > > > > { .compatible = "fsl,imx8mp-cm7", .data =
> > > > > &imx_rproc_cfg_imx8mn },
> > > > > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > > > > &imx_rproc_cfg_imx8qxp },
> > > > > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > > > > &imx_rproc_cfg_imx8ulp },
> > > > > > { .compatible = "fsl,imx93-cm33", .data =
> > > > > > &imx_rproc_cfg_imx93 },
> > > > > > {},
> > > > > > --
> > > > > > 2.37.1
> > > > > >
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-28 17:30 ` Mathieu Poirier
0 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-28 17:30 UTC (permalink / raw)
To: Peng Fan
Cc: Peng Fan, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> Hi Mathieu,
>
> On 9/28/2022 3:39 PM, Peng Fan wrote:
> >
> >
> > On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> > > On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> > > > Hi Mathieu,
> > > >
> > > > Thanks for reviewing this patchset.
> > > > > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> > > > > i.MX8QXP M4
> > > > >
> > > > > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > > >
> > > > > > When M4 is kicked by SCFW, M4 runs in its own hardware partition,
> > > > > > Linux could only do IPC with M4, it could not start,
> > > > > > stop, update image.
> > > > > >
> > > > > > We disable recovery reboot when M4 is managed by SCFW, because
> > > > > > remoteproc core still not support M4 auto-recovery without loading
> > > > > > image.
> > > > > >
> > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > > > > ---
> > > > > > drivers/remoteproc/imx_rproc.c | 108
> > > > > > ++++++++++++++++++++++++++++++++-
> > > > > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > > > > >
> > > > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > > > b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..bcba74e90020
> > > > > > 100644
> > > > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > > > @@ -6,6 +6,7 @@
> > > > > > #include <linux/arm-smccc.h>
> > > > > > #include <linux/clk.h>
> > > > > > #include <linux/err.h>
> > > > > > +#include <linux/firmware/imx/sci.h>
> > > > > > #include <linux/interrupt.h>
> > > > > > #include <linux/kernel.h>
> > > > > > #include <linux/mailbox_client.h>
> > > > > > @@ -59,6 +60,8 @@
> > > > > > #define IMX_SIP_RPROC_STARTED 0x01
> > > > > > #define IMX_SIP_RPROC_STOP 0x02
> > > > > >
> > > > > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > > > > +
> > > > > > /**
> > > > > > * struct imx_rproc_mem - slim internal memory structure
> > > > > > * @cpu_addr: MPU virtual address of the memory region @@ -89,6
> > > > > > +92,10 @@ struct imx_rproc {
> > > > > > struct work_struct rproc_work;
> > > > > > struct workqueue_struct *workqueue;
> > > > > > void __iomem *rsc_table;
> > > > > > + struct imx_sc_ipc *ipc_handle;
> > > > > > + struct notifier_block rproc_nb;
> > > > > > + u32 rproc_pt; /* partition id */
> > > > > > + u32 rsrc_id; /* resource id */
> > > > > > };
> > > > > >
> > > > > > static const struct imx_rproc_att
> > > > > > imx_rproc_att_imx93[] = { @@ -117,6
> > > > > > +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = {
> > > > > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > > > > >
> > > > > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
> > > > > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > > > > + /* TCML/U */
> > > > > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM },
> > > > > > + /* OCRAM(Low 96KB) */
> > > > > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > > > > + /* OCRAM */
> > > > > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > > > > + /* DDR (Data) */
> > > > > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > > > > +
> > > > > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
> > > > > > /* dev addr , sys addr , size , flags */
> > > > > > /* ITCM */
> > > > > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > > > > imx_rproc_cfg_imx8mq = {
> > > > > > .method = IMX_RPROC_MMIO,
> > > > > > };
> > > > > >
> > > > > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> > > > > > + .att = imx_rproc_att_imx8qxp,
> > > > > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > > > > + .method = IMX_RPROC_SCU_API,
> > > > > > +};
> > > > > > +
> > > > > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> > > > > > .att = imx_rproc_att_imx8ulp,
> > > > > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > > > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc
> > > > > *rproc)
> > > > > > mbox_free_channel(priv->rx_ch);
> > > > > > }
> > > > > >
> > > > > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > > > > + struct imx_rproc *priv = rproc->priv;
> > > > > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > > > > +
> > > > > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > > > > + return;
> > > > > > +
> > > > > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > priv->rsrc_id))
> > > > > > + return;
> > > > > > +
> > > > > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > > > > BIT(priv->rproc_pt), false);
> > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > +}
> > > > > > +
> > > > > > +static int imx_rproc_partition_notify(struct notifier_block *nb,
> > > > > > + unsigned long event, void *group) {
> > > > > > + struct imx_rproc *priv = container_of(nb, struct imx_rproc,
> > > > > > +rproc_nb);
> > > > > > +
> > > > > > + /* Ignore other irqs */
> > > > > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > > > > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > > > > + return 0;
> > > > > > +
> > > > > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > > > > +
> > > > > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > > > > +
> > > > > > + return 0;
> > > > > > +}
> > > > > > +
> > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv) {
> > > > > > struct regmap_config config = { .name = "imx-rproc" }; @@ -689,6
> > > > > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > > > > struct arm_smccc_res res;
> > > > > > int ret;
> > > > > > u32 val;
> > > > > > + u8 pt;
> > > > > >
> > > > > > switch (dcfg->method) {
> > > > > > case IMX_RPROC_NONE:
> > > > > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > > > > imx_rproc *priv)
> > > > > > if (res.a0)
> > > > > > priv->rproc->state = RPROC_DETACHED;
> > > > > > return 0;
> > > > > > + case IMX_RPROC_SCU_API:
> > > > > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > > > > + if (ret)
> > > > > > + return ret;
> > > > > > + ret = of_property_read_u32(dev->of_node, "fsl,resource-id",
> > > > > &priv->rsrc_id);
> > > > > > + if (ret) {
> > > > > > + dev_err(dev, "No fsl,resource-id property\n");
> > > > > > + return ret;
> > > > > > + }
> > > > > > +
> > > > > > + /*
> > > > > > + * If Mcore resource is not owned by Acore partition, It is
> > > > > kicked by ROM,
> > > > > > + * and Linux could only do IPC with Mcore and nothing else.
> > > > > > + */
> > > > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv-
> > > > > > rsrc_id))
> > > > > > + return 0;
> > > > >
> > > > > If imx_sc_rm_is_resource_owned() return '1' than the remote
> > > > > processor is
> > > > > under Linux's control and what follows below is not needed.
> > > > > That is also
> > > > > coherent with the comment in [1].
> > > >
> > > > Case 1: If M4 is owned by Linux, here directly return 0.
> > > > Case 2: If M4 is not owned by Linux, the following code after
> > > > this line will set
> > > > state as RPROC_DETACHED.
> > >
> > > I understand that part.
> > >
> > > >
> > > > Patch 3/6(this patch) is only to support case 2.
> > > > Patch 4/6 is to support case 1.
> > > >
> > >
> > > Let's leave the subsequent patches alone for now.
> > >
> > > > >
> > > > > That is in contrast with what is happening in
> > > > > imx_rproc_put_scu(). There, if
> > > > > the remote processor is _not_ owned by Linux than the condition returns
> > > > > without calling imx_scu_irq_group_enable() and
> > > > > imx_scu_irq_unregister_notifier(). That seems to be a bug.
> > > >
> > > > No. The two functions only needed when M4 is in a separate
> > > > hardware partition.
> > > >
> > > > The scu irq is only needed when M4 is out of linux control and need some
> > > > notification such as M4 is reset by SCU(System Control Unit).
> > > > That linux got
> > > > notification that M4 is reset by SCU.
> > >
> > > I also understand that part.
> > >
> > > What I am underlining here is that when the M4 is independent, function
> > > imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> > > called but
> > > their cleanup equivalent are not called in imx_rproc_put_scu()
> > > because of the '!'
> > > in the if() statement.
> >
> > you are right, this is bug in my side. It should be as below based on
> > patch 3/6.
> >
> > diff --git a/drivers/remoteproc/imx_rproc.c
> > b/drivers/remoteproc/imx_rproc.c
> > index bcba74e90020..a56aecae00c6 100644
> > --- a/drivers/remoteproc/imx_rproc.c
> > +++ b/drivers/remoteproc/imx_rproc.c
> > @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc *rproc)
> > if (dcfg->method != IMX_RPROC_SCU_API)
> > return;
> >
> > - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
Indeed, which raises questions about how this patchset was tested. And it is
not the first time we touch base on that.
> > return;
> >
> > Thanks for detailed reviewing.
>
> If you are fine with this change, I could send out V6. Anyway, I'll wait
> to see if you have other comments in this patchset.
>
I am out of time for this patchset and as such will not provide more comments
on this revision.
> Thanks,
> Peng.
>
> >
> > Thanks,
> > Peng.
> >
> > >
> > > >
> > > > >
> > > > > There is also a problem in patch 4/6 associated to that.
> > > >
> > > > If the upper explanation eliminate your concern, "a problem in
> > > > patch 4/6" should
> > > > not be a problem.
> > > >
> > > > When M4 is owned by Linux, Linux need handle the power domain.
> > > > If M4 is not owned
> > > > by Linux, SCU firmware will handle the power domain, and Linux
> > > > has no permission to
> > > > touch that.
> > > >
> > > > Thanks
> > > > Peng
> > > >
> > > > >
> > > > > Thanks,
> > > > > Mathieu
> > > > >
> > > > >
> > > > > [1].
> > > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felixir
> > > > > .bootlin.com%2Flinux%2Fv6.0-
> > > > > rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=0
> > > > > 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > > > > c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > > > > 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > > > > MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > > > > JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > > > > =0
> > > > >
> > > > > > +
> > > > > > + priv->rproc->state = RPROC_DETACHED;
> > > > > > + priv->rproc->recovery_disabled = true;
> > > > > > +
> > > > > > + /* Get partition id and enable irq in SCFW */
> > > > > > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > > > > priv->rsrc_id, &pt);
> > > > > > + if (ret) {
> > > > > > + dev_err(dev, "not able to get resource owner\n");
> > > > > > + return ret;
> > > > > > + }
> > > > > > +
> > > > > > + priv->rproc_pt = pt;
> > > > > > + priv->rproc_nb.notifier_call = imx_rproc_partition_notify;
> > > > > > +
> > > > > > + ret = imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > > > > + if (ret) {
> > > > > > + dev_warn(dev, "register scu notifier failed.\n");
> > > > > > + return ret;
> > > > > > + }
> > > > > > +
> > > > > > + ret =
> > > > > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv-
> > > > > > rproc_pt),
> > > > > > + true);
> > > > > > + if (ret) {
> > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > + dev_warn(dev, "Enable irq failed.\n");
> > > > > > + return ret;
> > > > > > + }
> > > > > > +
> > > > > > + return 0;
> > > > > > default:
> > > > > > break;
> > > > > > }
> > > > > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device
> > > > > > *pdev)
> > > > > >
> > > > > > ret = imx_rproc_clk_enable(priv);
> > > > > > if (ret)
> > > > > > - goto err_put_mbox;
> > > > > > + goto err_put_scu;
> > > > > >
> > > > > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > > > > >
> > > > > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device
> > > > > > *pdev)
> > > > > >
> > > > > > err_put_clk:
> > > > > > clk_disable_unprepare(priv->clk);
> > > > > > +err_put_scu:
> > > > > > + imx_rproc_put_scu(rproc);
> > > > > > err_put_mbox:
> > > > > > imx_rproc_free_mbox(rproc);
> > > > > > err_put_wkq:
> > > > > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > > > > platform_device
> > > > > > *pdev)
> > > > > >
> > > > > > clk_disable_unprepare(priv->clk);
> > > > > > rproc_del(rproc);
> > > > > > + imx_rproc_put_scu(rproc);
> > > > > > imx_rproc_free_mbox(rproc);
> > > > > > destroy_workqueue(priv->workqueue);
> > > > > > rproc_free(rproc);
> > > > > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > > > > imx_rproc_of_match[] = {
> > > > > > { .compatible = "fsl,imx8mm-cm4", .data =
> > > > > &imx_rproc_cfg_imx8mq },
> > > > > > { .compatible = "fsl,imx8mn-cm7", .data =
> > > > > &imx_rproc_cfg_imx8mn },
> > > > > > { .compatible = "fsl,imx8mp-cm7", .data =
> > > > > &imx_rproc_cfg_imx8mn },
> > > > > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > > > > &imx_rproc_cfg_imx8qxp },
> > > > > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > > > > &imx_rproc_cfg_imx8ulp },
> > > > > > { .compatible = "fsl,imx93-cm33", .data =
> > > > > > &imx_rproc_cfg_imx93 },
> > > > > > {},
> > > > > > --
> > > > > > 2.37.1
> > > > > >
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-28 17:30 ` Mathieu Poirier
@ 2022-09-29 2:30 ` Peng Fan
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-29 2:30 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan (OSS)
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> i.MX8QXP M4
>
> On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> > Hi Mathieu,
> >
> > On 9/28/2022 3:39 PM, Peng Fan wrote:
> > >
> > >
> > > On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> > > > On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> > > > > Hi Mathieu,
> > > > >
> > > > > Thanks for reviewing this patchset.
> > > > > > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
> > > > > > attaching to i.MX8QXP M4
> > > > > >
> > > > > > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > > > >
> > > > > > > When M4 is kicked by SCFW, M4 runs in its own hardware
> > > > > > > partition, Linux could only do IPC with M4, it could not
> > > > > > > start, stop, update image.
> > > > > > >
> > > > > > > We disable recovery reboot when M4 is managed by SCFW,
> > > > > > > because remoteproc core still not support M4 auto-recovery
> > > > > > > without loading image.
> > > > > > >
> > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > > > > > ---
> > > > > > > drivers/remoteproc/imx_rproc.c | 108
> > > > > > > ++++++++++++++++++++++++++++++++-
> > > > > > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > > > > > >
> > > > > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > > > > b/drivers/remoteproc/imx_rproc.c index
> > > > > > > 7cc4fd207e2d..bcba74e90020
> > > > > > > 100644
> > > > > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > > > > @@ -6,6 +6,7 @@
> > > > > > > #include <linux/arm-smccc.h>
> > > > > > > #include <linux/clk.h>
> > > > > > > #include <linux/err.h>
> > > > > > > +#include <linux/firmware/imx/sci.h>
> > > > > > > #include <linux/interrupt.h>
> > > > > > > #include <linux/kernel.h>
> > > > > > > #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
> > > > > > > #define IMX_SIP_RPROC_STARTED 0x01
> > > > > > > #define IMX_SIP_RPROC_STOP 0x02
> > > > > > >
> > > > > > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > > > > > +
> > > > > > > /**
> > > > > > > * struct imx_rproc_mem - slim internal memory structure
> > > > > > > * @cpu_addr: MPU virtual address of the memory region @@
> > > > > > > -89,6
> > > > > > > +92,10 @@ struct imx_rproc {
> > > > > > > struct work_struct rproc_work;
> > > > > > > struct workqueue_struct *workqueue;
> > > > > > > void __iomem *rsc_table;
> > > > > > > + struct imx_sc_ipc *ipc_handle;
> > > > > > > + struct notifier_block rproc_nb;
> > > > > > > + u32 rproc_pt; /* partition id */
> > > > > > > + u32 rsrc_id; /* resource id */
> > > > > > > };
> > > > > > >
> > > > > > > static const struct imx_rproc_att imx_rproc_att_imx93[] =
> > > > > > > { @@ -117,6
> > > > > > > +124,18 @@ static const struct imx_rproc_att
> > > > > > > +imx_rproc_att_imx93[] = {
> > > > > > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > > > > > >
> > > > > > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
> > > > > > > +{
> > > > > > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > > > > > + /* TCML/U */
> > > > > > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
> > > > > > > +ATT_IOMEM },
> > > > > > > + /* OCRAM(Low 96KB) */
> > > > > > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > > > > > + /* OCRAM */
> > > > > > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > > > > > + /* DDR (Data) */
> > > > > > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > > > > > +
> > > > > > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
> > > > > > > {
> > > > > > > /* dev addr , sys addr , size , flags */
> > > > > > > /* ITCM */
> > > > > > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > > > > > imx_rproc_cfg_imx8mq = {
> > > > > > > .method = IMX_RPROC_MMIO,
> > > > > > > };
> > > > > > >
> > > > > > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
> > > > > > > +{
> > > > > > > + .att = imx_rproc_att_imx8qxp,
> > > > > > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > > > > > + .method = IMX_RPROC_SCU_API, };
> > > > > > > +
> > > > > > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
> > > > > > > {
> > > > > > > .att = imx_rproc_att_imx8ulp,
> > > > > > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > > > > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
> > > > > > > rproc
> > > > > > *rproc)
> > > > > > > mbox_free_channel(priv->rx_ch);
> > > > > > > }
> > > > > > >
> > > > > > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > > > > > + struct imx_rproc *priv = rproc->priv;
> > > > > > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > > > > > +
> > > > > > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > > > > > + return;
> > > > > > > +
> > > > > > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > priv->rsrc_id))
> > > > > > > + return;
> > > > > > > +
> > > > > > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > > > > > BIT(priv->rproc_pt), false);
> > > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > +}
> > > > > > > +
> > > > > > > +static int imx_rproc_partition_notify(struct notifier_block
> > > > > > > +*nb,
> > > > > > > + unsigned long event, void *group) {
> > > > > > > + struct imx_rproc *priv = container_of(nb, struct
> > > > > > > +imx_rproc, rproc_nb);
> > > > > > > +
> > > > > > > + /* Ignore other irqs */
> > > > > > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > > > > > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > > > > > + return 0;
> > > > > > > +
> > > > > > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > > > > > +
> > > > > > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > +}
> > > > > > > +
> > > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > > > > > {
> > > > > > > struct regmap_config config = { .name = "imx-rproc" };
> > > > > > > @@ -689,6
> > > > > > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
> > > > > > > +*priv)
> > > > > > > struct arm_smccc_res res;
> > > > > > > int ret;
> > > > > > > u32 val;
> > > > > > > + u8 pt;
> > > > > > >
> > > > > > > switch (dcfg->method) {
> > > > > > > case IMX_RPROC_NONE:
> > > > > > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > > > > > imx_rproc *priv)
> > > > > > > if (res.a0)
> > > > > > > priv->rproc->state = RPROC_DETACHED;
> > > > > > > return 0;
> > > > > > > + case IMX_RPROC_SCU_API:
> > > > > > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > > > > > + if (ret)
> > > > > > > + return ret;
> > > > > > > + ret = of_property_read_u32(dev->of_node,
> > > > > > > +"fsl,resource-id",
> > > > > > &priv->rsrc_id);
> > > > > > > + if (ret) {
> > > > > > > + dev_err(dev, "No fsl,resource-id property\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + /*
> > > > > > > + * If Mcore resource is not owned by Acore
> > > > > > > +partition, It is
> > > > > > kicked by ROM,
> > > > > > > + * and Linux could only do IPC with Mcore and nothing else.
> > > > > > > + */
> > > > > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > +priv-
> > > > > > > rsrc_id))
> > > > > > > + return 0;
> > > > > >
> > > > > > If imx_sc_rm_is_resource_owned() return '1' than the remote
> > > > > > processor is under Linux's control and what follows below is
> > > > > > not needed.
> > > > > > That is also
> > > > > > coherent with the comment in [1].
> > > > >
> > > > > Case 1: If M4 is owned by Linux, here directly return 0.
> > > > > Case 2: If M4 is not owned by Linux, the following code after
> > > > > this line will set state as RPROC_DETACHED.
> > > >
> > > > I understand that part.
> > > >
> > > > >
> > > > > Patch 3/6(this patch) is only to support case 2.
> > > > > Patch 4/6 is to support case 1.
> > > > >
> > > >
> > > > Let's leave the subsequent patches alone for now.
> > > >
> > > > > >
> > > > > > That is in contrast with what is happening in
> > > > > > imx_rproc_put_scu(). There, if the remote processor is _not_
> > > > > > owned by Linux than the condition returns without calling
> > > > > > imx_scu_irq_group_enable() and
> > > > > > imx_scu_irq_unregister_notifier(). That seems to be a bug.
> > > > >
> > > > > No. The two functions only needed when M4 is in a separate
> > > > > hardware partition.
> > > > >
> > > > > The scu irq is only needed when M4 is out of linux control and
> > > > > need some notification such as M4 is reset by SCU(System Control
> Unit).
> > > > > That linux got
> > > > > notification that M4 is reset by SCU.
> > > >
> > > > I also understand that part.
> > > >
> > > > What I am underlining here is that when the M4 is independent,
> > > > function
> > > > imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> > > > called but their cleanup equivalent are not called in
> > > > imx_rproc_put_scu() because of the '!'
> > > > in the if() statement.
> > >
> > > you are right, this is bug in my side. It should be as below based
> > > on patch 3/6.
> > >
> > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
> > > 100644
> > > --- a/drivers/remoteproc/imx_rproc.c
> > > +++ b/drivers/remoteproc/imx_rproc.c
> > > @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
> > > *rproc)
> > > if (dcfg->method != IMX_RPROC_SCU_API)
> > > return;
> > >
> > > - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > priv->rsrc_id))
> > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > +priv->rsrc_id))
>
> Indeed, which raises questions about how this patchset was tested. And it
> is not the first time we touch base on that.
Patch 4/6 has such change that fixed the issue you mentioned. I need update
patch 3, 4 to avoid mix together.
- if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
- return;
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ return imx_rproc_detach_pd(rproc);
>
> > > return;
> > >
> > > Thanks for detailed reviewing.
> >
> > If you are fine with this change, I could send out V6. Anyway, I'll
> > wait to see if you have other comments in this patchset.
> >
>
> I am out of time for this patchset and as such will not provide more
> comments on this revision.
Sure, thanks for your time.
Thanks,
Peng.
>
> > Thanks,
> > Peng.
> >
> > >
> > > Thanks,
> > > Peng.
> > >
> > > >
> > > > >
> > > > > >
> > > > > > There is also a problem in patch 4/6 associated to that.
> > > > >
> > > > > If the upper explanation eliminate your concern, "a problem in
> > > > > patch 4/6" should not be a problem.
> > > > >
> > > > > When M4 is owned by Linux, Linux need handle the power domain.
> > > > > If M4 is not owned
> > > > > by Linux, SCU firmware will handle the power domain, and Linux
> > > > > has no permission to touch that.
> > > > >
> > > > > Thanks
> > > > > Peng
> > > > >
> > > > > >
> > > > > > Thanks,
> > > > > > Mathieu
> > > > > >
> > > > > >
> > > > > > [1].
> > > > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
> > > > > > F%2Felixir
> > > > > > .bootlin.com%2Flinux%2Fv6.0-
> > > > > >
> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
> > > > > > 0
> > > > > >
> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > > > > >
> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > > > > >
> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > > > > >
> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > > > > >
> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > > > > > =0
> > > > > >
> > > > > > > +
> > > > > > > + priv->rproc->state = RPROC_DETACHED;
> > > > > > > + priv->rproc->recovery_disabled = true;
> > > > > > > +
> > > > > > > + /* Get partition id and enable irq in SCFW */
> > > > > > > + ret =
> > > > > > > +imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > > > > > priv->rsrc_id, &pt);
> > > > > > > + if (ret) {
> > > > > > > + dev_err(dev, "not able to get resource
> > > > > > > +owner\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + priv->rproc_pt = pt;
> > > > > > > + priv->rproc_nb.notifier_call =
> > > > > > > +imx_rproc_partition_notify;
> > > > > > > +
> > > > > > > + ret =
> > > > > > > +imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > > > > > + if (ret) {
> > > > > > > + dev_warn(dev, "register scu notifier
> > > > > > > +failed.\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + ret =
> > > > > > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> BIT(priv-
> > > > > > > rproc_pt),
> > > > > > > + true);
> > > > > > > + if (ret) {
> > > > > > > +
> > > > > > > +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > + dev_warn(dev, "Enable irq failed.\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > default:
> > > > > > > break;
> > > > > > > }
> > > > > > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
> > > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > ret = imx_rproc_clk_enable(priv);
> > > > > > > if (ret)
> > > > > > > - goto err_put_mbox;
> > > > > > > + goto err_put_scu;
> > > > > > >
> > > > > > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > > > > > >
> > > > > > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
> > > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > err_put_clk:
> > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > +err_put_scu:
> > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > err_put_mbox:
> > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > err_put_wkq:
> > > > > > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > rproc_del(rproc);
> > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > destroy_workqueue(priv->workqueue);
> > > > > > > rproc_free(rproc);
> > > > > > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > > > > > imx_rproc_of_match[] = {
> > > > > > > { .compatible = "fsl,imx8mm-cm4", .data =
> > > > > > &imx_rproc_cfg_imx8mq },
> > > > > > > { .compatible = "fsl,imx8mn-cm7", .data =
> > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > { .compatible = "fsl,imx8mp-cm7", .data =
> > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > > > > > &imx_rproc_cfg_imx8qxp },
> > > > > > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > > > > > &imx_rproc_cfg_imx8ulp },
> > > > > > > { .compatible = "fsl,imx93-cm33", .data =
> > > > > > > &imx_rproc_cfg_imx93 },
> > > > > > > {},
> > > > > > > --
> > > > > > > 2.37.1
> > > > > > >
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-29 2:30 ` Peng Fan
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-29 2:30 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan (OSS)
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> i.MX8QXP M4
>
> On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> > Hi Mathieu,
> >
> > On 9/28/2022 3:39 PM, Peng Fan wrote:
> > >
> > >
> > > On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> > > > On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> > > > > Hi Mathieu,
> > > > >
> > > > > Thanks for reviewing this patchset.
> > > > > > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
> > > > > > attaching to i.MX8QXP M4
> > > > > >
> > > > > > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > > > >
> > > > > > > When M4 is kicked by SCFW, M4 runs in its own hardware
> > > > > > > partition, Linux could only do IPC with M4, it could not
> > > > > > > start, stop, update image.
> > > > > > >
> > > > > > > We disable recovery reboot when M4 is managed by SCFW,
> > > > > > > because remoteproc core still not support M4 auto-recovery
> > > > > > > without loading image.
> > > > > > >
> > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > > > > > ---
> > > > > > > drivers/remoteproc/imx_rproc.c | 108
> > > > > > > ++++++++++++++++++++++++++++++++-
> > > > > > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > > > > > >
> > > > > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > > > > b/drivers/remoteproc/imx_rproc.c index
> > > > > > > 7cc4fd207e2d..bcba74e90020
> > > > > > > 100644
> > > > > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > > > > @@ -6,6 +6,7 @@
> > > > > > > #include <linux/arm-smccc.h>
> > > > > > > #include <linux/clk.h>
> > > > > > > #include <linux/err.h>
> > > > > > > +#include <linux/firmware/imx/sci.h>
> > > > > > > #include <linux/interrupt.h>
> > > > > > > #include <linux/kernel.h>
> > > > > > > #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
> > > > > > > #define IMX_SIP_RPROC_STARTED 0x01
> > > > > > > #define IMX_SIP_RPROC_STOP 0x02
> > > > > > >
> > > > > > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > > > > > +
> > > > > > > /**
> > > > > > > * struct imx_rproc_mem - slim internal memory structure
> > > > > > > * @cpu_addr: MPU virtual address of the memory region @@
> > > > > > > -89,6
> > > > > > > +92,10 @@ struct imx_rproc {
> > > > > > > struct work_struct rproc_work;
> > > > > > > struct workqueue_struct *workqueue;
> > > > > > > void __iomem *rsc_table;
> > > > > > > + struct imx_sc_ipc *ipc_handle;
> > > > > > > + struct notifier_block rproc_nb;
> > > > > > > + u32 rproc_pt; /* partition id */
> > > > > > > + u32 rsrc_id; /* resource id */
> > > > > > > };
> > > > > > >
> > > > > > > static const struct imx_rproc_att imx_rproc_att_imx93[] =
> > > > > > > { @@ -117,6
> > > > > > > +124,18 @@ static const struct imx_rproc_att
> > > > > > > +imx_rproc_att_imx93[] = {
> > > > > > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > > > > > >
> > > > > > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
> > > > > > > +{
> > > > > > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > > > > > + /* TCML/U */
> > > > > > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
> > > > > > > +ATT_IOMEM },
> > > > > > > + /* OCRAM(Low 96KB) */
> > > > > > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > > > > > + /* OCRAM */
> > > > > > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > > > > > + /* DDR (Data) */
> > > > > > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > > > > > +
> > > > > > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
> > > > > > > {
> > > > > > > /* dev addr , sys addr , size , flags */
> > > > > > > /* ITCM */
> > > > > > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > > > > > imx_rproc_cfg_imx8mq = {
> > > > > > > .method = IMX_RPROC_MMIO,
> > > > > > > };
> > > > > > >
> > > > > > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
> > > > > > > +{
> > > > > > > + .att = imx_rproc_att_imx8qxp,
> > > > > > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > > > > > + .method = IMX_RPROC_SCU_API, };
> > > > > > > +
> > > > > > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
> > > > > > > {
> > > > > > > .att = imx_rproc_att_imx8ulp,
> > > > > > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > > > > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
> > > > > > > rproc
> > > > > > *rproc)
> > > > > > > mbox_free_channel(priv->rx_ch);
> > > > > > > }
> > > > > > >
> > > > > > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > > > > > + struct imx_rproc *priv = rproc->priv;
> > > > > > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > > > > > +
> > > > > > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > > > > > + return;
> > > > > > > +
> > > > > > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > priv->rsrc_id))
> > > > > > > + return;
> > > > > > > +
> > > > > > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > > > > > BIT(priv->rproc_pt), false);
> > > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > +}
> > > > > > > +
> > > > > > > +static int imx_rproc_partition_notify(struct notifier_block
> > > > > > > +*nb,
> > > > > > > + unsigned long event, void *group) {
> > > > > > > + struct imx_rproc *priv = container_of(nb, struct
> > > > > > > +imx_rproc, rproc_nb);
> > > > > > > +
> > > > > > > + /* Ignore other irqs */
> > > > > > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > > > > > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > > > > > + return 0;
> > > > > > > +
> > > > > > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > > > > > +
> > > > > > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > +}
> > > > > > > +
> > > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > > > > > {
> > > > > > > struct regmap_config config = { .name = "imx-rproc" };
> > > > > > > @@ -689,6
> > > > > > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
> > > > > > > +*priv)
> > > > > > > struct arm_smccc_res res;
> > > > > > > int ret;
> > > > > > > u32 val;
> > > > > > > + u8 pt;
> > > > > > >
> > > > > > > switch (dcfg->method) {
> > > > > > > case IMX_RPROC_NONE:
> > > > > > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > > > > > imx_rproc *priv)
> > > > > > > if (res.a0)
> > > > > > > priv->rproc->state = RPROC_DETACHED;
> > > > > > > return 0;
> > > > > > > + case IMX_RPROC_SCU_API:
> > > > > > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > > > > > + if (ret)
> > > > > > > + return ret;
> > > > > > > + ret = of_property_read_u32(dev->of_node,
> > > > > > > +"fsl,resource-id",
> > > > > > &priv->rsrc_id);
> > > > > > > + if (ret) {
> > > > > > > + dev_err(dev, "No fsl,resource-id property\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + /*
> > > > > > > + * If Mcore resource is not owned by Acore
> > > > > > > +partition, It is
> > > > > > kicked by ROM,
> > > > > > > + * and Linux could only do IPC with Mcore and nothing else.
> > > > > > > + */
> > > > > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > +priv-
> > > > > > > rsrc_id))
> > > > > > > + return 0;
> > > > > >
> > > > > > If imx_sc_rm_is_resource_owned() return '1' than the remote
> > > > > > processor is under Linux's control and what follows below is
> > > > > > not needed.
> > > > > > That is also
> > > > > > coherent with the comment in [1].
> > > > >
> > > > > Case 1: If M4 is owned by Linux, here directly return 0.
> > > > > Case 2: If M4 is not owned by Linux, the following code after
> > > > > this line will set state as RPROC_DETACHED.
> > > >
> > > > I understand that part.
> > > >
> > > > >
> > > > > Patch 3/6(this patch) is only to support case 2.
> > > > > Patch 4/6 is to support case 1.
> > > > >
> > > >
> > > > Let's leave the subsequent patches alone for now.
> > > >
> > > > > >
> > > > > > That is in contrast with what is happening in
> > > > > > imx_rproc_put_scu(). There, if the remote processor is _not_
> > > > > > owned by Linux than the condition returns without calling
> > > > > > imx_scu_irq_group_enable() and
> > > > > > imx_scu_irq_unregister_notifier(). That seems to be a bug.
> > > > >
> > > > > No. The two functions only needed when M4 is in a separate
> > > > > hardware partition.
> > > > >
> > > > > The scu irq is only needed when M4 is out of linux control and
> > > > > need some notification such as M4 is reset by SCU(System Control
> Unit).
> > > > > That linux got
> > > > > notification that M4 is reset by SCU.
> > > >
> > > > I also understand that part.
> > > >
> > > > What I am underlining here is that when the M4 is independent,
> > > > function
> > > > imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> > > > called but their cleanup equivalent are not called in
> > > > imx_rproc_put_scu() because of the '!'
> > > > in the if() statement.
> > >
> > > you are right, this is bug in my side. It should be as below based
> > > on patch 3/6.
> > >
> > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
> > > 100644
> > > --- a/drivers/remoteproc/imx_rproc.c
> > > +++ b/drivers/remoteproc/imx_rproc.c
> > > @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
> > > *rproc)
> > > if (dcfg->method != IMX_RPROC_SCU_API)
> > > return;
> > >
> > > - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > priv->rsrc_id))
> > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > +priv->rsrc_id))
>
> Indeed, which raises questions about how this patchset was tested. And it
> is not the first time we touch base on that.
Patch 4/6 has such change that fixed the issue you mentioned. I need update
patch 3, 4 to avoid mix together.
- if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
- return;
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
+ return imx_rproc_detach_pd(rproc);
>
> > > return;
> > >
> > > Thanks for detailed reviewing.
> >
> > If you are fine with this change, I could send out V6. Anyway, I'll
> > wait to see if you have other comments in this patchset.
> >
>
> I am out of time for this patchset and as such will not provide more
> comments on this revision.
Sure, thanks for your time.
Thanks,
Peng.
>
> > Thanks,
> > Peng.
> >
> > >
> > > Thanks,
> > > Peng.
> > >
> > > >
> > > > >
> > > > > >
> > > > > > There is also a problem in patch 4/6 associated to that.
> > > > >
> > > > > If the upper explanation eliminate your concern, "a problem in
> > > > > patch 4/6" should not be a problem.
> > > > >
> > > > > When M4 is owned by Linux, Linux need handle the power domain.
> > > > > If M4 is not owned
> > > > > by Linux, SCU firmware will handle the power domain, and Linux
> > > > > has no permission to touch that.
> > > > >
> > > > > Thanks
> > > > > Peng
> > > > >
> > > > > >
> > > > > > Thanks,
> > > > > > Mathieu
> > > > > >
> > > > > >
> > > > > > [1].
> > > > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
> > > > > > F%2Felixir
> > > > > > .bootlin.com%2Flinux%2Fv6.0-
> > > > > >
> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
> > > > > > 0
> > > > > >
> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > > > > >
> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > > > > >
> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > > > > >
> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > > > > >
> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > > > > > =0
> > > > > >
> > > > > > > +
> > > > > > > + priv->rproc->state = RPROC_DETACHED;
> > > > > > > + priv->rproc->recovery_disabled = true;
> > > > > > > +
> > > > > > > + /* Get partition id and enable irq in SCFW */
> > > > > > > + ret =
> > > > > > > +imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > > > > > priv->rsrc_id, &pt);
> > > > > > > + if (ret) {
> > > > > > > + dev_err(dev, "not able to get resource
> > > > > > > +owner\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + priv->rproc_pt = pt;
> > > > > > > + priv->rproc_nb.notifier_call =
> > > > > > > +imx_rproc_partition_notify;
> > > > > > > +
> > > > > > > + ret =
> > > > > > > +imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > > > > > + if (ret) {
> > > > > > > + dev_warn(dev, "register scu notifier
> > > > > > > +failed.\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + ret =
> > > > > > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> BIT(priv-
> > > > > > > rproc_pt),
> > > > > > > + true);
> > > > > > > + if (ret) {
> > > > > > > +
> > > > > > > +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > + dev_warn(dev, "Enable irq failed.\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > default:
> > > > > > > break;
> > > > > > > }
> > > > > > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
> > > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > ret = imx_rproc_clk_enable(priv);
> > > > > > > if (ret)
> > > > > > > - goto err_put_mbox;
> > > > > > > + goto err_put_scu;
> > > > > > >
> > > > > > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > > > > > >
> > > > > > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
> > > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > err_put_clk:
> > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > +err_put_scu:
> > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > err_put_mbox:
> > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > err_put_wkq:
> > > > > > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > rproc_del(rproc);
> > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > destroy_workqueue(priv->workqueue);
> > > > > > > rproc_free(rproc);
> > > > > > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > > > > > imx_rproc_of_match[] = {
> > > > > > > { .compatible = "fsl,imx8mm-cm4", .data =
> > > > > > &imx_rproc_cfg_imx8mq },
> > > > > > > { .compatible = "fsl,imx8mn-cm7", .data =
> > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > { .compatible = "fsl,imx8mp-cm7", .data =
> > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > > > > > &imx_rproc_cfg_imx8qxp },
> > > > > > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > > > > > &imx_rproc_cfg_imx8ulp },
> > > > > > > { .compatible = "fsl,imx93-cm33", .data =
> > > > > > > &imx_rproc_cfg_imx93 },
> > > > > > > {},
> > > > > > > --
> > > > > > > 2.37.1
> > > > > > >
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-28 17:30 ` Mathieu Poirier
@ 2022-09-29 3:52 ` Peng Fan
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-29 3:52 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan (OSS)
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> i.MX8QXP M4
>
> On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> > Hi Mathieu,
> >
> > On 9/28/2022 3:39 PM, Peng Fan wrote:
> > >
> > >
> > > On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> > > > On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> > > > > Hi Mathieu,
> > > > >
> > > > > Thanks for reviewing this patchset.
> > > > > > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
> > > > > > attaching to i.MX8QXP M4
> > > > > >
> > > > > > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > > > >
> > > > > > > When M4 is kicked by SCFW, M4 runs in its own hardware
> > > > > > > partition, Linux could only do IPC with M4, it could not
> > > > > > > start, stop, update image.
> > > > > > >
> > > > > > > We disable recovery reboot when M4 is managed by SCFW,
> > > > > > > because remoteproc core still not support M4 auto-recovery
> > > > > > > without loading image.
> > > > > > >
> > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > > > > > ---
> > > > > > > drivers/remoteproc/imx_rproc.c | 108
> > > > > > > ++++++++++++++++++++++++++++++++-
> > > > > > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > > > > > >
> > > > > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > > > > b/drivers/remoteproc/imx_rproc.c index
> > > > > > > 7cc4fd207e2d..bcba74e90020
> > > > > > > 100644
> > > > > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > > > > @@ -6,6 +6,7 @@
> > > > > > > #include <linux/arm-smccc.h>
> > > > > > > #include <linux/clk.h>
> > > > > > > #include <linux/err.h>
> > > > > > > +#include <linux/firmware/imx/sci.h>
> > > > > > > #include <linux/interrupt.h>
> > > > > > > #include <linux/kernel.h>
> > > > > > > #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
> > > > > > > #define IMX_SIP_RPROC_STARTED 0x01
> > > > > > > #define IMX_SIP_RPROC_STOP 0x02
> > > > > > >
> > > > > > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > > > > > +
> > > > > > > /**
> > > > > > > * struct imx_rproc_mem - slim internal memory structure
> > > > > > > * @cpu_addr: MPU virtual address of the memory region @@
> > > > > > > -89,6
> > > > > > > +92,10 @@ struct imx_rproc {
> > > > > > > struct work_struct rproc_work;
> > > > > > > struct workqueue_struct *workqueue;
> > > > > > > void __iomem *rsc_table;
> > > > > > > + struct imx_sc_ipc *ipc_handle;
> > > > > > > + struct notifier_block rproc_nb;
> > > > > > > + u32 rproc_pt; /* partition id */
> > > > > > > + u32 rsrc_id; /* resource id */
> > > > > > > };
> > > > > > >
> > > > > > > static const struct imx_rproc_att imx_rproc_att_imx93[] =
> > > > > > > { @@ -117,6
> > > > > > > +124,18 @@ static const struct imx_rproc_att
> > > > > > > +imx_rproc_att_imx93[] = {
> > > > > > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > > > > > >
> > > > > > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
> > > > > > > +{
> > > > > > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > > > > > + /* TCML/U */
> > > > > > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
> > > > > > > +ATT_IOMEM },
> > > > > > > + /* OCRAM(Low 96KB) */
> > > > > > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > > > > > + /* OCRAM */
> > > > > > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > > > > > + /* DDR (Data) */
> > > > > > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > > > > > +
> > > > > > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
> > > > > > > {
> > > > > > > /* dev addr , sys addr , size , flags */
> > > > > > > /* ITCM */
> > > > > > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > > > > > imx_rproc_cfg_imx8mq = {
> > > > > > > .method = IMX_RPROC_MMIO,
> > > > > > > };
> > > > > > >
> > > > > > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
> > > > > > > +{
> > > > > > > + .att = imx_rproc_att_imx8qxp,
> > > > > > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > > > > > + .method = IMX_RPROC_SCU_API, };
> > > > > > > +
> > > > > > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
> > > > > > > {
> > > > > > > .att = imx_rproc_att_imx8ulp,
> > > > > > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > > > > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
> > > > > > > rproc
> > > > > > *rproc)
> > > > > > > mbox_free_channel(priv->rx_ch);
> > > > > > > }
> > > > > > >
> > > > > > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > > > > > + struct imx_rproc *priv = rproc->priv;
> > > > > > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > > > > > +
> > > > > > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > > > > > + return;
> > > > > > > +
> > > > > > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > priv->rsrc_id))
> > > > > > > + return;
> > > > > > > +
> > > > > > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > > > > > BIT(priv->rproc_pt), false);
> > > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > +}
> > > > > > > +
> > > > > > > +static int imx_rproc_partition_notify(struct notifier_block
> > > > > > > +*nb,
> > > > > > > + unsigned long event, void *group) {
> > > > > > > + struct imx_rproc *priv = container_of(nb, struct
> > > > > > > +imx_rproc, rproc_nb);
> > > > > > > +
> > > > > > > + /* Ignore other irqs */
> > > > > > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > > > > > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > > > > > + return 0;
> > > > > > > +
> > > > > > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > > > > > +
> > > > > > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > +}
> > > > > > > +
> > > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > > > > > {
> > > > > > > struct regmap_config config = { .name = "imx-rproc" };
> > > > > > > @@ -689,6
> > > > > > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
> > > > > > > +*priv)
> > > > > > > struct arm_smccc_res res;
> > > > > > > int ret;
> > > > > > > u32 val;
> > > > > > > + u8 pt;
> > > > > > >
> > > > > > > switch (dcfg->method) {
> > > > > > > case IMX_RPROC_NONE:
> > > > > > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > > > > > imx_rproc *priv)
> > > > > > > if (res.a0)
> > > > > > > priv->rproc->state = RPROC_DETACHED;
> > > > > > > return 0;
> > > > > > > + case IMX_RPROC_SCU_API:
> > > > > > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > > > > > + if (ret)
> > > > > > > + return ret;
> > > > > > > + ret = of_property_read_u32(dev->of_node,
> > > > > > > +"fsl,resource-id",
> > > > > > &priv->rsrc_id);
> > > > > > > + if (ret) {
> > > > > > > + dev_err(dev, "No fsl,resource-id property\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + /*
> > > > > > > + * If Mcore resource is not owned by Acore
> > > > > > > +partition, It is
> > > > > > kicked by ROM,
> > > > > > > + * and Linux could only do IPC with Mcore and nothing else.
> > > > > > > + */
> > > > > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > +priv-
> > > > > > > rsrc_id))
> > > > > > > + return 0;
> > > > > >
> > > > > > If imx_sc_rm_is_resource_owned() return '1' than the remote
> > > > > > processor is under Linux's control and what follows below is
> > > > > > not needed.
> > > > > > That is also
> > > > > > coherent with the comment in [1].
> > > > >
> > > > > Case 1: If M4 is owned by Linux, here directly return 0.
> > > > > Case 2: If M4 is not owned by Linux, the following code after
> > > > > this line will set state as RPROC_DETACHED.
> > > >
> > > > I understand that part.
> > > >
> > > > >
> > > > > Patch 3/6(this patch) is only to support case 2.
> > > > > Patch 4/6 is to support case 1.
> > > > >
> > > >
> > > > Let's leave the subsequent patches alone for now.
> > > >
> > > > > >
> > > > > > That is in contrast with what is happening in
> > > > > > imx_rproc_put_scu(). There, if the remote processor is _not_
> > > > > > owned by Linux than the condition returns without calling
> > > > > > imx_scu_irq_group_enable() and
> > > > > > imx_scu_irq_unregister_notifier(). That seems to be a bug.
> > > > >
> > > > > No. The two functions only needed when M4 is in a separate
> > > > > hardware partition.
> > > > >
> > > > > The scu irq is only needed when M4 is out of linux control and
> > > > > need some notification such as M4 is reset by SCU(System Control
> Unit).
> > > > > That linux got
> > > > > notification that M4 is reset by SCU.
> > > >
> > > > I also understand that part.
> > > >
> > > > What I am underlining here is that when the M4 is independent,
> > > > function
> > > > imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> > > > called but their cleanup equivalent are not called in
> > > > imx_rproc_put_scu() because of the '!'
> > > > in the if() statement.
> > >
> > > you are right, this is bug in my side. It should be as below based
> > > on patch 3/6.
> > >
> > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
> > > 100644
> > > --- a/drivers/remoteproc/imx_rproc.c
> > > +++ b/drivers/remoteproc/imx_rproc.c
> > > @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
> > > *rproc)
> > > if (dcfg->method != IMX_RPROC_SCU_API)
> > > return;
> > >
> > > - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > priv->rsrc_id))
> > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > +priv->rsrc_id))
>
> Indeed, which raises questions about how this patchset was tested. And it
> is not the first time we touch base on that.
Patch 4/6 has this change, anyway I should not mix patch 3,4 here.
>
> > > return;
> > >
> > > Thanks for detailed reviewing.
> >
> > If you are fine with this change, I could send out V6. Anyway, I'll
> > wait to see if you have other comments in this patchset.
> >
>
> I am out of time for this patchset and as such will not provide more
> comments on this revision.
Sure. Thanks for your time. Since you have applied the attach recovery
part, next version will enable this feature in imx rproc.
Thanks,
Peng.
>
> > Thanks,
> > Peng.
> >
> > >
> > > Thanks,
> > > Peng.
> > >
> > > >
> > > > >
> > > > > >
> > > > > > There is also a problem in patch 4/6 associated to that.
> > > > >
> > > > > If the upper explanation eliminate your concern, "a problem in
> > > > > patch 4/6" should not be a problem.
> > > > >
> > > > > When M4 is owned by Linux, Linux need handle the power domain.
> > > > > If M4 is not owned
> > > > > by Linux, SCU firmware will handle the power domain, and Linux
> > > > > has no permission to touch that.
> > > > >
> > > > > Thanks
> > > > > Peng
> > > > >
> > > > > >
> > > > > > Thanks,
> > > > > > Mathieu
> > > > > >
> > > > > >
> > > > > > [1].
> > > > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
> > > > > > F%2Felixir
> > > > > > .bootlin.com%2Flinux%2Fv6.0-
> > > > > >
> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
> > > > > > 0
> > > > > >
> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > > > > >
> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > > > > >
> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > > > > >
> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > > > > >
> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > > > > > =0
> > > > > >
> > > > > > > +
> > > > > > > + priv->rproc->state = RPROC_DETACHED;
> > > > > > > + priv->rproc->recovery_disabled = true;
> > > > > > > +
> > > > > > > + /* Get partition id and enable irq in SCFW */
> > > > > > > + ret =
> > > > > > > +imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > > > > > priv->rsrc_id, &pt);
> > > > > > > + if (ret) {
> > > > > > > + dev_err(dev, "not able to get resource
> > > > > > > +owner\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + priv->rproc_pt = pt;
> > > > > > > + priv->rproc_nb.notifier_call =
> > > > > > > +imx_rproc_partition_notify;
> > > > > > > +
> > > > > > > + ret =
> > > > > > > +imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > > > > > + if (ret) {
> > > > > > > + dev_warn(dev, "register scu notifier
> > > > > > > +failed.\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + ret =
> > > > > > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> BIT(priv-
> > > > > > > rproc_pt),
> > > > > > > + true);
> > > > > > > + if (ret) {
> > > > > > > +
> > > > > > > +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > + dev_warn(dev, "Enable irq failed.\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > default:
> > > > > > > break;
> > > > > > > }
> > > > > > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
> > > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > ret = imx_rproc_clk_enable(priv);
> > > > > > > if (ret)
> > > > > > > - goto err_put_mbox;
> > > > > > > + goto err_put_scu;
> > > > > > >
> > > > > > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > > > > > >
> > > > > > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
> > > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > err_put_clk:
> > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > +err_put_scu:
> > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > err_put_mbox:
> > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > err_put_wkq:
> > > > > > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > rproc_del(rproc);
> > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > destroy_workqueue(priv->workqueue);
> > > > > > > rproc_free(rproc);
> > > > > > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > > > > > imx_rproc_of_match[] = {
> > > > > > > { .compatible = "fsl,imx8mm-cm4", .data =
> > > > > > &imx_rproc_cfg_imx8mq },
> > > > > > > { .compatible = "fsl,imx8mn-cm7", .data =
> > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > { .compatible = "fsl,imx8mp-cm7", .data =
> > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > > > > > &imx_rproc_cfg_imx8qxp },
> > > > > > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > > > > > &imx_rproc_cfg_imx8ulp },
> > > > > > > { .compatible = "fsl,imx93-cm33", .data =
> > > > > > > &imx_rproc_cfg_imx93 },
> > > > > > > {},
> > > > > > > --
> > > > > > > 2.37.1
> > > > > > >
^ permalink raw reply [flat|nested] 40+ messages in thread
* RE: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-29 3:52 ` Peng Fan
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-29 3:52 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan (OSS)
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> i.MX8QXP M4
>
> On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> > Hi Mathieu,
> >
> > On 9/28/2022 3:39 PM, Peng Fan wrote:
> > >
> > >
> > > On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> > > > On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> > > > > Hi Mathieu,
> > > > >
> > > > > Thanks for reviewing this patchset.
> > > > > > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
> > > > > > attaching to i.MX8QXP M4
> > > > > >
> > > > > > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > > > >
> > > > > > > When M4 is kicked by SCFW, M4 runs in its own hardware
> > > > > > > partition, Linux could only do IPC with M4, it could not
> > > > > > > start, stop, update image.
> > > > > > >
> > > > > > > We disable recovery reboot when M4 is managed by SCFW,
> > > > > > > because remoteproc core still not support M4 auto-recovery
> > > > > > > without loading image.
> > > > > > >
> > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > > > > > ---
> > > > > > > drivers/remoteproc/imx_rproc.c | 108
> > > > > > > ++++++++++++++++++++++++++++++++-
> > > > > > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > > > > > >
> > > > > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > > > > b/drivers/remoteproc/imx_rproc.c index
> > > > > > > 7cc4fd207e2d..bcba74e90020
> > > > > > > 100644
> > > > > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > > > > @@ -6,6 +6,7 @@
> > > > > > > #include <linux/arm-smccc.h>
> > > > > > > #include <linux/clk.h>
> > > > > > > #include <linux/err.h>
> > > > > > > +#include <linux/firmware/imx/sci.h>
> > > > > > > #include <linux/interrupt.h>
> > > > > > > #include <linux/kernel.h>
> > > > > > > #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
> > > > > > > #define IMX_SIP_RPROC_STARTED 0x01
> > > > > > > #define IMX_SIP_RPROC_STOP 0x02
> > > > > > >
> > > > > > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > > > > > +
> > > > > > > /**
> > > > > > > * struct imx_rproc_mem - slim internal memory structure
> > > > > > > * @cpu_addr: MPU virtual address of the memory region @@
> > > > > > > -89,6
> > > > > > > +92,10 @@ struct imx_rproc {
> > > > > > > struct work_struct rproc_work;
> > > > > > > struct workqueue_struct *workqueue;
> > > > > > > void __iomem *rsc_table;
> > > > > > > + struct imx_sc_ipc *ipc_handle;
> > > > > > > + struct notifier_block rproc_nb;
> > > > > > > + u32 rproc_pt; /* partition id */
> > > > > > > + u32 rsrc_id; /* resource id */
> > > > > > > };
> > > > > > >
> > > > > > > static const struct imx_rproc_att imx_rproc_att_imx93[] =
> > > > > > > { @@ -117,6
> > > > > > > +124,18 @@ static const struct imx_rproc_att
> > > > > > > +imx_rproc_att_imx93[] = {
> > > > > > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > > > > > >
> > > > > > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
> > > > > > > +{
> > > > > > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > > > > > + /* TCML/U */
> > > > > > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
> > > > > > > +ATT_IOMEM },
> > > > > > > + /* OCRAM(Low 96KB) */
> > > > > > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > > > > > + /* OCRAM */
> > > > > > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > > > > > + /* DDR (Data) */
> > > > > > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > > > > > +
> > > > > > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
> > > > > > > {
> > > > > > > /* dev addr , sys addr , size , flags */
> > > > > > > /* ITCM */
> > > > > > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > > > > > imx_rproc_cfg_imx8mq = {
> > > > > > > .method = IMX_RPROC_MMIO,
> > > > > > > };
> > > > > > >
> > > > > > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
> > > > > > > +{
> > > > > > > + .att = imx_rproc_att_imx8qxp,
> > > > > > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > > > > > + .method = IMX_RPROC_SCU_API, };
> > > > > > > +
> > > > > > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
> > > > > > > {
> > > > > > > .att = imx_rproc_att_imx8ulp,
> > > > > > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > > > > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
> > > > > > > rproc
> > > > > > *rproc)
> > > > > > > mbox_free_channel(priv->rx_ch);
> > > > > > > }
> > > > > > >
> > > > > > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > > > > > + struct imx_rproc *priv = rproc->priv;
> > > > > > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > > > > > +
> > > > > > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > > > > > + return;
> > > > > > > +
> > > > > > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > priv->rsrc_id))
> > > > > > > + return;
> > > > > > > +
> > > > > > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > > > > > BIT(priv->rproc_pt), false);
> > > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > +}
> > > > > > > +
> > > > > > > +static int imx_rproc_partition_notify(struct notifier_block
> > > > > > > +*nb,
> > > > > > > + unsigned long event, void *group) {
> > > > > > > + struct imx_rproc *priv = container_of(nb, struct
> > > > > > > +imx_rproc, rproc_nb);
> > > > > > > +
> > > > > > > + /* Ignore other irqs */
> > > > > > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > > > > > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > > > > > + return 0;
> > > > > > > +
> > > > > > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > > > > > +
> > > > > > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > +}
> > > > > > > +
> > > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > > > > > {
> > > > > > > struct regmap_config config = { .name = "imx-rproc" };
> > > > > > > @@ -689,6
> > > > > > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
> > > > > > > +*priv)
> > > > > > > struct arm_smccc_res res;
> > > > > > > int ret;
> > > > > > > u32 val;
> > > > > > > + u8 pt;
> > > > > > >
> > > > > > > switch (dcfg->method) {
> > > > > > > case IMX_RPROC_NONE:
> > > > > > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > > > > > imx_rproc *priv)
> > > > > > > if (res.a0)
> > > > > > > priv->rproc->state = RPROC_DETACHED;
> > > > > > > return 0;
> > > > > > > + case IMX_RPROC_SCU_API:
> > > > > > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > > > > > + if (ret)
> > > > > > > + return ret;
> > > > > > > + ret = of_property_read_u32(dev->of_node,
> > > > > > > +"fsl,resource-id",
> > > > > > &priv->rsrc_id);
> > > > > > > + if (ret) {
> > > > > > > + dev_err(dev, "No fsl,resource-id property\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + /*
> > > > > > > + * If Mcore resource is not owned by Acore
> > > > > > > +partition, It is
> > > > > > kicked by ROM,
> > > > > > > + * and Linux could only do IPC with Mcore and nothing else.
> > > > > > > + */
> > > > > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > +priv-
> > > > > > > rsrc_id))
> > > > > > > + return 0;
> > > > > >
> > > > > > If imx_sc_rm_is_resource_owned() return '1' than the remote
> > > > > > processor is under Linux's control and what follows below is
> > > > > > not needed.
> > > > > > That is also
> > > > > > coherent with the comment in [1].
> > > > >
> > > > > Case 1: If M4 is owned by Linux, here directly return 0.
> > > > > Case 2: If M4 is not owned by Linux, the following code after
> > > > > this line will set state as RPROC_DETACHED.
> > > >
> > > > I understand that part.
> > > >
> > > > >
> > > > > Patch 3/6(this patch) is only to support case 2.
> > > > > Patch 4/6 is to support case 1.
> > > > >
> > > >
> > > > Let's leave the subsequent patches alone for now.
> > > >
> > > > > >
> > > > > > That is in contrast with what is happening in
> > > > > > imx_rproc_put_scu(). There, if the remote processor is _not_
> > > > > > owned by Linux than the condition returns without calling
> > > > > > imx_scu_irq_group_enable() and
> > > > > > imx_scu_irq_unregister_notifier(). That seems to be a bug.
> > > > >
> > > > > No. The two functions only needed when M4 is in a separate
> > > > > hardware partition.
> > > > >
> > > > > The scu irq is only needed when M4 is out of linux control and
> > > > > need some notification such as M4 is reset by SCU(System Control
> Unit).
> > > > > That linux got
> > > > > notification that M4 is reset by SCU.
> > > >
> > > > I also understand that part.
> > > >
> > > > What I am underlining here is that when the M4 is independent,
> > > > function
> > > > imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> > > > called but their cleanup equivalent are not called in
> > > > imx_rproc_put_scu() because of the '!'
> > > > in the if() statement.
> > >
> > > you are right, this is bug in my side. It should be as below based
> > > on patch 3/6.
> > >
> > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
> > > 100644
> > > --- a/drivers/remoteproc/imx_rproc.c
> > > +++ b/drivers/remoteproc/imx_rproc.c
> > > @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
> > > *rproc)
> > > if (dcfg->method != IMX_RPROC_SCU_API)
> > > return;
> > >
> > > - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > priv->rsrc_id))
> > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > +priv->rsrc_id))
>
> Indeed, which raises questions about how this patchset was tested. And it
> is not the first time we touch base on that.
Patch 4/6 has this change, anyway I should not mix patch 3,4 here.
>
> > > return;
> > >
> > > Thanks for detailed reviewing.
> >
> > If you are fine with this change, I could send out V6. Anyway, I'll
> > wait to see if you have other comments in this patchset.
> >
>
> I am out of time for this patchset and as such will not provide more
> comments on this revision.
Sure. Thanks for your time. Since you have applied the attach recovery
part, next version will enable this feature in imx rproc.
Thanks,
Peng.
>
> > Thanks,
> > Peng.
> >
> > >
> > > Thanks,
> > > Peng.
> > >
> > > >
> > > > >
> > > > > >
> > > > > > There is also a problem in patch 4/6 associated to that.
> > > > >
> > > > > If the upper explanation eliminate your concern, "a problem in
> > > > > patch 4/6" should not be a problem.
> > > > >
> > > > > When M4 is owned by Linux, Linux need handle the power domain.
> > > > > If M4 is not owned
> > > > > by Linux, SCU firmware will handle the power domain, and Linux
> > > > > has no permission to touch that.
> > > > >
> > > > > Thanks
> > > > > Peng
> > > > >
> > > > > >
> > > > > > Thanks,
> > > > > > Mathieu
> > > > > >
> > > > > >
> > > > > > [1].
> > > > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
> > > > > > F%2Felixir
> > > > > > .bootlin.com%2Flinux%2Fv6.0-
> > > > > >
> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
> > > > > > 0
> > > > > >
> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > > > > >
> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > > > > >
> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > > > > >
> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > > > > >
> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > > > > > =0
> > > > > >
> > > > > > > +
> > > > > > > + priv->rproc->state = RPROC_DETACHED;
> > > > > > > + priv->rproc->recovery_disabled = true;
> > > > > > > +
> > > > > > > + /* Get partition id and enable irq in SCFW */
> > > > > > > + ret =
> > > > > > > +imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > > > > > priv->rsrc_id, &pt);
> > > > > > > + if (ret) {
> > > > > > > + dev_err(dev, "not able to get resource
> > > > > > > +owner\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + priv->rproc_pt = pt;
> > > > > > > + priv->rproc_nb.notifier_call =
> > > > > > > +imx_rproc_partition_notify;
> > > > > > > +
> > > > > > > + ret =
> > > > > > > +imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > > > > > + if (ret) {
> > > > > > > + dev_warn(dev, "register scu notifier
> > > > > > > +failed.\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + ret =
> > > > > > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> BIT(priv-
> > > > > > > rproc_pt),
> > > > > > > + true);
> > > > > > > + if (ret) {
> > > > > > > +
> > > > > > > +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > + dev_warn(dev, "Enable irq failed.\n");
> > > > > > > + return ret;
> > > > > > > + }
> > > > > > > +
> > > > > > > + return 0;
> > > > > > > default:
> > > > > > > break;
> > > > > > > }
> > > > > > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
> > > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > ret = imx_rproc_clk_enable(priv);
> > > > > > > if (ret)
> > > > > > > - goto err_put_mbox;
> > > > > > > + goto err_put_scu;
> > > > > > >
> > > > > > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > > > > > >
> > > > > > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
> > > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > err_put_clk:
> > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > +err_put_scu:
> > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > err_put_mbox:
> > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > err_put_wkq:
> > > > > > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > > > > > platform_device
> > > > > > > *pdev)
> > > > > > >
> > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > rproc_del(rproc);
> > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > destroy_workqueue(priv->workqueue);
> > > > > > > rproc_free(rproc);
> > > > > > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > > > > > imx_rproc_of_match[] = {
> > > > > > > { .compatible = "fsl,imx8mm-cm4", .data =
> > > > > > &imx_rproc_cfg_imx8mq },
> > > > > > > { .compatible = "fsl,imx8mn-cm7", .data =
> > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > { .compatible = "fsl,imx8mp-cm7", .data =
> > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > > > > > &imx_rproc_cfg_imx8qxp },
> > > > > > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > > > > > &imx_rproc_cfg_imx8ulp },
> > > > > > > { .compatible = "fsl,imx93-cm33", .data =
> > > > > > > &imx_rproc_cfg_imx93 },
> > > > > > > {},
> > > > > > > --
> > > > > > > 2.37.1
> > > > > > >
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-29 3:52 ` Peng Fan
@ 2022-09-29 14:58 ` Mathieu Poirier
-1 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-29 14:58 UTC (permalink / raw)
To: Peng Fan
Cc: Peng Fan (OSS),
robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
On Wed, 28 Sept 2022 at 21:52, Peng Fan <peng.fan@nxp.com> wrote:
>
> > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> > i.MX8QXP M4
> >
> > On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> > > Hi Mathieu,
> > >
> > > On 9/28/2022 3:39 PM, Peng Fan wrote:
> > > >
> > > >
> > > > On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> > > > > On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> > > > > > Hi Mathieu,
> > > > > >
> > > > > > Thanks for reviewing this patchset.
> > > > > > > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
> > > > > > > attaching to i.MX8QXP M4
> > > > > > >
> > > > > > > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > > > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > > > > >
> > > > > > > > When M4 is kicked by SCFW, M4 runs in its own hardware
> > > > > > > > partition, Linux could only do IPC with M4, it could not
> > > > > > > > start, stop, update image.
> > > > > > > >
> > > > > > > > We disable recovery reboot when M4 is managed by SCFW,
> > > > > > > > because remoteproc core still not support M4 auto-recovery
> > > > > > > > without loading image.
> > > > > > > >
> > > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > > > > > > ---
> > > > > > > > drivers/remoteproc/imx_rproc.c | 108
> > > > > > > > ++++++++++++++++++++++++++++++++-
> > > > > > > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > > > > > > >
> > > > > > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > > > > > b/drivers/remoteproc/imx_rproc.c index
> > > > > > > > 7cc4fd207e2d..bcba74e90020
> > > > > > > > 100644
> > > > > > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > > > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > > > > > @@ -6,6 +6,7 @@
> > > > > > > > #include <linux/arm-smccc.h>
> > > > > > > > #include <linux/clk.h>
> > > > > > > > #include <linux/err.h>
> > > > > > > > +#include <linux/firmware/imx/sci.h>
> > > > > > > > #include <linux/interrupt.h>
> > > > > > > > #include <linux/kernel.h>
> > > > > > > > #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
> > > > > > > > #define IMX_SIP_RPROC_STARTED 0x01
> > > > > > > > #define IMX_SIP_RPROC_STOP 0x02
> > > > > > > >
> > > > > > > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > > > > > > +
> > > > > > > > /**
> > > > > > > > * struct imx_rproc_mem - slim internal memory structure
> > > > > > > > * @cpu_addr: MPU virtual address of the memory region @@
> > > > > > > > -89,6
> > > > > > > > +92,10 @@ struct imx_rproc {
> > > > > > > > struct work_struct rproc_work;
> > > > > > > > struct workqueue_struct *workqueue;
> > > > > > > > void __iomem *rsc_table;
> > > > > > > > + struct imx_sc_ipc *ipc_handle;
> > > > > > > > + struct notifier_block rproc_nb;
> > > > > > > > + u32 rproc_pt; /* partition id */
> > > > > > > > + u32 rsrc_id; /* resource id */
> > > > > > > > };
> > > > > > > >
> > > > > > > > static const struct imx_rproc_att imx_rproc_att_imx93[] =
> > > > > > > > { @@ -117,6
> > > > > > > > +124,18 @@ static const struct imx_rproc_att
> > > > > > > > +imx_rproc_att_imx93[] = {
> > > > > > > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > > > > > > >
> > > > > > > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
> > > > > > > > +{
> > > > > > > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > > > > > > + /* TCML/U */
> > > > > > > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
> > > > > > > > +ATT_IOMEM },
> > > > > > > > + /* OCRAM(Low 96KB) */
> > > > > > > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > > > > > > + /* OCRAM */
> > > > > > > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > > > > > > + /* DDR (Data) */
> > > > > > > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > > > > > > +
> > > > > > > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
> > > > > > > > {
> > > > > > > > /* dev addr , sys addr , size , flags */
> > > > > > > > /* ITCM */
> > > > > > > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > > > > > > imx_rproc_cfg_imx8mq = {
> > > > > > > > .method = IMX_RPROC_MMIO,
> > > > > > > > };
> > > > > > > >
> > > > > > > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
> > > > > > > > +{
> > > > > > > > + .att = imx_rproc_att_imx8qxp,
> > > > > > > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > > > > > > + .method = IMX_RPROC_SCU_API, };
> > > > > > > > +
> > > > > > > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
> > > > > > > > {
> > > > > > > > .att = imx_rproc_att_imx8ulp,
> > > > > > > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > > > > > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
> > > > > > > > rproc
> > > > > > > *rproc)
> > > > > > > > mbox_free_channel(priv->rx_ch);
> > > > > > > > }
> > > > > > > >
> > > > > > > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > > > > > > + struct imx_rproc *priv = rproc->priv;
> > > > > > > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > > > > > > +
> > > > > > > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > > > > > > + return;
> > > > > > > > +
> > > > > > > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > > priv->rsrc_id))
> > > > > > > > + return;
> > > > > > > > +
> > > > > > > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > > > > > > BIT(priv->rproc_pt), false);
> > > > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > > +}
> > > > > > > > +
> > > > > > > > +static int imx_rproc_partition_notify(struct notifier_block
> > > > > > > > +*nb,
> > > > > > > > + unsigned long event, void *group) {
> > > > > > > > + struct imx_rproc *priv = container_of(nb, struct
> > > > > > > > +imx_rproc, rproc_nb);
> > > > > > > > +
> > > > > > > > + /* Ignore other irqs */
> > > > > > > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > > > > > > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > > > > > > + return 0;
> > > > > > > > +
> > > > > > > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > > > > > > +
> > > > > > > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > > > > > > +
> > > > > > > > + return 0;
> > > > > > > > +}
> > > > > > > > +
> > > > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > > > > > > {
> > > > > > > > struct regmap_config config = { .name = "imx-rproc" };
> > > > > > > > @@ -689,6
> > > > > > > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
> > > > > > > > +*priv)
> > > > > > > > struct arm_smccc_res res;
> > > > > > > > int ret;
> > > > > > > > u32 val;
> > > > > > > > + u8 pt;
> > > > > > > >
> > > > > > > > switch (dcfg->method) {
> > > > > > > > case IMX_RPROC_NONE:
> > > > > > > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > > > > > > imx_rproc *priv)
> > > > > > > > if (res.a0)
> > > > > > > > priv->rproc->state = RPROC_DETACHED;
> > > > > > > > return 0;
> > > > > > > > + case IMX_RPROC_SCU_API:
> > > > > > > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > > > > > > + if (ret)
> > > > > > > > + return ret;
> > > > > > > > + ret = of_property_read_u32(dev->of_node,
> > > > > > > > +"fsl,resource-id",
> > > > > > > &priv->rsrc_id);
> > > > > > > > + if (ret) {
> > > > > > > > + dev_err(dev, "No fsl,resource-id property\n");
> > > > > > > > + return ret;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + /*
> > > > > > > > + * If Mcore resource is not owned by Acore
> > > > > > > > +partition, It is
> > > > > > > kicked by ROM,
> > > > > > > > + * and Linux could only do IPC with Mcore and nothing else.
> > > > > > > > + */
> > > > > > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > > +priv-
> > > > > > > > rsrc_id))
> > > > > > > > + return 0;
> > > > > > >
> > > > > > > If imx_sc_rm_is_resource_owned() return '1' than the remote
> > > > > > > processor is under Linux's control and what follows below is
> > > > > > > not needed.
> > > > > > > That is also
> > > > > > > coherent with the comment in [1].
> > > > > >
> > > > > > Case 1: If M4 is owned by Linux, here directly return 0.
> > > > > > Case 2: If M4 is not owned by Linux, the following code after
> > > > > > this line will set state as RPROC_DETACHED.
> > > > >
> > > > > I understand that part.
> > > > >
> > > > > >
> > > > > > Patch 3/6(this patch) is only to support case 2.
> > > > > > Patch 4/6 is to support case 1.
> > > > > >
> > > > >
> > > > > Let's leave the subsequent patches alone for now.
> > > > >
> > > > > > >
> > > > > > > That is in contrast with what is happening in
> > > > > > > imx_rproc_put_scu(). There, if the remote processor is _not_
> > > > > > > owned by Linux than the condition returns without calling
> > > > > > > imx_scu_irq_group_enable() and
> > > > > > > imx_scu_irq_unregister_notifier(). That seems to be a bug.
> > > > > >
> > > > > > No. The two functions only needed when M4 is in a separate
> > > > > > hardware partition.
> > > > > >
> > > > > > The scu irq is only needed when M4 is out of linux control and
> > > > > > need some notification such as M4 is reset by SCU(System Control
> > Unit).
> > > > > > That linux got
> > > > > > notification that M4 is reset by SCU.
> > > > >
> > > > > I also understand that part.
> > > > >
> > > > > What I am underlining here is that when the M4 is independent,
> > > > > function
> > > > > imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> > > > > called but their cleanup equivalent are not called in
> > > > > imx_rproc_put_scu() because of the '!'
> > > > > in the if() statement.
> > > >
> > > > you are right, this is bug in my side. It should be as below based
> > > > on patch 3/6.
> > > >
> > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
> > > > 100644
> > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
> > > > *rproc)
> > > > if (dcfg->method != IMX_RPROC_SCU_API)
> > > > return;
> > > >
> > > > - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > priv->rsrc_id))
> > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > +priv->rsrc_id))
> >
> > Indeed, which raises questions about how this patchset was tested. And it
> > is not the first time we touch base on that.
>
> Patch 4/6 has this change, anyway I should not mix patch 3,4 here.
>
> >
> > > > return;
> > > >
> > > > Thanks for detailed reviewing.
> > >
> > > If you are fine with this change, I could send out V6. Anyway, I'll
> > > wait to see if you have other comments in this patchset.
> > >
> >
> > I am out of time for this patchset and as such will not provide more
> > comments on this revision.
>
> Sure. Thanks for your time. Since you have applied the attach recovery
> part, next version will enable this feature in imx rproc.
>
I would rather not. Please introduce support for the recovery in
another patchset, once this one has been merged.
> Thanks,
> Peng.
>
> >
> > > Thanks,
> > > Peng.
> > >
> > > >
> > > > Thanks,
> > > > Peng.
> > > >
> > > > >
> > > > > >
> > > > > > >
> > > > > > > There is also a problem in patch 4/6 associated to that.
> > > > > >
> > > > > > If the upper explanation eliminate your concern, "a problem in
> > > > > > patch 4/6" should not be a problem.
> > > > > >
> > > > > > When M4 is owned by Linux, Linux need handle the power domain.
> > > > > > If M4 is not owned
> > > > > > by Linux, SCU firmware will handle the power domain, and Linux
> > > > > > has no permission to touch that.
> > > > > >
> > > > > > Thanks
> > > > > > Peng
> > > > > >
> > > > > > >
> > > > > > > Thanks,
> > > > > > > Mathieu
> > > > > > >
> > > > > > >
> > > > > > > [1].
> > > > > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
> > > > > > > F%2Felixir
> > > > > > > .bootlin.com%2Flinux%2Fv6.0-
> > > > > > >
> > rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
> > > > > > > 0
> > > > > > >
> > 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > > > > > >
> > c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > > > > > >
> > 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > > > > > >
> > MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > > > > > >
> > JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > > > > > > =0
> > > > > > >
> > > > > > > > +
> > > > > > > > + priv->rproc->state = RPROC_DETACHED;
> > > > > > > > + priv->rproc->recovery_disabled = true;
> > > > > > > > +
> > > > > > > > + /* Get partition id and enable irq in SCFW */
> > > > > > > > + ret =
> > > > > > > > +imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > > > > > > priv->rsrc_id, &pt);
> > > > > > > > + if (ret) {
> > > > > > > > + dev_err(dev, "not able to get resource
> > > > > > > > +owner\n");
> > > > > > > > + return ret;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + priv->rproc_pt = pt;
> > > > > > > > + priv->rproc_nb.notifier_call =
> > > > > > > > +imx_rproc_partition_notify;
> > > > > > > > +
> > > > > > > > + ret =
> > > > > > > > +imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > > > > > > + if (ret) {
> > > > > > > > + dev_warn(dev, "register scu notifier
> > > > > > > > +failed.\n");
> > > > > > > > + return ret;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + ret =
> > > > > > > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > BIT(priv-
> > > > > > > > rproc_pt),
> > > > > > > > + true);
> > > > > > > > + if (ret) {
> > > > > > > > +
> > > > > > > > +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > > + dev_warn(dev, "Enable irq failed.\n");
> > > > > > > > + return ret;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + return 0;
> > > > > > > > default:
> > > > > > > > break;
> > > > > > > > }
> > > > > > > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
> > > > > > > > platform_device
> > > > > > > > *pdev)
> > > > > > > >
> > > > > > > > ret = imx_rproc_clk_enable(priv);
> > > > > > > > if (ret)
> > > > > > > > - goto err_put_mbox;
> > > > > > > > + goto err_put_scu;
> > > > > > > >
> > > > > > > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > > > > > > >
> > > > > > > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
> > > > > > > > platform_device
> > > > > > > > *pdev)
> > > > > > > >
> > > > > > > > err_put_clk:
> > > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > > +err_put_scu:
> > > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > > err_put_mbox:
> > > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > > err_put_wkq:
> > > > > > > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > > > > > > platform_device
> > > > > > > > *pdev)
> > > > > > > >
> > > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > > rproc_del(rproc);
> > > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > > destroy_workqueue(priv->workqueue);
> > > > > > > > rproc_free(rproc);
> > > > > > > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > > > > > > imx_rproc_of_match[] = {
> > > > > > > > { .compatible = "fsl,imx8mm-cm4", .data =
> > > > > > > &imx_rproc_cfg_imx8mq },
> > > > > > > > { .compatible = "fsl,imx8mn-cm7", .data =
> > > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > > { .compatible = "fsl,imx8mp-cm7", .data =
> > > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > > > > > > &imx_rproc_cfg_imx8qxp },
> > > > > > > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > > > > > > &imx_rproc_cfg_imx8ulp },
> > > > > > > > { .compatible = "fsl,imx93-cm33", .data =
> > > > > > > > &imx_rproc_cfg_imx93 },
> > > > > > > > {},
> > > > > > > > --
> > > > > > > > 2.37.1
> > > > > > > >
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-29 14:58 ` Mathieu Poirier
0 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-29 14:58 UTC (permalink / raw)
To: Peng Fan
Cc: Peng Fan (OSS),
robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
On Wed, 28 Sept 2022 at 21:52, Peng Fan <peng.fan@nxp.com> wrote:
>
> > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> > i.MX8QXP M4
> >
> > On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> > > Hi Mathieu,
> > >
> > > On 9/28/2022 3:39 PM, Peng Fan wrote:
> > > >
> > > >
> > > > On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> > > > > On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> > > > > > Hi Mathieu,
> > > > > >
> > > > > > Thanks for reviewing this patchset.
> > > > > > > Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
> > > > > > > attaching to i.MX8QXP M4
> > > > > > >
> > > > > > > On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> > > > > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > > > > >
> > > > > > > > When M4 is kicked by SCFW, M4 runs in its own hardware
> > > > > > > > partition, Linux could only do IPC with M4, it could not
> > > > > > > > start, stop, update image.
> > > > > > > >
> > > > > > > > We disable recovery reboot when M4 is managed by SCFW,
> > > > > > > > because remoteproc core still not support M4 auto-recovery
> > > > > > > > without loading image.
> > > > > > > >
> > > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > > > > > > ---
> > > > > > > > drivers/remoteproc/imx_rproc.c | 108
> > > > > > > > ++++++++++++++++++++++++++++++++-
> > > > > > > > 1 file changed, 107 insertions(+), 1 deletion(-)
> > > > > > > >
> > > > > > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > > > > > b/drivers/remoteproc/imx_rproc.c index
> > > > > > > > 7cc4fd207e2d..bcba74e90020
> > > > > > > > 100644
> > > > > > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > > > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > > > > > @@ -6,6 +6,7 @@
> > > > > > > > #include <linux/arm-smccc.h>
> > > > > > > > #include <linux/clk.h>
> > > > > > > > #include <linux/err.h>
> > > > > > > > +#include <linux/firmware/imx/sci.h>
> > > > > > > > #include <linux/interrupt.h>
> > > > > > > > #include <linux/kernel.h>
> > > > > > > > #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
> > > > > > > > #define IMX_SIP_RPROC_STARTED 0x01
> > > > > > > > #define IMX_SIP_RPROC_STOP 0x02
> > > > > > > >
> > > > > > > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> > > > > > > > +
> > > > > > > > /**
> > > > > > > > * struct imx_rproc_mem - slim internal memory structure
> > > > > > > > * @cpu_addr: MPU virtual address of the memory region @@
> > > > > > > > -89,6
> > > > > > > > +92,10 @@ struct imx_rproc {
> > > > > > > > struct work_struct rproc_work;
> > > > > > > > struct workqueue_struct *workqueue;
> > > > > > > > void __iomem *rsc_table;
> > > > > > > > + struct imx_sc_ipc *ipc_handle;
> > > > > > > > + struct notifier_block rproc_nb;
> > > > > > > > + u32 rproc_pt; /* partition id */
> > > > > > > > + u32 rsrc_id; /* resource id */
> > > > > > > > };
> > > > > > > >
> > > > > > > > static const struct imx_rproc_att imx_rproc_att_imx93[] =
> > > > > > > > { @@ -117,6
> > > > > > > > +124,18 @@ static const struct imx_rproc_att
> > > > > > > > +imx_rproc_att_imx93[] = {
> > > > > > > > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> > > > > > > >
> > > > > > > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
> > > > > > > > +{
> > > > > > > > + { 0x08000000, 0x08000000, 0x10000000, 0 },
> > > > > > > > + /* TCML/U */
> > > > > > > > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
> > > > > > > > +ATT_IOMEM },
> > > > > > > > + /* OCRAM(Low 96KB) */
> > > > > > > > + { 0x21000000, 0x00100000, 0x00018000, 0 },
> > > > > > > > + /* OCRAM */
> > > > > > > > + { 0x21100000, 0x00100000, 0x00040000, 0 },
> > > > > > > > + /* DDR (Data) */
> > > > > > > > + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> > > > > > > > +
> > > > > > > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
> > > > > > > > {
> > > > > > > > /* dev addr , sys addr , size , flags */
> > > > > > > > /* ITCM */
> > > > > > > > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> > > > > > > imx_rproc_cfg_imx8mq = {
> > > > > > > > .method = IMX_RPROC_MMIO,
> > > > > > > > };
> > > > > > > >
> > > > > > > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
> > > > > > > > +{
> > > > > > > > + .att = imx_rproc_att_imx8qxp,
> > > > > > > > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> > > > > > > > + .method = IMX_RPROC_SCU_API, };
> > > > > > > > +
> > > > > > > > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
> > > > > > > > {
> > > > > > > > .att = imx_rproc_att_imx8ulp,
> > > > > > > > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> > > > > > > > @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
> > > > > > > > rproc
> > > > > > > *rproc)
> > > > > > > > mbox_free_channel(priv->rx_ch);
> > > > > > > > }
> > > > > > > >
> > > > > > > > +static void imx_rproc_put_scu(struct rproc *rproc) {
> > > > > > > > + struct imx_rproc *priv = rproc->priv;
> > > > > > > > + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> > > > > > > > +
> > > > > > > > + if (dcfg->method != IMX_RPROC_SCU_API)
> > > > > > > > + return;
> > > > > > > > +
> > > > > > > > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > > priv->rsrc_id))
> > > > > > > > + return;
> > > > > > > > +
> > > > > > > > + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > > > > > > BIT(priv->rproc_pt), false);
> > > > > > > > + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > > +}
> > > > > > > > +
> > > > > > > > +static int imx_rproc_partition_notify(struct notifier_block
> > > > > > > > +*nb,
> > > > > > > > + unsigned long event, void *group) {
> > > > > > > > + struct imx_rproc *priv = container_of(nb, struct
> > > > > > > > +imx_rproc, rproc_nb);
> > > > > > > > +
> > > > > > > > + /* Ignore other irqs */
> > > > > > > > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> > > > > > > IMX_SC_IRQ_GROUP_REBOOTED)))
> > > > > > > > + return 0;
> > > > > > > > +
> > > > > > > > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> > > > > > > > +
> > > > > > > > + pr_info("Partition%d reset!\n", priv->rproc_pt);
> > > > > > > > +
> > > > > > > > + return 0;
> > > > > > > > +}
> > > > > > > > +
> > > > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
> > > > > > > > {
> > > > > > > > struct regmap_config config = { .name = "imx-rproc" };
> > > > > > > > @@ -689,6
> > > > > > > > +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
> > > > > > > > +*priv)
> > > > > > > > struct arm_smccc_res res;
> > > > > > > > int ret;
> > > > > > > > u32 val;
> > > > > > > > + u8 pt;
> > > > > > > >
> > > > > > > > switch (dcfg->method) {
> > > > > > > > case IMX_RPROC_NONE:
> > > > > > > > @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> > > > > > > imx_rproc *priv)
> > > > > > > > if (res.a0)
> > > > > > > > priv->rproc->state = RPROC_DETACHED;
> > > > > > > > return 0;
> > > > > > > > + case IMX_RPROC_SCU_API:
> > > > > > > > + ret = imx_scu_get_handle(&priv->ipc_handle);
> > > > > > > > + if (ret)
> > > > > > > > + return ret;
> > > > > > > > + ret = of_property_read_u32(dev->of_node,
> > > > > > > > +"fsl,resource-id",
> > > > > > > &priv->rsrc_id);
> > > > > > > > + if (ret) {
> > > > > > > > + dev_err(dev, "No fsl,resource-id property\n");
> > > > > > > > + return ret;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + /*
> > > > > > > > + * If Mcore resource is not owned by Acore
> > > > > > > > +partition, It is
> > > > > > > kicked by ROM,
> > > > > > > > + * and Linux could only do IPC with Mcore and nothing else.
> > > > > > > > + */
> > > > > > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > > > > > +priv-
> > > > > > > > rsrc_id))
> > > > > > > > + return 0;
> > > > > > >
> > > > > > > If imx_sc_rm_is_resource_owned() return '1' than the remote
> > > > > > > processor is under Linux's control and what follows below is
> > > > > > > not needed.
> > > > > > > That is also
> > > > > > > coherent with the comment in [1].
> > > > > >
> > > > > > Case 1: If M4 is owned by Linux, here directly return 0.
> > > > > > Case 2: If M4 is not owned by Linux, the following code after
> > > > > > this line will set state as RPROC_DETACHED.
> > > > >
> > > > > I understand that part.
> > > > >
> > > > > >
> > > > > > Patch 3/6(this patch) is only to support case 2.
> > > > > > Patch 4/6 is to support case 1.
> > > > > >
> > > > >
> > > > > Let's leave the subsequent patches alone for now.
> > > > >
> > > > > > >
> > > > > > > That is in contrast with what is happening in
> > > > > > > imx_rproc_put_scu(). There, if the remote processor is _not_
> > > > > > > owned by Linux than the condition returns without calling
> > > > > > > imx_scu_irq_group_enable() and
> > > > > > > imx_scu_irq_unregister_notifier(). That seems to be a bug.
> > > > > >
> > > > > > No. The two functions only needed when M4 is in a separate
> > > > > > hardware partition.
> > > > > >
> > > > > > The scu irq is only needed when M4 is out of linux control and
> > > > > > need some notification such as M4 is reset by SCU(System Control
> > Unit).
> > > > > > That linux got
> > > > > > notification that M4 is reset by SCU.
> > > > >
> > > > > I also understand that part.
> > > > >
> > > > > What I am underlining here is that when the M4 is independent,
> > > > > function
> > > > > imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> > > > > called but their cleanup equivalent are not called in
> > > > > imx_rproc_put_scu() because of the '!'
> > > > > in the if() statement.
> > > >
> > > > you are right, this is bug in my side. It should be as below based
> > > > on patch 3/6.
> > > >
> > > > diff --git a/drivers/remoteproc/imx_rproc.c
> > > > b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
> > > > 100644
> > > > --- a/drivers/remoteproc/imx_rproc.c
> > > > +++ b/drivers/remoteproc/imx_rproc.c
> > > > @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
> > > > *rproc)
> > > > if (dcfg->method != IMX_RPROC_SCU_API)
> > > > return;
> > > >
> > > > - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > priv->rsrc_id))
> > > > + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> > > > +priv->rsrc_id))
> >
> > Indeed, which raises questions about how this patchset was tested. And it
> > is not the first time we touch base on that.
>
> Patch 4/6 has this change, anyway I should not mix patch 3,4 here.
>
> >
> > > > return;
> > > >
> > > > Thanks for detailed reviewing.
> > >
> > > If you are fine with this change, I could send out V6. Anyway, I'll
> > > wait to see if you have other comments in this patchset.
> > >
> >
> > I am out of time for this patchset and as such will not provide more
> > comments on this revision.
>
> Sure. Thanks for your time. Since you have applied the attach recovery
> part, next version will enable this feature in imx rproc.
>
I would rather not. Please introduce support for the recovery in
another patchset, once this one has been merged.
> Thanks,
> Peng.
>
> >
> > > Thanks,
> > > Peng.
> > >
> > > >
> > > > Thanks,
> > > > Peng.
> > > >
> > > > >
> > > > > >
> > > > > > >
> > > > > > > There is also a problem in patch 4/6 associated to that.
> > > > > >
> > > > > > If the upper explanation eliminate your concern, "a problem in
> > > > > > patch 4/6" should not be a problem.
> > > > > >
> > > > > > When M4 is owned by Linux, Linux need handle the power domain.
> > > > > > If M4 is not owned
> > > > > > by Linux, SCU firmware will handle the power domain, and Linux
> > > > > > has no permission to touch that.
> > > > > >
> > > > > > Thanks
> > > > > > Peng
> > > > > >
> > > > > > >
> > > > > > > Thanks,
> > > > > > > Mathieu
> > > > > > >
> > > > > > >
> > > > > > > [1].
> > > > > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
> > > > > > > F%2Felixir
> > > > > > > .bootlin.com%2Flinux%2Fv6.0-
> > > > > > >
> > rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
> > > > > > > 0
> > > > > > >
> > 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> > > > > > >
> > c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> > > > > > >
> > 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> > > > > > >
> > MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> > > > > > >
> > JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> > > > > > > =0
> > > > > > >
> > > > > > > > +
> > > > > > > > + priv->rproc->state = RPROC_DETACHED;
> > > > > > > > + priv->rproc->recovery_disabled = true;
> > > > > > > > +
> > > > > > > > + /* Get partition id and enable irq in SCFW */
> > > > > > > > + ret =
> > > > > > > > +imx_sc_rm_get_resource_owner(priv->ipc_handle,
> > > > > > > priv->rsrc_id, &pt);
> > > > > > > > + if (ret) {
> > > > > > > > + dev_err(dev, "not able to get resource
> > > > > > > > +owner\n");
> > > > > > > > + return ret;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + priv->rproc_pt = pt;
> > > > > > > > + priv->rproc_nb.notifier_call =
> > > > > > > > +imx_rproc_partition_notify;
> > > > > > > > +
> > > > > > > > + ret =
> > > > > > > > +imx_scu_irq_register_notifier(&priv->rproc_nb);
> > > > > > > > + if (ret) {
> > > > > > > > + dev_warn(dev, "register scu notifier
> > > > > > > > +failed.\n");
> > > > > > > > + return ret;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + ret =
> > > > > > > imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> > BIT(priv-
> > > > > > > > rproc_pt),
> > > > > > > > + true);
> > > > > > > > + if (ret) {
> > > > > > > > +
> > > > > > > > +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> > > > > > > > + dev_warn(dev, "Enable irq failed.\n");
> > > > > > > > + return ret;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + return 0;
> > > > > > > > default:
> > > > > > > > break;
> > > > > > > > }
> > > > > > > > @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
> > > > > > > > platform_device
> > > > > > > > *pdev)
> > > > > > > >
> > > > > > > > ret = imx_rproc_clk_enable(priv);
> > > > > > > > if (ret)
> > > > > > > > - goto err_put_mbox;
> > > > > > > > + goto err_put_scu;
> > > > > > > >
> > > > > > > > INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> > > > > > > >
> > > > > > > > @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
> > > > > > > > platform_device
> > > > > > > > *pdev)
> > > > > > > >
> > > > > > > > err_put_clk:
> > > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > > +err_put_scu:
> > > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > > err_put_mbox:
> > > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > > err_put_wkq:
> > > > > > > > @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> > > > > > > platform_device
> > > > > > > > *pdev)
> > > > > > > >
> > > > > > > > clk_disable_unprepare(priv->clk);
> > > > > > > > rproc_del(rproc);
> > > > > > > > + imx_rproc_put_scu(rproc);
> > > > > > > > imx_rproc_free_mbox(rproc);
> > > > > > > > destroy_workqueue(priv->workqueue);
> > > > > > > > rproc_free(rproc);
> > > > > > > > @@ -852,6 +957,7 @@ static const struct of_device_id
> > > > > > > imx_rproc_of_match[] = {
> > > > > > > > { .compatible = "fsl,imx8mm-cm4", .data =
> > > > > > > &imx_rproc_cfg_imx8mq },
> > > > > > > > { .compatible = "fsl,imx8mn-cm7", .data =
> > > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > > { .compatible = "fsl,imx8mp-cm7", .data =
> > > > > > > &imx_rproc_cfg_imx8mn },
> > > > > > > > + { .compatible = "fsl,imx8qxp-cm4", .data =
> > > > > > > &imx_rproc_cfg_imx8qxp },
> > > > > > > > { .compatible = "fsl,imx8ulp-cm33", .data =
> > > > > > > &imx_rproc_cfg_imx8ulp },
> > > > > > > > { .compatible = "fsl,imx93-cm33", .data =
> > > > > > > > &imx_rproc_cfg_imx93 },
> > > > > > > > {},
> > > > > > > > --
> > > > > > > > 2.37.1
> > > > > > > >
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-29 14:58 ` Mathieu Poirier
@ 2022-09-29 23:16 ` Peng Fan
-1 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-29 23:16 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
On 9/29/2022 10:58 PM, Mathieu Poirier wrote:
> On Wed, 28 Sept 2022 at 21:52, Peng Fan <peng.fan@nxp.com> wrote:
>>
>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
>>> i.MX8QXP M4
>>>
>>> On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
>>>> Hi Mathieu,
>>>>
>>>> On 9/28/2022 3:39 PM, Peng Fan wrote:
>>>>>
>>>>>
>>>>> On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
>>>>>> On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
>>>>>>> Hi Mathieu,
>>>>>>>
>>>>>>> Thanks for reviewing this patchset.
>>>>>>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
>>>>>>>> attaching to i.MX8QXP M4
>>>>>>>>
>>>>>>>> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
>>>>>>>>> From: Peng Fan <peng.fan@nxp.com>
>>>>>>>>>
>>>>>>>>> When M4 is kicked by SCFW, M4 runs in its own hardware
>>>>>>>>> partition, Linux could only do IPC with M4, it could not
>>>>>>>>> start, stop, update image.
>>>>>>>>>
>>>>>>>>> We disable recovery reboot when M4 is managed by SCFW,
>>>>>>>>> because remoteproc core still not support M4 auto-recovery
>>>>>>>>> without loading image.
>>>>>>>>>
>>>>>>>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>>>>>>>> ---
>>>>>>>>> drivers/remoteproc/imx_rproc.c | 108
>>>>>>>>> ++++++++++++++++++++++++++++++++-
>>>>>>>>> 1 file changed, 107 insertions(+), 1 deletion(-)
>>>>>>>>>
>>>>>>>>> diff --git a/drivers/remoteproc/imx_rproc.c
>>>>>>>>> b/drivers/remoteproc/imx_rproc.c index
>>>>>>>>> 7cc4fd207e2d..bcba74e90020
>>>>>>>>> 100644
>>>>>>>>> --- a/drivers/remoteproc/imx_rproc.c
>>>>>>>>> +++ b/drivers/remoteproc/imx_rproc.c
>>>>>>>>> @@ -6,6 +6,7 @@
>>>>>>>>> #include <linux/arm-smccc.h>
>>>>>>>>> #include <linux/clk.h>
>>>>>>>>> #include <linux/err.h>
>>>>>>>>> +#include <linux/firmware/imx/sci.h>
>>>>>>>>> #include <linux/interrupt.h>
>>>>>>>>> #include <linux/kernel.h>
>>>>>>>>> #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
>>>>>>>>> #define IMX_SIP_RPROC_STARTED 0x01
>>>>>>>>> #define IMX_SIP_RPROC_STOP 0x02
>>>>>>>>>
>>>>>>>>> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
>>>>>>>>> +
>>>>>>>>> /**
>>>>>>>>> * struct imx_rproc_mem - slim internal memory structure
>>>>>>>>> * @cpu_addr: MPU virtual address of the memory region @@
>>>>>>>>> -89,6
>>>>>>>>> +92,10 @@ struct imx_rproc {
>>>>>>>>> struct work_struct rproc_work;
>>>>>>>>> struct workqueue_struct *workqueue;
>>>>>>>>> void __iomem *rsc_table;
>>>>>>>>> + struct imx_sc_ipc *ipc_handle;
>>>>>>>>> + struct notifier_block rproc_nb;
>>>>>>>>> + u32 rproc_pt; /* partition id */
>>>>>>>>> + u32 rsrc_id; /* resource id */
>>>>>>>>> };
>>>>>>>>>
>>>>>>>>> static const struct imx_rproc_att imx_rproc_att_imx93[] =
>>>>>>>>> { @@ -117,6
>>>>>>>>> +124,18 @@ static const struct imx_rproc_att
>>>>>>>>> +imx_rproc_att_imx93[] = {
>>>>>>>>> { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
>>>>>>>>>
>>>>>>>>> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
>>>>>>>>> +{
>>>>>>>>> + { 0x08000000, 0x08000000, 0x10000000, 0 },
>>>>>>>>> + /* TCML/U */
>>>>>>>>> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
>>>>>>>>> +ATT_IOMEM },
>>>>>>>>> + /* OCRAM(Low 96KB) */
>>>>>>>>> + { 0x21000000, 0x00100000, 0x00018000, 0 },
>>>>>>>>> + /* OCRAM */
>>>>>>>>> + { 0x21100000, 0x00100000, 0x00040000, 0 },
>>>>>>>>> + /* DDR (Data) */
>>>>>>>>> + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
>>>>>>>>> +
>>>>>>>>> static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
>>>>>>>>> {
>>>>>>>>> /* dev addr , sys addr , size , flags */
>>>>>>>>> /* ITCM */
>>>>>>>>> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
>>>>>>>> imx_rproc_cfg_imx8mq = {
>>>>>>>>> .method = IMX_RPROC_MMIO,
>>>>>>>>> };
>>>>>>>>>
>>>>>>>>> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
>>>>>>>>> +{
>>>>>>>>> + .att = imx_rproc_att_imx8qxp,
>>>>>>>>> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
>>>>>>>>> + .method = IMX_RPROC_SCU_API, };
>>>>>>>>> +
>>>>>>>>> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
>>>>>>>>> {
>>>>>>>>> .att = imx_rproc_att_imx8ulp,
>>>>>>>>> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
>>>>>>>>> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
>>>>>>>>> rproc
>>>>>>>> *rproc)
>>>>>>>>> mbox_free_channel(priv->rx_ch);
>>>>>>>>> }
>>>>>>>>>
>>>>>>>>> +static void imx_rproc_put_scu(struct rproc *rproc) {
>>>>>>>>> + struct imx_rproc *priv = rproc->priv;
>>>>>>>>> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
>>>>>>>>> +
>>>>>>>>> + if (dcfg->method != IMX_RPROC_SCU_API)
>>>>>>>>> + return;
>>>>>>>>> +
>>>>>>>>> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>>>>>> priv->rsrc_id))
>>>>>>>>> + return;
>>>>>>>>> +
>>>>>>>>> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
>>>>>>>> BIT(priv->rproc_pt), false);
>>>>>>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>>>>>>> +}
>>>>>>>>> +
>>>>>>>>> +static int imx_rproc_partition_notify(struct notifier_block
>>>>>>>>> +*nb,
>>>>>>>>> + unsigned long event, void *group) {
>>>>>>>>> + struct imx_rproc *priv = container_of(nb, struct
>>>>>>>>> +imx_rproc, rproc_nb);
>>>>>>>>> +
>>>>>>>>> + /* Ignore other irqs */
>>>>>>>>> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
>>>>>>>> IMX_SC_IRQ_GROUP_REBOOTED)))
>>>>>>>>> + return 0;
>>>>>>>>> +
>>>>>>>>> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
>>>>>>>>> +
>>>>>>>>> + pr_info("Partition%d reset!\n", priv->rproc_pt);
>>>>>>>>> +
>>>>>>>>> + return 0;
>>>>>>>>> +}
>>>>>>>>> +
>>>>>>>>> static int imx_rproc_detect_mode(struct imx_rproc *priv)
>>>>>>>>> {
>>>>>>>>> struct regmap_config config = { .name = "imx-rproc" };
>>>>>>>>> @@ -689,6
>>>>>>>>> +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
>>>>>>>>> +*priv)
>>>>>>>>> struct arm_smccc_res res;
>>>>>>>>> int ret;
>>>>>>>>> u32 val;
>>>>>>>>> + u8 pt;
>>>>>>>>>
>>>>>>>>> switch (dcfg->method) {
>>>>>>>>> case IMX_RPROC_NONE:
>>>>>>>>> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
>>>>>>>> imx_rproc *priv)
>>>>>>>>> if (res.a0)
>>>>>>>>> priv->rproc->state = RPROC_DETACHED;
>>>>>>>>> return 0;
>>>>>>>>> + case IMX_RPROC_SCU_API:
>>>>>>>>> + ret = imx_scu_get_handle(&priv->ipc_handle);
>>>>>>>>> + if (ret)
>>>>>>>>> + return ret;
>>>>>>>>> + ret = of_property_read_u32(dev->of_node,
>>>>>>>>> +"fsl,resource-id",
>>>>>>>> &priv->rsrc_id);
>>>>>>>>> + if (ret) {
>>>>>>>>> + dev_err(dev, "No fsl,resource-id property\n");
>>>>>>>>> + return ret;
>>>>>>>>> + }
>>>>>>>>> +
>>>>>>>>> + /*
>>>>>>>>> + * If Mcore resource is not owned by Acore
>>>>>>>>> +partition, It is
>>>>>>>> kicked by ROM,
>>>>>>>>> + * and Linux could only do IPC with Mcore and nothing else.
>>>>>>>>> + */
>>>>>>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>>>>>> +priv-
>>>>>>>>> rsrc_id))
>>>>>>>>> + return 0;
>>>>>>>>
>>>>>>>> If imx_sc_rm_is_resource_owned() return '1' than the remote
>>>>>>>> processor is under Linux's control and what follows below is
>>>>>>>> not needed.
>>>>>>>> That is also
>>>>>>>> coherent with the comment in [1].
>>>>>>>
>>>>>>> Case 1: If M4 is owned by Linux, here directly return 0.
>>>>>>> Case 2: If M4 is not owned by Linux, the following code after
>>>>>>> this line will set state as RPROC_DETACHED.
>>>>>>
>>>>>> I understand that part.
>>>>>>
>>>>>>>
>>>>>>> Patch 3/6(this patch) is only to support case 2.
>>>>>>> Patch 4/6 is to support case 1.
>>>>>>>
>>>>>>
>>>>>> Let's leave the subsequent patches alone for now.
>>>>>>
>>>>>>>>
>>>>>>>> That is in contrast with what is happening in
>>>>>>>> imx_rproc_put_scu(). There, if the remote processor is _not_
>>>>>>>> owned by Linux than the condition returns without calling
>>>>>>>> imx_scu_irq_group_enable() and
>>>>>>>> imx_scu_irq_unregister_notifier(). That seems to be a bug.
>>>>>>>
>>>>>>> No. The two functions only needed when M4 is in a separate
>>>>>>> hardware partition.
>>>>>>>
>>>>>>> The scu irq is only needed when M4 is out of linux control and
>>>>>>> need some notification such as M4 is reset by SCU(System Control
>>> Unit).
>>>>>>> That linux got
>>>>>>> notification that M4 is reset by SCU.
>>>>>>
>>>>>> I also understand that part.
>>>>>>
>>>>>> What I am underlining here is that when the M4 is independent,
>>>>>> function
>>>>>> imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
>>>>>> called but their cleanup equivalent are not called in
>>>>>> imx_rproc_put_scu() because of the '!'
>>>>>> in the if() statement.
>>>>>
>>>>> you are right, this is bug in my side. It should be as below based
>>>>> on patch 3/6.
>>>>>
>>>>> diff --git a/drivers/remoteproc/imx_rproc.c
>>>>> b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
>>>>> 100644
>>>>> --- a/drivers/remoteproc/imx_rproc.c
>>>>> +++ b/drivers/remoteproc/imx_rproc.c
>>>>> @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
>>>>> *rproc)
>>>>> if (dcfg->method != IMX_RPROC_SCU_API)
>>>>> return;
>>>>>
>>>>> - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>> priv->rsrc_id))
>>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>> +priv->rsrc_id))
>>>
>>> Indeed, which raises questions about how this patchset was tested. And it
>>> is not the first time we touch base on that.
>>
>> Patch 4/6 has this change, anyway I should not mix patch 3,4 here.
>>
>>>
>>>>> return;
>>>>>
>>>>> Thanks for detailed reviewing.
>>>>
>>>> If you are fine with this change, I could send out V6. Anyway, I'll
>>>> wait to see if you have other comments in this patchset.
>>>>
>>>
>>> I am out of time for this patchset and as such will not provide more
>>> comments on this revision.
>>
>> Sure. Thanks for your time. Since you have applied the attach recovery
>> part, next version will enable this feature in imx rproc.
>>
>
> I would rather not. Please introduce support for the recovery in
> another patchset, once this one has been merged.
I pushed the button too early, sorry. V6 was out yesterday, but the new
patch 7/7 is an incremetenl patch to enable attach recovery.
You could ignore patch 7/7 in V6, I will reply their to note. patch
[1-6]/7 is to achieve same as V5 patchset.
If you need to send V7 which just drop patch 7/7 in V6, please let me know.
Thanks,
Peng.
>
>> Thanks,
>> Peng.
>>
>>>
>>>> Thanks,
>>>> Peng.
>>>>
>>>>>
>>>>> Thanks,
>>>>> Peng.
>>>>>
>>>>>>
>>>>>>>
>>>>>>>>
>>>>>>>> There is also a problem in patch 4/6 associated to that.
>>>>>>>
>>>>>>> If the upper explanation eliminate your concern, "a problem in
>>>>>>> patch 4/6" should not be a problem.
>>>>>>>
>>>>>>> When M4 is owned by Linux, Linux need handle the power domain.
>>>>>>> If M4 is not owned
>>>>>>> by Linux, SCU firmware will handle the power domain, and Linux
>>>>>>> has no permission to touch that.
>>>>>>>
>>>>>>> Thanks
>>>>>>> Peng
>>>>>>>
>>>>>>>>
>>>>>>>> Thanks,
>>>>>>>> Mathieu
>>>>>>>>
>>>>>>>>
>>>>>>>> [1].
>>>>>>>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
>>>>>>>> F%2Felixir
>>>>>>>> .bootlin.com%2Flinux%2Fv6.0-
>>>>>>>>
>>> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
>>>>>>>> 0
>>>>>>>>
>>> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
>>>>>>>>
>>> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
>>>>>>>>
>>> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
>>>>>>>>
>>> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
>>>>>>>>
>>> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
>>>>>>>> =0
>>>>>>>>
>>>>>>>>> +
>>>>>>>>> + priv->rproc->state = RPROC_DETACHED;
>>>>>>>>> + priv->rproc->recovery_disabled = true;
>>>>>>>>> +
>>>>>>>>> + /* Get partition id and enable irq in SCFW */
>>>>>>>>> + ret =
>>>>>>>>> +imx_sc_rm_get_resource_owner(priv->ipc_handle,
>>>>>>>> priv->rsrc_id, &pt);
>>>>>>>>> + if (ret) {
>>>>>>>>> + dev_err(dev, "not able to get resource
>>>>>>>>> +owner\n");
>>>>>>>>> + return ret;
>>>>>>>>> + }
>>>>>>>>> +
>>>>>>>>> + priv->rproc_pt = pt;
>>>>>>>>> + priv->rproc_nb.notifier_call =
>>>>>>>>> +imx_rproc_partition_notify;
>>>>>>>>> +
>>>>>>>>> + ret =
>>>>>>>>> +imx_scu_irq_register_notifier(&priv->rproc_nb);
>>>>>>>>> + if (ret) {
>>>>>>>>> + dev_warn(dev, "register scu notifier
>>>>>>>>> +failed.\n");
>>>>>>>>> + return ret;
>>>>>>>>> + }
>>>>>>>>> +
>>>>>>>>> + ret =
>>>>>>>> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
>>> BIT(priv-
>>>>>>>>> rproc_pt),
>>>>>>>>> + true);
>>>>>>>>> + if (ret) {
>>>>>>>>> +
>>>>>>>>> +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>>>>>>> + dev_warn(dev, "Enable irq failed.\n");
>>>>>>>>> + return ret;
>>>>>>>>> + }
>>>>>>>>> +
>>>>>>>>> + return 0;
>>>>>>>>> default:
>>>>>>>>> break;
>>>>>>>>> }
>>>>>>>>> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
>>>>>>>>> platform_device
>>>>>>>>> *pdev)
>>>>>>>>>
>>>>>>>>> ret = imx_rproc_clk_enable(priv);
>>>>>>>>> if (ret)
>>>>>>>>> - goto err_put_mbox;
>>>>>>>>> + goto err_put_scu;
>>>>>>>>>
>>>>>>>>> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>>>>>>>>>
>>>>>>>>> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
>>>>>>>>> platform_device
>>>>>>>>> *pdev)
>>>>>>>>>
>>>>>>>>> err_put_clk:
>>>>>>>>> clk_disable_unprepare(priv->clk);
>>>>>>>>> +err_put_scu:
>>>>>>>>> + imx_rproc_put_scu(rproc);
>>>>>>>>> err_put_mbox:
>>>>>>>>> imx_rproc_free_mbox(rproc);
>>>>>>>>> err_put_wkq:
>>>>>>>>> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
>>>>>>>> platform_device
>>>>>>>>> *pdev)
>>>>>>>>>
>>>>>>>>> clk_disable_unprepare(priv->clk);
>>>>>>>>> rproc_del(rproc);
>>>>>>>>> + imx_rproc_put_scu(rproc);
>>>>>>>>> imx_rproc_free_mbox(rproc);
>>>>>>>>> destroy_workqueue(priv->workqueue);
>>>>>>>>> rproc_free(rproc);
>>>>>>>>> @@ -852,6 +957,7 @@ static const struct of_device_id
>>>>>>>> imx_rproc_of_match[] = {
>>>>>>>>> { .compatible = "fsl,imx8mm-cm4", .data =
>>>>>>>> &imx_rproc_cfg_imx8mq },
>>>>>>>>> { .compatible = "fsl,imx8mn-cm7", .data =
>>>>>>>> &imx_rproc_cfg_imx8mn },
>>>>>>>>> { .compatible = "fsl,imx8mp-cm7", .data =
>>>>>>>> &imx_rproc_cfg_imx8mn },
>>>>>>>>> + { .compatible = "fsl,imx8qxp-cm4", .data =
>>>>>>>> &imx_rproc_cfg_imx8qxp },
>>>>>>>>> { .compatible = "fsl,imx8ulp-cm33", .data =
>>>>>>>> &imx_rproc_cfg_imx8ulp },
>>>>>>>>> { .compatible = "fsl,imx93-cm33", .data =
>>>>>>>>> &imx_rproc_cfg_imx93 },
>>>>>>>>> {},
>>>>>>>>> --
>>>>>>>>> 2.37.1
>>>>>>>>>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-29 23:16 ` Peng Fan
0 siblings, 0 replies; 40+ messages in thread
From: Peng Fan @ 2022-09-29 23:16 UTC (permalink / raw)
To: Mathieu Poirier, Peng Fan
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
On 9/29/2022 10:58 PM, Mathieu Poirier wrote:
> On Wed, 28 Sept 2022 at 21:52, Peng Fan <peng.fan@nxp.com> wrote:
>>
>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
>>> i.MX8QXP M4
>>>
>>> On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
>>>> Hi Mathieu,
>>>>
>>>> On 9/28/2022 3:39 PM, Peng Fan wrote:
>>>>>
>>>>>
>>>>> On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
>>>>>> On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
>>>>>>> Hi Mathieu,
>>>>>>>
>>>>>>> Thanks for reviewing this patchset.
>>>>>>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
>>>>>>>> attaching to i.MX8QXP M4
>>>>>>>>
>>>>>>>> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
>>>>>>>>> From: Peng Fan <peng.fan@nxp.com>
>>>>>>>>>
>>>>>>>>> When M4 is kicked by SCFW, M4 runs in its own hardware
>>>>>>>>> partition, Linux could only do IPC with M4, it could not
>>>>>>>>> start, stop, update image.
>>>>>>>>>
>>>>>>>>> We disable recovery reboot when M4 is managed by SCFW,
>>>>>>>>> because remoteproc core still not support M4 auto-recovery
>>>>>>>>> without loading image.
>>>>>>>>>
>>>>>>>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>>>>>>>> ---
>>>>>>>>> drivers/remoteproc/imx_rproc.c | 108
>>>>>>>>> ++++++++++++++++++++++++++++++++-
>>>>>>>>> 1 file changed, 107 insertions(+), 1 deletion(-)
>>>>>>>>>
>>>>>>>>> diff --git a/drivers/remoteproc/imx_rproc.c
>>>>>>>>> b/drivers/remoteproc/imx_rproc.c index
>>>>>>>>> 7cc4fd207e2d..bcba74e90020
>>>>>>>>> 100644
>>>>>>>>> --- a/drivers/remoteproc/imx_rproc.c
>>>>>>>>> +++ b/drivers/remoteproc/imx_rproc.c
>>>>>>>>> @@ -6,6 +6,7 @@
>>>>>>>>> #include <linux/arm-smccc.h>
>>>>>>>>> #include <linux/clk.h>
>>>>>>>>> #include <linux/err.h>
>>>>>>>>> +#include <linux/firmware/imx/sci.h>
>>>>>>>>> #include <linux/interrupt.h>
>>>>>>>>> #include <linux/kernel.h>
>>>>>>>>> #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
>>>>>>>>> #define IMX_SIP_RPROC_STARTED 0x01
>>>>>>>>> #define IMX_SIP_RPROC_STOP 0x02
>>>>>>>>>
>>>>>>>>> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
>>>>>>>>> +
>>>>>>>>> /**
>>>>>>>>> * struct imx_rproc_mem - slim internal memory structure
>>>>>>>>> * @cpu_addr: MPU virtual address of the memory region @@
>>>>>>>>> -89,6
>>>>>>>>> +92,10 @@ struct imx_rproc {
>>>>>>>>> struct work_struct rproc_work;
>>>>>>>>> struct workqueue_struct *workqueue;
>>>>>>>>> void __iomem *rsc_table;
>>>>>>>>> + struct imx_sc_ipc *ipc_handle;
>>>>>>>>> + struct notifier_block rproc_nb;
>>>>>>>>> + u32 rproc_pt; /* partition id */
>>>>>>>>> + u32 rsrc_id; /* resource id */
>>>>>>>>> };
>>>>>>>>>
>>>>>>>>> static const struct imx_rproc_att imx_rproc_att_imx93[] =
>>>>>>>>> { @@ -117,6
>>>>>>>>> +124,18 @@ static const struct imx_rproc_att
>>>>>>>>> +imx_rproc_att_imx93[] = {
>>>>>>>>> { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
>>>>>>>>>
>>>>>>>>> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
>>>>>>>>> +{
>>>>>>>>> + { 0x08000000, 0x08000000, 0x10000000, 0 },
>>>>>>>>> + /* TCML/U */
>>>>>>>>> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
>>>>>>>>> +ATT_IOMEM },
>>>>>>>>> + /* OCRAM(Low 96KB) */
>>>>>>>>> + { 0x21000000, 0x00100000, 0x00018000, 0 },
>>>>>>>>> + /* OCRAM */
>>>>>>>>> + { 0x21100000, 0x00100000, 0x00040000, 0 },
>>>>>>>>> + /* DDR (Data) */
>>>>>>>>> + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
>>>>>>>>> +
>>>>>>>>> static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
>>>>>>>>> {
>>>>>>>>> /* dev addr , sys addr , size , flags */
>>>>>>>>> /* ITCM */
>>>>>>>>> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
>>>>>>>> imx_rproc_cfg_imx8mq = {
>>>>>>>>> .method = IMX_RPROC_MMIO,
>>>>>>>>> };
>>>>>>>>>
>>>>>>>>> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
>>>>>>>>> +{
>>>>>>>>> + .att = imx_rproc_att_imx8qxp,
>>>>>>>>> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
>>>>>>>>> + .method = IMX_RPROC_SCU_API, };
>>>>>>>>> +
>>>>>>>>> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
>>>>>>>>> {
>>>>>>>>> .att = imx_rproc_att_imx8ulp,
>>>>>>>>> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
>>>>>>>>> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
>>>>>>>>> rproc
>>>>>>>> *rproc)
>>>>>>>>> mbox_free_channel(priv->rx_ch);
>>>>>>>>> }
>>>>>>>>>
>>>>>>>>> +static void imx_rproc_put_scu(struct rproc *rproc) {
>>>>>>>>> + struct imx_rproc *priv = rproc->priv;
>>>>>>>>> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
>>>>>>>>> +
>>>>>>>>> + if (dcfg->method != IMX_RPROC_SCU_API)
>>>>>>>>> + return;
>>>>>>>>> +
>>>>>>>>> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>>>>>> priv->rsrc_id))
>>>>>>>>> + return;
>>>>>>>>> +
>>>>>>>>> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
>>>>>>>> BIT(priv->rproc_pt), false);
>>>>>>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>>>>>>> +}
>>>>>>>>> +
>>>>>>>>> +static int imx_rproc_partition_notify(struct notifier_block
>>>>>>>>> +*nb,
>>>>>>>>> + unsigned long event, void *group) {
>>>>>>>>> + struct imx_rproc *priv = container_of(nb, struct
>>>>>>>>> +imx_rproc, rproc_nb);
>>>>>>>>> +
>>>>>>>>> + /* Ignore other irqs */
>>>>>>>>> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
>>>>>>>> IMX_SC_IRQ_GROUP_REBOOTED)))
>>>>>>>>> + return 0;
>>>>>>>>> +
>>>>>>>>> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
>>>>>>>>> +
>>>>>>>>> + pr_info("Partition%d reset!\n", priv->rproc_pt);
>>>>>>>>> +
>>>>>>>>> + return 0;
>>>>>>>>> +}
>>>>>>>>> +
>>>>>>>>> static int imx_rproc_detect_mode(struct imx_rproc *priv)
>>>>>>>>> {
>>>>>>>>> struct regmap_config config = { .name = "imx-rproc" };
>>>>>>>>> @@ -689,6
>>>>>>>>> +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
>>>>>>>>> +*priv)
>>>>>>>>> struct arm_smccc_res res;
>>>>>>>>> int ret;
>>>>>>>>> u32 val;
>>>>>>>>> + u8 pt;
>>>>>>>>>
>>>>>>>>> switch (dcfg->method) {
>>>>>>>>> case IMX_RPROC_NONE:
>>>>>>>>> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
>>>>>>>> imx_rproc *priv)
>>>>>>>>> if (res.a0)
>>>>>>>>> priv->rproc->state = RPROC_DETACHED;
>>>>>>>>> return 0;
>>>>>>>>> + case IMX_RPROC_SCU_API:
>>>>>>>>> + ret = imx_scu_get_handle(&priv->ipc_handle);
>>>>>>>>> + if (ret)
>>>>>>>>> + return ret;
>>>>>>>>> + ret = of_property_read_u32(dev->of_node,
>>>>>>>>> +"fsl,resource-id",
>>>>>>>> &priv->rsrc_id);
>>>>>>>>> + if (ret) {
>>>>>>>>> + dev_err(dev, "No fsl,resource-id property\n");
>>>>>>>>> + return ret;
>>>>>>>>> + }
>>>>>>>>> +
>>>>>>>>> + /*
>>>>>>>>> + * If Mcore resource is not owned by Acore
>>>>>>>>> +partition, It is
>>>>>>>> kicked by ROM,
>>>>>>>>> + * and Linux could only do IPC with Mcore and nothing else.
>>>>>>>>> + */
>>>>>>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>>>>>> +priv-
>>>>>>>>> rsrc_id))
>>>>>>>>> + return 0;
>>>>>>>>
>>>>>>>> If imx_sc_rm_is_resource_owned() return '1' than the remote
>>>>>>>> processor is under Linux's control and what follows below is
>>>>>>>> not needed.
>>>>>>>> That is also
>>>>>>>> coherent with the comment in [1].
>>>>>>>
>>>>>>> Case 1: If M4 is owned by Linux, here directly return 0.
>>>>>>> Case 2: If M4 is not owned by Linux, the following code after
>>>>>>> this line will set state as RPROC_DETACHED.
>>>>>>
>>>>>> I understand that part.
>>>>>>
>>>>>>>
>>>>>>> Patch 3/6(this patch) is only to support case 2.
>>>>>>> Patch 4/6 is to support case 1.
>>>>>>>
>>>>>>
>>>>>> Let's leave the subsequent patches alone for now.
>>>>>>
>>>>>>>>
>>>>>>>> That is in contrast with what is happening in
>>>>>>>> imx_rproc_put_scu(). There, if the remote processor is _not_
>>>>>>>> owned by Linux than the condition returns without calling
>>>>>>>> imx_scu_irq_group_enable() and
>>>>>>>> imx_scu_irq_unregister_notifier(). That seems to be a bug.
>>>>>>>
>>>>>>> No. The two functions only needed when M4 is in a separate
>>>>>>> hardware partition.
>>>>>>>
>>>>>>> The scu irq is only needed when M4 is out of linux control and
>>>>>>> need some notification such as M4 is reset by SCU(System Control
>>> Unit).
>>>>>>> That linux got
>>>>>>> notification that M4 is reset by SCU.
>>>>>>
>>>>>> I also understand that part.
>>>>>>
>>>>>> What I am underlining here is that when the M4 is independent,
>>>>>> function
>>>>>> imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
>>>>>> called but their cleanup equivalent are not called in
>>>>>> imx_rproc_put_scu() because of the '!'
>>>>>> in the if() statement.
>>>>>
>>>>> you are right, this is bug in my side. It should be as below based
>>>>> on patch 3/6.
>>>>>
>>>>> diff --git a/drivers/remoteproc/imx_rproc.c
>>>>> b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
>>>>> 100644
>>>>> --- a/drivers/remoteproc/imx_rproc.c
>>>>> +++ b/drivers/remoteproc/imx_rproc.c
>>>>> @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
>>>>> *rproc)
>>>>> if (dcfg->method != IMX_RPROC_SCU_API)
>>>>> return;
>>>>>
>>>>> - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>> priv->rsrc_id))
>>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
>>>>> +priv->rsrc_id))
>>>
>>> Indeed, which raises questions about how this patchset was tested. And it
>>> is not the first time we touch base on that.
>>
>> Patch 4/6 has this change, anyway I should not mix patch 3,4 here.
>>
>>>
>>>>> return;
>>>>>
>>>>> Thanks for detailed reviewing.
>>>>
>>>> If you are fine with this change, I could send out V6. Anyway, I'll
>>>> wait to see if you have other comments in this patchset.
>>>>
>>>
>>> I am out of time for this patchset and as such will not provide more
>>> comments on this revision.
>>
>> Sure. Thanks for your time. Since you have applied the attach recovery
>> part, next version will enable this feature in imx rproc.
>>
>
> I would rather not. Please introduce support for the recovery in
> another patchset, once this one has been merged.
I pushed the button too early, sorry. V6 was out yesterday, but the new
patch 7/7 is an incremetenl patch to enable attach recovery.
You could ignore patch 7/7 in V6, I will reply their to note. patch
[1-6]/7 is to achieve same as V5 patchset.
If you need to send V7 which just drop patch 7/7 in V6, please let me know.
Thanks,
Peng.
>
>> Thanks,
>> Peng.
>>
>>>
>>>> Thanks,
>>>> Peng.
>>>>
>>>>>
>>>>> Thanks,
>>>>> Peng.
>>>>>
>>>>>>
>>>>>>>
>>>>>>>>
>>>>>>>> There is also a problem in patch 4/6 associated to that.
>>>>>>>
>>>>>>> If the upper explanation eliminate your concern, "a problem in
>>>>>>> patch 4/6" should not be a problem.
>>>>>>>
>>>>>>> When M4 is owned by Linux, Linux need handle the power domain.
>>>>>>> If M4 is not owned
>>>>>>> by Linux, SCU firmware will handle the power domain, and Linux
>>>>>>> has no permission to touch that.
>>>>>>>
>>>>>>> Thanks
>>>>>>> Peng
>>>>>>>
>>>>>>>>
>>>>>>>> Thanks,
>>>>>>>> Mathieu
>>>>>>>>
>>>>>>>>
>>>>>>>> [1].
>>>>>>>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
>>>>>>>> F%2Felixir
>>>>>>>> .bootlin.com%2Flinux%2Fv6.0-
>>>>>>>>
>>> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
>>>>>>>> 0
>>>>>>>>
>>> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
>>>>>>>>
>>> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
>>>>>>>>
>>> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
>>>>>>>>
>>> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
>>>>>>>>
>>> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
>>>>>>>> =0
>>>>>>>>
>>>>>>>>> +
>>>>>>>>> + priv->rproc->state = RPROC_DETACHED;
>>>>>>>>> + priv->rproc->recovery_disabled = true;
>>>>>>>>> +
>>>>>>>>> + /* Get partition id and enable irq in SCFW */
>>>>>>>>> + ret =
>>>>>>>>> +imx_sc_rm_get_resource_owner(priv->ipc_handle,
>>>>>>>> priv->rsrc_id, &pt);
>>>>>>>>> + if (ret) {
>>>>>>>>> + dev_err(dev, "not able to get resource
>>>>>>>>> +owner\n");
>>>>>>>>> + return ret;
>>>>>>>>> + }
>>>>>>>>> +
>>>>>>>>> + priv->rproc_pt = pt;
>>>>>>>>> + priv->rproc_nb.notifier_call =
>>>>>>>>> +imx_rproc_partition_notify;
>>>>>>>>> +
>>>>>>>>> + ret =
>>>>>>>>> +imx_scu_irq_register_notifier(&priv->rproc_nb);
>>>>>>>>> + if (ret) {
>>>>>>>>> + dev_warn(dev, "register scu notifier
>>>>>>>>> +failed.\n");
>>>>>>>>> + return ret;
>>>>>>>>> + }
>>>>>>>>> +
>>>>>>>>> + ret =
>>>>>>>> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
>>> BIT(priv-
>>>>>>>>> rproc_pt),
>>>>>>>>> + true);
>>>>>>>>> + if (ret) {
>>>>>>>>> +
>>>>>>>>> +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
>>>>>>>>> + dev_warn(dev, "Enable irq failed.\n");
>>>>>>>>> + return ret;
>>>>>>>>> + }
>>>>>>>>> +
>>>>>>>>> + return 0;
>>>>>>>>> default:
>>>>>>>>> break;
>>>>>>>>> }
>>>>>>>>> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
>>>>>>>>> platform_device
>>>>>>>>> *pdev)
>>>>>>>>>
>>>>>>>>> ret = imx_rproc_clk_enable(priv);
>>>>>>>>> if (ret)
>>>>>>>>> - goto err_put_mbox;
>>>>>>>>> + goto err_put_scu;
>>>>>>>>>
>>>>>>>>> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>>>>>>>>>
>>>>>>>>> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
>>>>>>>>> platform_device
>>>>>>>>> *pdev)
>>>>>>>>>
>>>>>>>>> err_put_clk:
>>>>>>>>> clk_disable_unprepare(priv->clk);
>>>>>>>>> +err_put_scu:
>>>>>>>>> + imx_rproc_put_scu(rproc);
>>>>>>>>> err_put_mbox:
>>>>>>>>> imx_rproc_free_mbox(rproc);
>>>>>>>>> err_put_wkq:
>>>>>>>>> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
>>>>>>>> platform_device
>>>>>>>>> *pdev)
>>>>>>>>>
>>>>>>>>> clk_disable_unprepare(priv->clk);
>>>>>>>>> rproc_del(rproc);
>>>>>>>>> + imx_rproc_put_scu(rproc);
>>>>>>>>> imx_rproc_free_mbox(rproc);
>>>>>>>>> destroy_workqueue(priv->workqueue);
>>>>>>>>> rproc_free(rproc);
>>>>>>>>> @@ -852,6 +957,7 @@ static const struct of_device_id
>>>>>>>> imx_rproc_of_match[] = {
>>>>>>>>> { .compatible = "fsl,imx8mm-cm4", .data =
>>>>>>>> &imx_rproc_cfg_imx8mq },
>>>>>>>>> { .compatible = "fsl,imx8mn-cm7", .data =
>>>>>>>> &imx_rproc_cfg_imx8mn },
>>>>>>>>> { .compatible = "fsl,imx8mp-cm7", .data =
>>>>>>>> &imx_rproc_cfg_imx8mn },
>>>>>>>>> + { .compatible = "fsl,imx8qxp-cm4", .data =
>>>>>>>> &imx_rproc_cfg_imx8qxp },
>>>>>>>>> { .compatible = "fsl,imx8ulp-cm33", .data =
>>>>>>>> &imx_rproc_cfg_imx8ulp },
>>>>>>>>> { .compatible = "fsl,imx93-cm33", .data =
>>>>>>>>> &imx_rproc_cfg_imx93 },
>>>>>>>>> {},
>>>>>>>>> --
>>>>>>>>> 2.37.1
>>>>>>>>>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
2022-09-29 23:16 ` Peng Fan
@ 2022-09-29 23:24 ` Mathieu Poirier
-1 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-29 23:24 UTC (permalink / raw)
To: Peng Fan
Cc: Peng Fan, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
On Thu, 29 Sept 2022 at 17:17, Peng Fan <peng.fan@oss.nxp.com> wrote:
>
>
>
> On 9/29/2022 10:58 PM, Mathieu Poirier wrote:
> > On Wed, 28 Sept 2022 at 21:52, Peng Fan <peng.fan@nxp.com> wrote:
> >>
> >>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> >>> i.MX8QXP M4
> >>>
> >>> On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> >>>> Hi Mathieu,
> >>>>
> >>>> On 9/28/2022 3:39 PM, Peng Fan wrote:
> >>>>>
> >>>>>
> >>>>> On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> >>>>>> On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> >>>>>>> Hi Mathieu,
> >>>>>>>
> >>>>>>> Thanks for reviewing this patchset.
> >>>>>>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
> >>>>>>>> attaching to i.MX8QXP M4
> >>>>>>>>
> >>>>>>>> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> >>>>>>>>> From: Peng Fan <peng.fan@nxp.com>
> >>>>>>>>>
> >>>>>>>>> When M4 is kicked by SCFW, M4 runs in its own hardware
> >>>>>>>>> partition, Linux could only do IPC with M4, it could not
> >>>>>>>>> start, stop, update image.
> >>>>>>>>>
> >>>>>>>>> We disable recovery reboot when M4 is managed by SCFW,
> >>>>>>>>> because remoteproc core still not support M4 auto-recovery
> >>>>>>>>> without loading image.
> >>>>>>>>>
> >>>>>>>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> >>>>>>>>> ---
> >>>>>>>>> drivers/remoteproc/imx_rproc.c | 108
> >>>>>>>>> ++++++++++++++++++++++++++++++++-
> >>>>>>>>> 1 file changed, 107 insertions(+), 1 deletion(-)
> >>>>>>>>>
> >>>>>>>>> diff --git a/drivers/remoteproc/imx_rproc.c
> >>>>>>>>> b/drivers/remoteproc/imx_rproc.c index
> >>>>>>>>> 7cc4fd207e2d..bcba74e90020
> >>>>>>>>> 100644
> >>>>>>>>> --- a/drivers/remoteproc/imx_rproc.c
> >>>>>>>>> +++ b/drivers/remoteproc/imx_rproc.c
> >>>>>>>>> @@ -6,6 +6,7 @@
> >>>>>>>>> #include <linux/arm-smccc.h>
> >>>>>>>>> #include <linux/clk.h>
> >>>>>>>>> #include <linux/err.h>
> >>>>>>>>> +#include <linux/firmware/imx/sci.h>
> >>>>>>>>> #include <linux/interrupt.h>
> >>>>>>>>> #include <linux/kernel.h>
> >>>>>>>>> #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
> >>>>>>>>> #define IMX_SIP_RPROC_STARTED 0x01
> >>>>>>>>> #define IMX_SIP_RPROC_STOP 0x02
> >>>>>>>>>
> >>>>>>>>> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> >>>>>>>>> +
> >>>>>>>>> /**
> >>>>>>>>> * struct imx_rproc_mem - slim internal memory structure
> >>>>>>>>> * @cpu_addr: MPU virtual address of the memory region @@
> >>>>>>>>> -89,6
> >>>>>>>>> +92,10 @@ struct imx_rproc {
> >>>>>>>>> struct work_struct rproc_work;
> >>>>>>>>> struct workqueue_struct *workqueue;
> >>>>>>>>> void __iomem *rsc_table;
> >>>>>>>>> + struct imx_sc_ipc *ipc_handle;
> >>>>>>>>> + struct notifier_block rproc_nb;
> >>>>>>>>> + u32 rproc_pt; /* partition id */
> >>>>>>>>> + u32 rsrc_id; /* resource id */
> >>>>>>>>> };
> >>>>>>>>>
> >>>>>>>>> static const struct imx_rproc_att imx_rproc_att_imx93[] =
> >>>>>>>>> { @@ -117,6
> >>>>>>>>> +124,18 @@ static const struct imx_rproc_att
> >>>>>>>>> +imx_rproc_att_imx93[] = {
> >>>>>>>>> { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> >>>>>>>>>
> >>>>>>>>> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
> >>>>>>>>> +{
> >>>>>>>>> + { 0x08000000, 0x08000000, 0x10000000, 0 },
> >>>>>>>>> + /* TCML/U */
> >>>>>>>>> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
> >>>>>>>>> +ATT_IOMEM },
> >>>>>>>>> + /* OCRAM(Low 96KB) */
> >>>>>>>>> + { 0x21000000, 0x00100000, 0x00018000, 0 },
> >>>>>>>>> + /* OCRAM */
> >>>>>>>>> + { 0x21100000, 0x00100000, 0x00040000, 0 },
> >>>>>>>>> + /* DDR (Data) */
> >>>>>>>>> + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> >>>>>>>>> +
> >>>>>>>>> static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
> >>>>>>>>> {
> >>>>>>>>> /* dev addr , sys addr , size , flags */
> >>>>>>>>> /* ITCM */
> >>>>>>>>> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> >>>>>>>> imx_rproc_cfg_imx8mq = {
> >>>>>>>>> .method = IMX_RPROC_MMIO,
> >>>>>>>>> };
> >>>>>>>>>
> >>>>>>>>> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
> >>>>>>>>> +{
> >>>>>>>>> + .att = imx_rproc_att_imx8qxp,
> >>>>>>>>> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> >>>>>>>>> + .method = IMX_RPROC_SCU_API, };
> >>>>>>>>> +
> >>>>>>>>> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
> >>>>>>>>> {
> >>>>>>>>> .att = imx_rproc_att_imx8ulp,
> >>>>>>>>> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> >>>>>>>>> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
> >>>>>>>>> rproc
> >>>>>>>> *rproc)
> >>>>>>>>> mbox_free_channel(priv->rx_ch);
> >>>>>>>>> }
> >>>>>>>>>
> >>>>>>>>> +static void imx_rproc_put_scu(struct rproc *rproc) {
> >>>>>>>>> + struct imx_rproc *priv = rproc->priv;
> >>>>>>>>> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> >>>>>>>>> +
> >>>>>>>>> + if (dcfg->method != IMX_RPROC_SCU_API)
> >>>>>>>>> + return;
> >>>>>>>>> +
> >>>>>>>>> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> >>>>>>>>> priv->rsrc_id))
> >>>>>>>>> + return;
> >>>>>>>>> +
> >>>>>>>>> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> >>>>>>>> BIT(priv->rproc_pt), false);
> >>>>>>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> >>>>>>>>> +}
> >>>>>>>>> +
> >>>>>>>>> +static int imx_rproc_partition_notify(struct notifier_block
> >>>>>>>>> +*nb,
> >>>>>>>>> + unsigned long event, void *group) {
> >>>>>>>>> + struct imx_rproc *priv = container_of(nb, struct
> >>>>>>>>> +imx_rproc, rproc_nb);
> >>>>>>>>> +
> >>>>>>>>> + /* Ignore other irqs */
> >>>>>>>>> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> >>>>>>>> IMX_SC_IRQ_GROUP_REBOOTED)))
> >>>>>>>>> + return 0;
> >>>>>>>>> +
> >>>>>>>>> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> >>>>>>>>> +
> >>>>>>>>> + pr_info("Partition%d reset!\n", priv->rproc_pt);
> >>>>>>>>> +
> >>>>>>>>> + return 0;
> >>>>>>>>> +}
> >>>>>>>>> +
> >>>>>>>>> static int imx_rproc_detect_mode(struct imx_rproc *priv)
> >>>>>>>>> {
> >>>>>>>>> struct regmap_config config = { .name = "imx-rproc" };
> >>>>>>>>> @@ -689,6
> >>>>>>>>> +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
> >>>>>>>>> +*priv)
> >>>>>>>>> struct arm_smccc_res res;
> >>>>>>>>> int ret;
> >>>>>>>>> u32 val;
> >>>>>>>>> + u8 pt;
> >>>>>>>>>
> >>>>>>>>> switch (dcfg->method) {
> >>>>>>>>> case IMX_RPROC_NONE:
> >>>>>>>>> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> >>>>>>>> imx_rproc *priv)
> >>>>>>>>> if (res.a0)
> >>>>>>>>> priv->rproc->state = RPROC_DETACHED;
> >>>>>>>>> return 0;
> >>>>>>>>> + case IMX_RPROC_SCU_API:
> >>>>>>>>> + ret = imx_scu_get_handle(&priv->ipc_handle);
> >>>>>>>>> + if (ret)
> >>>>>>>>> + return ret;
> >>>>>>>>> + ret = of_property_read_u32(dev->of_node,
> >>>>>>>>> +"fsl,resource-id",
> >>>>>>>> &priv->rsrc_id);
> >>>>>>>>> + if (ret) {
> >>>>>>>>> + dev_err(dev, "No fsl,resource-id property\n");
> >>>>>>>>> + return ret;
> >>>>>>>>> + }
> >>>>>>>>> +
> >>>>>>>>> + /*
> >>>>>>>>> + * If Mcore resource is not owned by Acore
> >>>>>>>>> +partition, It is
> >>>>>>>> kicked by ROM,
> >>>>>>>>> + * and Linux could only do IPC with Mcore and nothing else.
> >>>>>>>>> + */
> >>>>>>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> >>>>>>>>> +priv-
> >>>>>>>>> rsrc_id))
> >>>>>>>>> + return 0;
> >>>>>>>>
> >>>>>>>> If imx_sc_rm_is_resource_owned() return '1' than the remote
> >>>>>>>> processor is under Linux's control and what follows below is
> >>>>>>>> not needed.
> >>>>>>>> That is also
> >>>>>>>> coherent with the comment in [1].
> >>>>>>>
> >>>>>>> Case 1: If M4 is owned by Linux, here directly return 0.
> >>>>>>> Case 2: If M4 is not owned by Linux, the following code after
> >>>>>>> this line will set state as RPROC_DETACHED.
> >>>>>>
> >>>>>> I understand that part.
> >>>>>>
> >>>>>>>
> >>>>>>> Patch 3/6(this patch) is only to support case 2.
> >>>>>>> Patch 4/6 is to support case 1.
> >>>>>>>
> >>>>>>
> >>>>>> Let's leave the subsequent patches alone for now.
> >>>>>>
> >>>>>>>>
> >>>>>>>> That is in contrast with what is happening in
> >>>>>>>> imx_rproc_put_scu(). There, if the remote processor is _not_
> >>>>>>>> owned by Linux than the condition returns without calling
> >>>>>>>> imx_scu_irq_group_enable() and
> >>>>>>>> imx_scu_irq_unregister_notifier(). That seems to be a bug.
> >>>>>>>
> >>>>>>> No. The two functions only needed when M4 is in a separate
> >>>>>>> hardware partition.
> >>>>>>>
> >>>>>>> The scu irq is only needed when M4 is out of linux control and
> >>>>>>> need some notification such as M4 is reset by SCU(System Control
> >>> Unit).
> >>>>>>> That linux got
> >>>>>>> notification that M4 is reset by SCU.
> >>>>>>
> >>>>>> I also understand that part.
> >>>>>>
> >>>>>> What I am underlining here is that when the M4 is independent,
> >>>>>> function
> >>>>>> imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> >>>>>> called but their cleanup equivalent are not called in
> >>>>>> imx_rproc_put_scu() because of the '!'
> >>>>>> in the if() statement.
> >>>>>
> >>>>> you are right, this is bug in my side. It should be as below based
> >>>>> on patch 3/6.
> >>>>>
> >>>>> diff --git a/drivers/remoteproc/imx_rproc.c
> >>>>> b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
> >>>>> 100644
> >>>>> --- a/drivers/remoteproc/imx_rproc.c
> >>>>> +++ b/drivers/remoteproc/imx_rproc.c
> >>>>> @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
> >>>>> *rproc)
> >>>>> if (dcfg->method != IMX_RPROC_SCU_API)
> >>>>> return;
> >>>>>
> >>>>> - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> >>>>> priv->rsrc_id))
> >>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> >>>>> +priv->rsrc_id))
> >>>
> >>> Indeed, which raises questions about how this patchset was tested. And it
> >>> is not the first time we touch base on that.
> >>
> >> Patch 4/6 has this change, anyway I should not mix patch 3,4 here.
> >>
> >>>
> >>>>> return;
> >>>>>
> >>>>> Thanks for detailed reviewing.
> >>>>
> >>>> If you are fine with this change, I could send out V6. Anyway, I'll
> >>>> wait to see if you have other comments in this patchset.
> >>>>
> >>>
> >>> I am out of time for this patchset and as such will not provide more
> >>> comments on this revision.
> >>
> >> Sure. Thanks for your time. Since you have applied the attach recovery
> >> part, next version will enable this feature in imx rproc.
> >>
> >
> > I would rather not. Please introduce support for the recovery in
> > another patchset, once this one has been merged.
>
> I pushed the button too early, sorry. V6 was out yesterday, but the new
> patch 7/7 is an incremetenl patch to enable attach recovery.
>
Right, I noticed that after replying to you.
> You could ignore patch 7/7 in V6, I will reply their to note. patch
> [1-6]/7 is to achieve same as V5 patchset.
>
> If you need to send V7 which just drop patch 7/7 in V6, please let me know.
It is not a problem if all the new functionality is in a patch on its
own. At least the mental picture I have of the first 6 patches
doesn't change. No need to send a new revision.
>
> Thanks,
> Peng.
>
> >
> >> Thanks,
> >> Peng.
> >>
> >>>
> >>>> Thanks,
> >>>> Peng.
> >>>>
> >>>>>
> >>>>> Thanks,
> >>>>> Peng.
> >>>>>
> >>>>>>
> >>>>>>>
> >>>>>>>>
> >>>>>>>> There is also a problem in patch 4/6 associated to that.
> >>>>>>>
> >>>>>>> If the upper explanation eliminate your concern, "a problem in
> >>>>>>> patch 4/6" should not be a problem.
> >>>>>>>
> >>>>>>> When M4 is owned by Linux, Linux need handle the power domain.
> >>>>>>> If M4 is not owned
> >>>>>>> by Linux, SCU firmware will handle the power domain, and Linux
> >>>>>>> has no permission to touch that.
> >>>>>>>
> >>>>>>> Thanks
> >>>>>>> Peng
> >>>>>>>
> >>>>>>>>
> >>>>>>>> Thanks,
> >>>>>>>> Mathieu
> >>>>>>>>
> >>>>>>>>
> >>>>>>>> [1].
> >>>>>>>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
> >>>>>>>> F%2Felixir
> >>>>>>>> .bootlin.com%2Flinux%2Fv6.0-
> >>>>>>>>
> >>> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
> >>>>>>>> 0
> >>>>>>>>
> >>> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> >>>>>>>>
> >>> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> >>>>>>>>
> >>> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> >>>>>>>>
> >>> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> >>>>>>>>
> >>> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> >>>>>>>> =0
> >>>>>>>>
> >>>>>>>>> +
> >>>>>>>>> + priv->rproc->state = RPROC_DETACHED;
> >>>>>>>>> + priv->rproc->recovery_disabled = true;
> >>>>>>>>> +
> >>>>>>>>> + /* Get partition id and enable irq in SCFW */
> >>>>>>>>> + ret =
> >>>>>>>>> +imx_sc_rm_get_resource_owner(priv->ipc_handle,
> >>>>>>>> priv->rsrc_id, &pt);
> >>>>>>>>> + if (ret) {
> >>>>>>>>> + dev_err(dev, "not able to get resource
> >>>>>>>>> +owner\n");
> >>>>>>>>> + return ret;
> >>>>>>>>> + }
> >>>>>>>>> +
> >>>>>>>>> + priv->rproc_pt = pt;
> >>>>>>>>> + priv->rproc_nb.notifier_call =
> >>>>>>>>> +imx_rproc_partition_notify;
> >>>>>>>>> +
> >>>>>>>>> + ret =
> >>>>>>>>> +imx_scu_irq_register_notifier(&priv->rproc_nb);
> >>>>>>>>> + if (ret) {
> >>>>>>>>> + dev_warn(dev, "register scu notifier
> >>>>>>>>> +failed.\n");
> >>>>>>>>> + return ret;
> >>>>>>>>> + }
> >>>>>>>>> +
> >>>>>>>>> + ret =
> >>>>>>>> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> >>> BIT(priv-
> >>>>>>>>> rproc_pt),
> >>>>>>>>> + true);
> >>>>>>>>> + if (ret) {
> >>>>>>>>> +
> >>>>>>>>> +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> >>>>>>>>> + dev_warn(dev, "Enable irq failed.\n");
> >>>>>>>>> + return ret;
> >>>>>>>>> + }
> >>>>>>>>> +
> >>>>>>>>> + return 0;
> >>>>>>>>> default:
> >>>>>>>>> break;
> >>>>>>>>> }
> >>>>>>>>> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
> >>>>>>>>> platform_device
> >>>>>>>>> *pdev)
> >>>>>>>>>
> >>>>>>>>> ret = imx_rproc_clk_enable(priv);
> >>>>>>>>> if (ret)
> >>>>>>>>> - goto err_put_mbox;
> >>>>>>>>> + goto err_put_scu;
> >>>>>>>>>
> >>>>>>>>> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> >>>>>>>>>
> >>>>>>>>> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
> >>>>>>>>> platform_device
> >>>>>>>>> *pdev)
> >>>>>>>>>
> >>>>>>>>> err_put_clk:
> >>>>>>>>> clk_disable_unprepare(priv->clk);
> >>>>>>>>> +err_put_scu:
> >>>>>>>>> + imx_rproc_put_scu(rproc);
> >>>>>>>>> err_put_mbox:
> >>>>>>>>> imx_rproc_free_mbox(rproc);
> >>>>>>>>> err_put_wkq:
> >>>>>>>>> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> >>>>>>>> platform_device
> >>>>>>>>> *pdev)
> >>>>>>>>>
> >>>>>>>>> clk_disable_unprepare(priv->clk);
> >>>>>>>>> rproc_del(rproc);
> >>>>>>>>> + imx_rproc_put_scu(rproc);
> >>>>>>>>> imx_rproc_free_mbox(rproc);
> >>>>>>>>> destroy_workqueue(priv->workqueue);
> >>>>>>>>> rproc_free(rproc);
> >>>>>>>>> @@ -852,6 +957,7 @@ static const struct of_device_id
> >>>>>>>> imx_rproc_of_match[] = {
> >>>>>>>>> { .compatible = "fsl,imx8mm-cm4", .data =
> >>>>>>>> &imx_rproc_cfg_imx8mq },
> >>>>>>>>> { .compatible = "fsl,imx8mn-cm7", .data =
> >>>>>>>> &imx_rproc_cfg_imx8mn },
> >>>>>>>>> { .compatible = "fsl,imx8mp-cm7", .data =
> >>>>>>>> &imx_rproc_cfg_imx8mn },
> >>>>>>>>> + { .compatible = "fsl,imx8qxp-cm4", .data =
> >>>>>>>> &imx_rproc_cfg_imx8qxp },
> >>>>>>>>> { .compatible = "fsl,imx8ulp-cm33", .data =
> >>>>>>>> &imx_rproc_cfg_imx8ulp },
> >>>>>>>>> { .compatible = "fsl,imx93-cm33", .data =
> >>>>>>>>> &imx_rproc_cfg_imx93 },
> >>>>>>>>> {},
> >>>>>>>>> --
> >>>>>>>>> 2.37.1
> >>>>>>>>>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4
@ 2022-09-29 23:24 ` Mathieu Poirier
0 siblings, 0 replies; 40+ messages in thread
From: Mathieu Poirier @ 2022-09-29 23:24 UTC (permalink / raw)
To: Peng Fan
Cc: Peng Fan, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam, dl-linux-imx, linux-remoteproc, devicetree,
linux-arm-kernel, linux-kernel, Bjorn Andersson
On Thu, 29 Sept 2022 at 17:17, Peng Fan <peng.fan@oss.nxp.com> wrote:
>
>
>
> On 9/29/2022 10:58 PM, Mathieu Poirier wrote:
> > On Wed, 28 Sept 2022 at 21:52, Peng Fan <peng.fan@nxp.com> wrote:
> >>
> >>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to
> >>> i.MX8QXP M4
> >>>
> >>> On Wed, Sep 28, 2022 at 06:01:45PM +0800, Peng Fan wrote:
> >>>> Hi Mathieu,
> >>>>
> >>>> On 9/28/2022 3:39 PM, Peng Fan wrote:
> >>>>>
> >>>>>
> >>>>> On 9/28/2022 1:56 AM, Mathieu Poirier wrote:
> >>>>>> On Tue, Sep 27, 2022 at 02:48:02AM +0000, Peng Fan wrote:
> >>>>>>> Hi Mathieu,
> >>>>>>>
> >>>>>>> Thanks for reviewing this patchset.
> >>>>>>>> Subject: Re: [PATCH V5 3/6] remoteproc: imx_rproc: support
> >>>>>>>> attaching to i.MX8QXP M4
> >>>>>>>>
> >>>>>>>> On Wed, Aug 24, 2022 at 09:10:20AM +0800, Peng Fan (OSS) wrote:
> >>>>>>>>> From: Peng Fan <peng.fan@nxp.com>
> >>>>>>>>>
> >>>>>>>>> When M4 is kicked by SCFW, M4 runs in its own hardware
> >>>>>>>>> partition, Linux could only do IPC with M4, it could not
> >>>>>>>>> start, stop, update image.
> >>>>>>>>>
> >>>>>>>>> We disable recovery reboot when M4 is managed by SCFW,
> >>>>>>>>> because remoteproc core still not support M4 auto-recovery
> >>>>>>>>> without loading image.
> >>>>>>>>>
> >>>>>>>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> >>>>>>>>> ---
> >>>>>>>>> drivers/remoteproc/imx_rproc.c | 108
> >>>>>>>>> ++++++++++++++++++++++++++++++++-
> >>>>>>>>> 1 file changed, 107 insertions(+), 1 deletion(-)
> >>>>>>>>>
> >>>>>>>>> diff --git a/drivers/remoteproc/imx_rproc.c
> >>>>>>>>> b/drivers/remoteproc/imx_rproc.c index
> >>>>>>>>> 7cc4fd207e2d..bcba74e90020
> >>>>>>>>> 100644
> >>>>>>>>> --- a/drivers/remoteproc/imx_rproc.c
> >>>>>>>>> +++ b/drivers/remoteproc/imx_rproc.c
> >>>>>>>>> @@ -6,6 +6,7 @@
> >>>>>>>>> #include <linux/arm-smccc.h>
> >>>>>>>>> #include <linux/clk.h>
> >>>>>>>>> #include <linux/err.h>
> >>>>>>>>> +#include <linux/firmware/imx/sci.h>
> >>>>>>>>> #include <linux/interrupt.h>
> >>>>>>>>> #include <linux/kernel.h>
> >>>>>>>>> #include <linux/mailbox_client.h> @@ -59,6 +60,8 @@
> >>>>>>>>> #define IMX_SIP_RPROC_STARTED 0x01
> >>>>>>>>> #define IMX_SIP_RPROC_STOP 0x02
> >>>>>>>>>
> >>>>>>>>> +#define IMX_SC_IRQ_GROUP_REBOOTED 5
> >>>>>>>>> +
> >>>>>>>>> /**
> >>>>>>>>> * struct imx_rproc_mem - slim internal memory structure
> >>>>>>>>> * @cpu_addr: MPU virtual address of the memory region @@
> >>>>>>>>> -89,6
> >>>>>>>>> +92,10 @@ struct imx_rproc {
> >>>>>>>>> struct work_struct rproc_work;
> >>>>>>>>> struct workqueue_struct *workqueue;
> >>>>>>>>> void __iomem *rsc_table;
> >>>>>>>>> + struct imx_sc_ipc *ipc_handle;
> >>>>>>>>> + struct notifier_block rproc_nb;
> >>>>>>>>> + u32 rproc_pt; /* partition id */
> >>>>>>>>> + u32 rsrc_id; /* resource id */
> >>>>>>>>> };
> >>>>>>>>>
> >>>>>>>>> static const struct imx_rproc_att imx_rproc_att_imx93[] =
> >>>>>>>>> { @@ -117,6
> >>>>>>>>> +124,18 @@ static const struct imx_rproc_att
> >>>>>>>>> +imx_rproc_att_imx93[] = {
> >>>>>>>>> { 0xD0000000, 0xa0000000, 0x10000000, 0 }, };
> >>>>>>>>>
> >>>>>>>>> +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] =
> >>>>>>>>> +{
> >>>>>>>>> + { 0x08000000, 0x08000000, 0x10000000, 0 },
> >>>>>>>>> + /* TCML/U */
> >>>>>>>>> + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN |
> >>>>>>>>> +ATT_IOMEM },
> >>>>>>>>> + /* OCRAM(Low 96KB) */
> >>>>>>>>> + { 0x21000000, 0x00100000, 0x00018000, 0 },
> >>>>>>>>> + /* OCRAM */
> >>>>>>>>> + { 0x21100000, 0x00100000, 0x00040000, 0 },
> >>>>>>>>> + /* DDR (Data) */
> >>>>>>>>> + { 0x80000000, 0x80000000, 0x60000000, 0 }, };
> >>>>>>>>> +
> >>>>>>>>> static const struct imx_rproc_att imx_rproc_att_imx8mn[] =
> >>>>>>>>> {
> >>>>>>>>> /* dev addr , sys addr , size , flags */
> >>>>>>>>> /* ITCM */
> >>>>>>>>> @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg
> >>>>>>>> imx_rproc_cfg_imx8mq = {
> >>>>>>>>> .method = IMX_RPROC_MMIO,
> >>>>>>>>> };
> >>>>>>>>>
> >>>>>>>>> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp =
> >>>>>>>>> +{
> >>>>>>>>> + .att = imx_rproc_att_imx8qxp,
> >>>>>>>>> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> >>>>>>>>> + .method = IMX_RPROC_SCU_API, };
> >>>>>>>>> +
> >>>>>>>>> static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp =
> >>>>>>>>> {
> >>>>>>>>> .att = imx_rproc_att_imx8ulp,
> >>>>>>>>> .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> >>>>>>>>> @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct
> >>>>>>>>> rproc
> >>>>>>>> *rproc)
> >>>>>>>>> mbox_free_channel(priv->rx_ch);
> >>>>>>>>> }
> >>>>>>>>>
> >>>>>>>>> +static void imx_rproc_put_scu(struct rproc *rproc) {
> >>>>>>>>> + struct imx_rproc *priv = rproc->priv;
> >>>>>>>>> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> >>>>>>>>> +
> >>>>>>>>> + if (dcfg->method != IMX_RPROC_SCU_API)
> >>>>>>>>> + return;
> >>>>>>>>> +
> >>>>>>>>> + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> >>>>>>>>> priv->rsrc_id))
> >>>>>>>>> + return;
> >>>>>>>>> +
> >>>>>>>>> + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> >>>>>>>> BIT(priv->rproc_pt), false);
> >>>>>>>>> + imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> >>>>>>>>> +}
> >>>>>>>>> +
> >>>>>>>>> +static int imx_rproc_partition_notify(struct notifier_block
> >>>>>>>>> +*nb,
> >>>>>>>>> + unsigned long event, void *group) {
> >>>>>>>>> + struct imx_rproc *priv = container_of(nb, struct
> >>>>>>>>> +imx_rproc, rproc_nb);
> >>>>>>>>> +
> >>>>>>>>> + /* Ignore other irqs */
> >>>>>>>>> + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group ==
> >>>>>>>> IMX_SC_IRQ_GROUP_REBOOTED)))
> >>>>>>>>> + return 0;
> >>>>>>>>> +
> >>>>>>>>> + rproc_report_crash(priv->rproc, RPROC_WATCHDOG);
> >>>>>>>>> +
> >>>>>>>>> + pr_info("Partition%d reset!\n", priv->rproc_pt);
> >>>>>>>>> +
> >>>>>>>>> + return 0;
> >>>>>>>>> +}
> >>>>>>>>> +
> >>>>>>>>> static int imx_rproc_detect_mode(struct imx_rproc *priv)
> >>>>>>>>> {
> >>>>>>>>> struct regmap_config config = { .name = "imx-rproc" };
> >>>>>>>>> @@ -689,6
> >>>>>>>>> +745,7 @@ static int imx_rproc_detect_mode(struct imx_rproc
> >>>>>>>>> +*priv)
> >>>>>>>>> struct arm_smccc_res res;
> >>>>>>>>> int ret;
> >>>>>>>>> u32 val;
> >>>>>>>>> + u8 pt;
> >>>>>>>>>
> >>>>>>>>> switch (dcfg->method) {
> >>>>>>>>> case IMX_RPROC_NONE:
> >>>>>>>>> @@ -699,6 +756,51 @@ static int imx_rproc_detect_mode(struct
> >>>>>>>> imx_rproc *priv)
> >>>>>>>>> if (res.a0)
> >>>>>>>>> priv->rproc->state = RPROC_DETACHED;
> >>>>>>>>> return 0;
> >>>>>>>>> + case IMX_RPROC_SCU_API:
> >>>>>>>>> + ret = imx_scu_get_handle(&priv->ipc_handle);
> >>>>>>>>> + if (ret)
> >>>>>>>>> + return ret;
> >>>>>>>>> + ret = of_property_read_u32(dev->of_node,
> >>>>>>>>> +"fsl,resource-id",
> >>>>>>>> &priv->rsrc_id);
> >>>>>>>>> + if (ret) {
> >>>>>>>>> + dev_err(dev, "No fsl,resource-id property\n");
> >>>>>>>>> + return ret;
> >>>>>>>>> + }
> >>>>>>>>> +
> >>>>>>>>> + /*
> >>>>>>>>> + * If Mcore resource is not owned by Acore
> >>>>>>>>> +partition, It is
> >>>>>>>> kicked by ROM,
> >>>>>>>>> + * and Linux could only do IPC with Mcore and nothing else.
> >>>>>>>>> + */
> >>>>>>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> >>>>>>>>> +priv-
> >>>>>>>>> rsrc_id))
> >>>>>>>>> + return 0;
> >>>>>>>>
> >>>>>>>> If imx_sc_rm_is_resource_owned() return '1' than the remote
> >>>>>>>> processor is under Linux's control and what follows below is
> >>>>>>>> not needed.
> >>>>>>>> That is also
> >>>>>>>> coherent with the comment in [1].
> >>>>>>>
> >>>>>>> Case 1: If M4 is owned by Linux, here directly return 0.
> >>>>>>> Case 2: If M4 is not owned by Linux, the following code after
> >>>>>>> this line will set state as RPROC_DETACHED.
> >>>>>>
> >>>>>> I understand that part.
> >>>>>>
> >>>>>>>
> >>>>>>> Patch 3/6(this patch) is only to support case 2.
> >>>>>>> Patch 4/6 is to support case 1.
> >>>>>>>
> >>>>>>
> >>>>>> Let's leave the subsequent patches alone for now.
> >>>>>>
> >>>>>>>>
> >>>>>>>> That is in contrast with what is happening in
> >>>>>>>> imx_rproc_put_scu(). There, if the remote processor is _not_
> >>>>>>>> owned by Linux than the condition returns without calling
> >>>>>>>> imx_scu_irq_group_enable() and
> >>>>>>>> imx_scu_irq_unregister_notifier(). That seems to be a bug.
> >>>>>>>
> >>>>>>> No. The two functions only needed when M4 is in a separate
> >>>>>>> hardware partition.
> >>>>>>>
> >>>>>>> The scu irq is only needed when M4 is out of linux control and
> >>>>>>> need some notification such as M4 is reset by SCU(System Control
> >>> Unit).
> >>>>>>> That linux got
> >>>>>>> notification that M4 is reset by SCU.
> >>>>>>
> >>>>>> I also understand that part.
> >>>>>>
> >>>>>> What I am underlining here is that when the M4 is independent,
> >>>>>> function
> >>>>>> imx_scu_irq_register_notifier() and imx_scu_irq_group_enable() are
> >>>>>> called but their cleanup equivalent are not called in
> >>>>>> imx_rproc_put_scu() because of the '!'
> >>>>>> in the if() statement.
> >>>>>
> >>>>> you are right, this is bug in my side. It should be as below based
> >>>>> on patch 3/6.
> >>>>>
> >>>>> diff --git a/drivers/remoteproc/imx_rproc.c
> >>>>> b/drivers/remoteproc/imx_rproc.c index bcba74e90020..a56aecae00c6
> >>>>> 100644
> >>>>> --- a/drivers/remoteproc/imx_rproc.c
> >>>>> +++ b/drivers/remoteproc/imx_rproc.c
> >>>>> @@ -713,7 +713,7 @@ static void imx_rproc_put_scu(struct rproc
> >>>>> *rproc)
> >>>>> if (dcfg->method != IMX_RPROC_SCU_API)
> >>>>> return;
> >>>>>
> >>>>> - if (!imx_sc_rm_is_resource_owned(priv->ipc_handle,
> >>>>> priv->rsrc_id))
> >>>>> + if (imx_sc_rm_is_resource_owned(priv->ipc_handle,
> >>>>> +priv->rsrc_id))
> >>>
> >>> Indeed, which raises questions about how this patchset was tested. And it
> >>> is not the first time we touch base on that.
> >>
> >> Patch 4/6 has this change, anyway I should not mix patch 3,4 here.
> >>
> >>>
> >>>>> return;
> >>>>>
> >>>>> Thanks for detailed reviewing.
> >>>>
> >>>> If you are fine with this change, I could send out V6. Anyway, I'll
> >>>> wait to see if you have other comments in this patchset.
> >>>>
> >>>
> >>> I am out of time for this patchset and as such will not provide more
> >>> comments on this revision.
> >>
> >> Sure. Thanks for your time. Since you have applied the attach recovery
> >> part, next version will enable this feature in imx rproc.
> >>
> >
> > I would rather not. Please introduce support for the recovery in
> > another patchset, once this one has been merged.
>
> I pushed the button too early, sorry. V6 was out yesterday, but the new
> patch 7/7 is an incremetenl patch to enable attach recovery.
>
Right, I noticed that after replying to you.
> You could ignore patch 7/7 in V6, I will reply their to note. patch
> [1-6]/7 is to achieve same as V5 patchset.
>
> If you need to send V7 which just drop patch 7/7 in V6, please let me know.
It is not a problem if all the new functionality is in a patch on its
own. At least the mental picture I have of the first 6 patches
doesn't change. No need to send a new revision.
>
> Thanks,
> Peng.
>
> >
> >> Thanks,
> >> Peng.
> >>
> >>>
> >>>> Thanks,
> >>>> Peng.
> >>>>
> >>>>>
> >>>>> Thanks,
> >>>>> Peng.
> >>>>>
> >>>>>>
> >>>>>>>
> >>>>>>>>
> >>>>>>>> There is also a problem in patch 4/6 associated to that.
> >>>>>>>
> >>>>>>> If the upper explanation eliminate your concern, "a problem in
> >>>>>>> patch 4/6" should not be a problem.
> >>>>>>>
> >>>>>>> When M4 is owned by Linux, Linux need handle the power domain.
> >>>>>>> If M4 is not owned
> >>>>>>> by Linux, SCU firmware will handle the power domain, and Linux
> >>>>>>> has no permission to touch that.
> >>>>>>>
> >>>>>>> Thanks
> >>>>>>> Peng
> >>>>>>>
> >>>>>>>>
> >>>>>>>> Thanks,
> >>>>>>>> Mathieu
> >>>>>>>>
> >>>>>>>>
> >>>>>>>> [1].
> >>>>>>>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2
> >>>>>>>> F%2Felixir
> >>>>>>>> .bootlin.com%2Flinux%2Fv6.0-
> >>>>>>>>
> >>> rc7%2Fsource%2Fdrivers%2Ffirmware%2Fimx%2Frm.c%23L24&data=
> >>>>>>>> 0
> >>>>>>>>
> >>> 5%7C01%7Cpeng.fan%40nxp.com%7Cbe679e9a409a48b834b908daa015d92
> >>>>>>>>
> >>> c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637998312946913
> >>>>>>>>
> >>> 710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2lu
> >>>>>>>>
> >>> MzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=
> >>>>>>>>
> >>> JDRvoDGGgEiSmbhj3410V2DNxamZbDmMS0U2GvBnI74%3D&reserved
> >>>>>>>> =0
> >>>>>>>>
> >>>>>>>>> +
> >>>>>>>>> + priv->rproc->state = RPROC_DETACHED;
> >>>>>>>>> + priv->rproc->recovery_disabled = true;
> >>>>>>>>> +
> >>>>>>>>> + /* Get partition id and enable irq in SCFW */
> >>>>>>>>> + ret =
> >>>>>>>>> +imx_sc_rm_get_resource_owner(priv->ipc_handle,
> >>>>>>>> priv->rsrc_id, &pt);
> >>>>>>>>> + if (ret) {
> >>>>>>>>> + dev_err(dev, "not able to get resource
> >>>>>>>>> +owner\n");
> >>>>>>>>> + return ret;
> >>>>>>>>> + }
> >>>>>>>>> +
> >>>>>>>>> + priv->rproc_pt = pt;
> >>>>>>>>> + priv->rproc_nb.notifier_call =
> >>>>>>>>> +imx_rproc_partition_notify;
> >>>>>>>>> +
> >>>>>>>>> + ret =
> >>>>>>>>> +imx_scu_irq_register_notifier(&priv->rproc_nb);
> >>>>>>>>> + if (ret) {
> >>>>>>>>> + dev_warn(dev, "register scu notifier
> >>>>>>>>> +failed.\n");
> >>>>>>>>> + return ret;
> >>>>>>>>> + }
> >>>>>>>>> +
> >>>>>>>>> + ret =
> >>>>>>>> imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED,
> >>> BIT(priv-
> >>>>>>>>> rproc_pt),
> >>>>>>>>> + true);
> >>>>>>>>> + if (ret) {
> >>>>>>>>> +
> >>>>>>>>> +imx_scu_irq_unregister_notifier(&priv->rproc_nb);
> >>>>>>>>> + dev_warn(dev, "Enable irq failed.\n");
> >>>>>>>>> + return ret;
> >>>>>>>>> + }
> >>>>>>>>> +
> >>>>>>>>> + return 0;
> >>>>>>>>> default:
> >>>>>>>>> break;
> >>>>>>>>> }
> >>>>>>>>> @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct
> >>>>>>>>> platform_device
> >>>>>>>>> *pdev)
> >>>>>>>>>
> >>>>>>>>> ret = imx_rproc_clk_enable(priv);
> >>>>>>>>> if (ret)
> >>>>>>>>> - goto err_put_mbox;
> >>>>>>>>> + goto err_put_scu;
> >>>>>>>>>
> >>>>>>>>> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
> >>>>>>>>>
> >>>>>>>>> @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct
> >>>>>>>>> platform_device
> >>>>>>>>> *pdev)
> >>>>>>>>>
> >>>>>>>>> err_put_clk:
> >>>>>>>>> clk_disable_unprepare(priv->clk);
> >>>>>>>>> +err_put_scu:
> >>>>>>>>> + imx_rproc_put_scu(rproc);
> >>>>>>>>> err_put_mbox:
> >>>>>>>>> imx_rproc_free_mbox(rproc);
> >>>>>>>>> err_put_wkq:
> >>>>>>>>> @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct
> >>>>>>>> platform_device
> >>>>>>>>> *pdev)
> >>>>>>>>>
> >>>>>>>>> clk_disable_unprepare(priv->clk);
> >>>>>>>>> rproc_del(rproc);
> >>>>>>>>> + imx_rproc_put_scu(rproc);
> >>>>>>>>> imx_rproc_free_mbox(rproc);
> >>>>>>>>> destroy_workqueue(priv->workqueue);
> >>>>>>>>> rproc_free(rproc);
> >>>>>>>>> @@ -852,6 +957,7 @@ static const struct of_device_id
> >>>>>>>> imx_rproc_of_match[] = {
> >>>>>>>>> { .compatible = "fsl,imx8mm-cm4", .data =
> >>>>>>>> &imx_rproc_cfg_imx8mq },
> >>>>>>>>> { .compatible = "fsl,imx8mn-cm7", .data =
> >>>>>>>> &imx_rproc_cfg_imx8mn },
> >>>>>>>>> { .compatible = "fsl,imx8mp-cm7", .data =
> >>>>>>>> &imx_rproc_cfg_imx8mn },
> >>>>>>>>> + { .compatible = "fsl,imx8qxp-cm4", .data =
> >>>>>>>> &imx_rproc_cfg_imx8qxp },
> >>>>>>>>> { .compatible = "fsl,imx8ulp-cm33", .data =
> >>>>>>>> &imx_rproc_cfg_imx8ulp },
> >>>>>>>>> { .compatible = "fsl,imx93-cm33", .data =
> >>>>>>>>> &imx_rproc_cfg_imx93 },
> >>>>>>>>> {},
> >>>>>>>>> --
> >>>>>>>>> 2.37.1
> >>>>>>>>>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 40+ messages in thread
end of thread, other threads:[~2022-09-29 23:25 UTC | newest]
Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-24 1:10 [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP Peng Fan (OSS)
2022-08-24 1:10 ` Peng Fan (OSS)
2022-08-24 1:10 ` [PATCH V5 1/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP Peng Fan (OSS)
2022-08-24 1:10 ` Peng Fan (OSS)
2022-08-24 1:10 ` [PATCH V5 2/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QM Peng Fan (OSS)
2022-08-24 1:10 ` Peng Fan (OSS)
2022-08-24 1:10 ` [PATCH V5 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Peng Fan (OSS)
2022-08-24 1:10 ` Peng Fan (OSS)
2022-09-26 23:21 ` Mathieu Poirier
2022-09-26 23:21 ` Mathieu Poirier
2022-09-27 2:48 ` Peng Fan
2022-09-27 2:48 ` Peng Fan
2022-09-27 17:56 ` Mathieu Poirier
2022-09-27 17:56 ` Mathieu Poirier
2022-09-28 7:39 ` Peng Fan
2022-09-28 7:39 ` Peng Fan
2022-09-28 10:01 ` Peng Fan
2022-09-28 10:01 ` Peng Fan
2022-09-28 17:30 ` Mathieu Poirier
2022-09-28 17:30 ` Mathieu Poirier
2022-09-29 2:30 ` Peng Fan
2022-09-29 2:30 ` Peng Fan
2022-09-29 3:52 ` Peng Fan
2022-09-29 3:52 ` Peng Fan
2022-09-29 14:58 ` Mathieu Poirier
2022-09-29 14:58 ` Mathieu Poirier
2022-09-29 23:16 ` Peng Fan
2022-09-29 23:16 ` Peng Fan
2022-09-29 23:24 ` Mathieu Poirier
2022-09-29 23:24 ` Mathieu Poirier
2022-08-24 1:10 ` [PATCH V5 4/6] remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP Peng Fan (OSS)
2022-08-24 1:10 ` Peng Fan (OSS)
2022-08-24 1:10 ` [PATCH V5 5/6] remoteproc: imx_rproc: support i.MX8QM Peng Fan (OSS)
2022-08-24 1:10 ` Peng Fan (OSS)
2022-08-24 1:10 ` [PATCH V5 6/6] remoteproc: imx_rproc: request mbox channel later Peng Fan (OSS)
2022-08-24 1:10 ` Peng Fan (OSS)
2022-09-20 3:09 ` [PATCH V5 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP Peng Fan
2022-09-20 3:09 ` Peng Fan
2022-09-20 6:35 ` Peng Fan
2022-09-20 6:35 ` Peng Fan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.