remoteproc: imx_rproc: support i.MX8QM/QXP
v2 cover remoteproc: imx_rproc: support i.MX8QM/QXP
From: Peng Fan <[email protected]>
V2:
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/[email protected]/
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/[email protected]/
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 | 19 ++ drivers/remoteproc/imx_rproc.c | 240 +++++++++++++++++- 2 files changed, 246 insertions(+), 13 deletions(-)
Signature · 1 line
2.30.0
PATCH v2 1/6 dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
From: Peng Fan <[email protected]>
Add i.MX8QXP compatible
Add a new property rsrc-id(resource id) for SoC which supports SCFW(System Controller Firmware). SCFW manages resources using resource id, here the rsrc-id is used to check whether remote process is under control of Linux or not.
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.
--- .../bindings/remoteproc/fsl,imx-rproc.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +15 -0
@@ -19,6 +19,7 @@ properties: - fsl,imx8mm-cm4 - fsl,imx8mn-cm7 - fsl,imx8mp-cm7 + - fsl,imx8qxp-cm4 - fsl,imx8ulp-cm33 - fsl,imx7d-cm4 - fsl,imx7ulp-cm4
@@ -27,6 +28,11 @@ properties: clocks: maxItems: 1 + entry: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + Specify cpu entry address for SCU enabled processor. + syscon: $ref: /schemas/types.yaml#/definitions/phandle description:
@@ -59,6 +65,15 @@ properties: Indicate whether need to load the default firmware and start the remote processor automatically. + power-domains: + maxItems: 8 + + rsrc-id: + description: + This property is to specify the resource id of the remote processor in SoC + which supports SCFW + maxItems: 1 + required: - compatible
Signature · 1 line
2.30.0
Re: [PATCH V2 1/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
Quoted 31 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
Add i.MX8QXP compatible
Add a new property rsrc-id(resource id) for SoC which supports SCFW(System Controller Firmware). SCFW manages resources using resource id, here the rsrc-id is used to check whether remote process is under control of Linux or not.
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.
Signed-off-by Peng Fan <[email protected]>--- .../bindings/remoteproc/fsl,imx-rproc.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+)Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +1
-0@@ -19,6 +19,7 @@ properties: - fsl,imx8mm-cm4 - fsl,imx8mn-cm7 - fsl,imx8mp-cm7 + - fsl,imx8qxp-cm4 - fsl,imx8ulp-cm33 - fsl,imx7d-cm4 - fsl,imx7ulp-cm4
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 32
Quoted 5 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +2
-0@@ -27,6 +28,11 @@ properties: clocks: maxItems: 1 + entry: + $ref: /schemas/types.yaml#/definitions/uint32
Does not look like a generic property, so please add vendor prefix. Suffix also would look good, so:
"fsl,entry-address"
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 34
Quoted 2 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +2
-0+ description: | + Specify cpu entry address for SCU enabled processor.
s/cpu/CPU/
Quoted 5 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +1
-0+ syscon: $ref: /schemas/types.yaml#/definitions/phandle description:
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 74
Quoted 10 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +7
-0@@ -59,6 +65,15 @@ properties: Indicate whether need to load the default firmware and start the remote processor automatically. + power-domains: + maxItems: 8 + + rsrc-id: + description: + This property is to specify the resource id of the remote processor in SoC + which supports SCFW
Needs type, vendor prefix.
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 79
Quoted 5 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +2
-0+ maxItems: 1 + required: - compatible
Best regards,
Krzysztof
RE: [PATCH V2 1/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP
Quoted 41 lines
Subject: Re: [PATCH V2 1/6] dt-bindings: remoteproc:
imx_rproc: support i.MX8QXPQuoted 9 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
Add i.MX8QXP compatible
Add a new property rsrc-id(resource id) for SoC which supports SCFW(System Controller Firmware). SCFW manages resources using resource id, here the rsrc-id is used to check whether remote process is under control of Linux or not.
Quoted 7 lines
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.
Signed-off-by Peng Fan <[email protected]>--- .../bindings/remoteproc/fsl,imx-rproc.yaml | 15+++++++++++++++
Quoted 20 lines
1 file changed, 15 insertions(+)diff --git
a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yamlb/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yamlindexfc16d903353e..f25c203dd2f9100644Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +1
-0@@ -19,6 +19,7 @@ properties: - fsl,imx8mm-cm4 - fsl,imx8mn-cm7 - fsl,imx8mp-cm7 + - fsl,imx8qxp-cm4 - fsl,imx8ulp-cm33 - fsl,imx7d-cm4 - fsl,imx7ulp-cm4@@ -27,6 +28,11 @@ properties: clocks: maxItems: 1
Quoted 6 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 32
Quoted 2 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +2
-0+ entry: + $ref: /schemas/types.yaml#/definitions/uint32Does not look like a generic property, so please add vendor prefix. Suffix also would look good, so:
"fsl,entry-address"
Fix in next version
Quoted 5 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 34
Quoted 3 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +2
-0+ description: | + Specify cpu entry address for SCU enabled processor.s/cpu/CPU/
Fix in next version.
Quoted 16 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 65
Quoted 7 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +1
-0+ syscon: $ref: /schemas/types.yaml#/definitions/phandle description:@@ -59,6 +65,15 @@ properties: Indicate whether need to load the default firmware and start theremote
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties:
Quoted 8 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +6
-0processor automatically. + power-domains: + maxItems: 8 + + rsrc-id: + description: + This property is to specify the resource id of the remote processor
Quoted 4 lines
in SoC
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 74
Quoted 1 line
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +1
-0+ which supports SCFWNeeds type, vendor prefix.
Fix in next version.
Thanks,
Peng
Quoted 10 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml properties: · line 79
Quoted 6 lines
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +2
-0+ maxItems: 1 + required: - compatibleBest regards,
Krzysztof
PATCH v2 2/6 dt-bindings: remoteproc: imx_rproc: support i.MX8QM
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Add i.MX8QM compatible
There are two general purpose M4, so add reg property to indicate the id.
--- .../devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +4 -0
@@ -20,6 +20,7 @@ properties: - fsl,imx8mn-cm7 - fsl,imx8mp-cm7 - fsl,imx8qxp-cm4 + - fsl,imx8qm-cm4 - fsl,imx8ulp-cm33 - fsl,imx7d-cm4 - fsl,imx7ulp-cm4
@@ -68,6 +69,9 @@ properties: power-domains: maxItems: 8 + reg: + maxItems: 1 + rsrc-id: description: This property is to specify the resource id of the remote processor in SoC
Signature · 1 line
2.30.0
Rob Herring
maintainerRe: [PATCH V2 2/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QM
Quoted 6 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
Add i.MX8QM compatible
There are two general purpose M4, so add reg property to indicate the id.
Where does the id come from? Is this just an index?
Quoted 32 lines
Signed-off-by Peng Fan <[email protected]>--- .../devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 4 ++++ 1 file changed, 4 insertions(+)Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +4
-0@@ -20,6 +20,7 @@ properties: - fsl,imx8mn-cm7 - fsl,imx8mp-cm7 - fsl,imx8qxp-cm4 + - fsl,imx8qm-cm4 - fsl,imx8ulp-cm33 - fsl,imx7d-cm4 - fsl,imx7ulp-cm4@@ -68,6 +69,9 @@ properties: power-domains: maxItems: 8 + reg: + maxItems: 1 + rsrc-id: description: This property is to specify the resource id of the remote processor in SoCSignature · 1 line
2.30.0
RE: [PATCH V2 2/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QM
Quoted 4 lines
Subject: Re: [PATCH V2 2/6] dt-bindings: remoteproc:
imx_rproc: support i.MX8QMOn Wed, Mar 09, 2022 at 06:21:14PM +0800, Peng Fan (OSS) wrote:
Quoted 8 lines
Quoted 6 lines
From: Peng Fan <[email protected]>
Add i.MX8QM compatible
There are two general purpose M4, so add reg property to indicate the id.
Where does the id come from? Is this just an index?
It is software use to identify which is m4_0 and which is m4_1, just an index.
Thanks,
Peng.
Quoted 37 lines
Quoted 5 lines
Signed-off-by Peng Fan <[email protected]>--- .../devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 4++++
Quoted 31 lines
1 file changed, 4 insertions(+)diff --git
a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yamlb/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yamlindexf25c203dd2f9..41d366cff3cd100644Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +4
-0@@ -20,6 +20,7 @@ properties: - fsl,imx8mn-cm7 - fsl,imx8mp-cm7 - fsl,imx8qxp-cm4 + - fsl,imx8qm-cm4 - fsl,imx8ulp-cm33 - fsl,imx7d-cm4 - fsl,imx7ulp-cm4@@ -68,6 +69,9 @@ properties: power-domains: maxItems: 8 + reg: + maxItems: 1 + rsrc-id: description: This property is to specify the resource id of the remoteprocessor in SoC
--
2.30.0
Re: [PATCH V2 2/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QM
Quoted 8 lines · Peng Fan
Quoted 8 lines
Subject: Re: [PATCH V2 2/6] dt-bindings: remoteproc:
imx_rproc: support i.MX8QMQuoted 4 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
Add i.MX8QM compatible
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
There are two general purpose M4, so add reg property to indicate the id.
Where does the id come from? Is this just an index?
It is software use to identify which is
m4_0and which ism4_1, just an index.
"reg" is supposed to represent some sort of identifier on the parent bus, as such it doesn't seem to be the appropriate property to provide an arbitrary 0 or 1 to identify which of the two m4s this is.
Regards,
Bjorn
Quoted 40 lines
Thanks,
Peng.Quoted 37 lines
Quoted 5 lines
Signed-off-by Peng Fan <[email protected]>--- .../devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 4++++
Quoted 31 lines
1 file changed, 4 insertions(+)diff --git
a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yamlb/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yamlindexf25c203dd2f9..41d366cff3cd100644Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +4
-0@@ -20,6 +20,7 @@ properties: - fsl,imx8mn-cm7 - fsl,imx8mp-cm7 - fsl,imx8qxp-cm4 + - fsl,imx8qm-cm4 - fsl,imx8ulp-cm33 - fsl,imx7d-cm4 - fsl,imx7ulp-cm4@@ -68,6 +69,9 @@ properties: power-domains: maxItems: 8 + reg: + maxItems: 1 + rsrc-id: description: This property is to specify the resource id of the remoteprocessor in SoC
--
2.30.0
PATCH v2 3/6 remoteproc: imx_rproc: support attaching to i.MX8QXP M4
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
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.
When M4 crash reboot, it could notify Linux, so Linux could prepare to reattach to M4 after M4 recovery.
--- drivers/remoteproc/imx_rproc.c | 99 ++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+)
drivers/remoteproc/imx_rproc.c +99 -0
@@ -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,23 @@ 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 proc_nb; +u32 rproc_pt;/* partition id */ +u32 rsrc;/* resource id */ +}; + +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = { +/* dev addr , sys addr , size , flags */ + {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[] = {
@@ -235,6 +255,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = { .method = IMX_RPROC_NONE, }; +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_imx7ulp = { .att = imx_rproc_att_imx7ulp, .att_size =ARRAY_SIZE (imx_rproc_att_imx7ulp),
@@ -490,6 +516,15 @@ static int imx_rproc_attach(struct rproc *rproc)return 0 ; } +/* Only support detach when doing attach recovery */ +static int imx_rproc_detach (struct rproc *rproc) +{ +if (rproc->state !=RPROC_CRASHED ) +return -EOPNOTSUPP ; + +return 0 ; +} +static struct resource_table *imx_rproc_get_loaded_rsc_table (struct rproc *rproc,size_t *table_sz) {struct imx_rproc *priv = rproc->priv;
@@ -505,6 +540,7 @@ static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rprocstatic const struct rproc_ops imx_rproc_ops = { .prepare = imx_rproc_prepare, .attach = imx_rproc_attach, + .detach = imx_rproc_detach, .start = imx_rproc_start, .stop = imx_rproc_stop, .kick = imx_rproc_kick,
@@ -651,6 +687,22 @@ static void imx_rproc_free_mbox(struct rproc *rproc)mbox_free_channel (priv->rx_ch); } +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, proc_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" };
@@ -660,6 +712,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 :
@@ -670,6 +723,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,"rsrc-id" , &priv->rsrc); +if (ret) { +dev_err (dev,"no rsrc-id\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)) +return 0 ; + +rproc_set_feature (priv->rproc,RPROC_FEAT_ATTACH_RECOVERY ); + priv->rproc->state =RPROC_DETACHED ; + +/* Get partition id and enable irq in SCFW */ + ret =imx_sc_rm_get_resource_owner (priv->ipc_handle, priv->rsrc, &pt); +if (ret) { +dev_err (dev,"not able to get resource owner\n" ); +return ret; + } + + priv->rproc_pt = pt; + priv->proc_nb.notifier_call = imx_rproc_partition_notify; + + ret =imx_scu_irq_register_notifier (&priv->proc_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->proc_nb); +dev_warn (dev,"Enable irq failed.\n" ); +return ret; + } + +return 0 ;default :break ; }
@@ -823,6 +921,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 }, {}, };
Signature · 1 line
2.30.0
PATCH v2 4/6 remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
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.
--- drivers/remoteproc/imx_rproc.c | 69 +++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-)
drivers/remoteproc/imx_rproc.c +67 -2
@@ -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>
@@ -96,6 +97,10 @@ struct imx_rproc {struct notifier_block proc_nb;u32 rproc_pt;/* partition id */ u32 rsrc;/* 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_imx8qxp[] = {
@@ -304,6 +309,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, true, priv->entry); +break ;default :return -EOPNOTSUPP ; }
@@ -333,6 +341,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, false, priv->entry); +break ;default :return -EOPNOTSUPP ; }
@@ -703,6 +714,56 @@ 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 <0 ) +return priv->num_pd; + +if (!priv->num_pd) +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_detect_mode (struct imx_rproc *priv) {struct regmap_config config = { .name ="imx-rproc" };
@@ -737,8 +798,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)) -return 0 ; +if (imx_sc_rm_is_resource_owned (priv->ipc_handle, priv->rsrc)) { +if (of_property_read_u32 (dev->of_node,"entry" , &priv->entry)) +return -EINVAL ; + +return imx_rproc_attach_pd (priv); + }rproc_set_feature (priv->rproc,RPROC_FEAT_ATTACH_RECOVERY ); priv->rproc->state =RPROC_DETACHED ;
Signature · 1 line
2.30.0
PATCH v2 5/6 remoteproc: imx_rproc: support i.MX8QM
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
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.
--- drivers/remoteproc/imx_rproc.c | 47 +++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-)
drivers/remoteproc/imx_rproc.c +44 -3
@@ -75,10 +75,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))struct imx_rproc {struct device *dev;
@@ -98,11 +101,25 @@ struct imx_rproc {u32 rproc_pt;/* partition id */ u32 rsrc;/* resource id */ u32 entry;/* cpu start address */ +u32 reg;int num_pd;struct device **pd_dev;struct device_link **pd_dev_link; }; +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_CORE (0 )}, + {0x1FFE0000 ,0x38FE0000 ,0x00020000 ,ATT_OWN |ATT_CORE (1 )}, +/* TCMU */ + {0x20000000 ,0x35000000 ,0x00020000 ,ATT_OWN |ATT_CORE (0 )}, + {0x20000000 ,0x39000000 ,0x00020000 ,ATT_OWN |ATT_CORE (1 )}, +/* DDR (Data) */ + {0x80000000 ,0x80000000 ,0x60000000 ,0 }, +}; +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {/* dev addr , sys addr , size , flags */ {0x08000000 ,0x08000000 ,0x10000000 ,0 },
@@ -260,6 +277,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = { .method = IMX_RPROC_NONE, }; +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),
@@ -364,6 +387,11 @@ 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]; +if (att->flags &ATT_CORE_MASK ) { +if (!((BIT (priv->reg)) & (att->flags &ATT_CORE_MASK ))) +continue ; + } +if (da >= att->da && da + len < att->da + att->size) {unsigned int offset = da - att->da;
@@ -579,6 +607,11 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,if (!(att->flags &ATT_OWN ))continue ; +if (att->flags &ATT_CORE_MASK ) { +if (!((BIT (priv->reg)) & (att->flags &ATT_CORE_MASK ))) +continue ; + } +if (b >=IMX_RPROC_MEM_MAX )break ;
@@ -794,6 +827,13 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)return ret; } + priv->reg =of_get_cpu_hwid (dev->of_node,0 ); +if (priv->reg == ~0U ) + priv->reg =0 ; + +if (priv->reg >1 ) +return -EINVAL ; +/* * 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.
@@ -987,6 +1027,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 }, {}, };
Signature · 1 line
2.30.0
PATCH v2 6/6 remoteproc: imx_rproc: request mbox channel later
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
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.
--- drivers/remoteproc/imx_rproc.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/remoteproc/imx_rproc.c +20 -11
@@ -83,6 +83,9 @@ 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); +struct imx_rproc {struct device *dev;struct regmap *regmap;
@@ -323,6 +326,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,
@@ -373,6 +380,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; }
@@ -552,7 +561,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); }/* Only support detach when doing attach recovery */
@@ -561,6 +570,8 @@ static int imx_rproc_detach(struct rproc *rproc)if (rproc->state !=RPROC_CRASHED )return -ENOTSUPP ; +imx_rproc_free_mbox (rproc); +return 0 ; }
@@ -695,6 +706,9 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)struct mbox_client *cl;int ret; +if (priv->tx_ch && priv->rx_ch) +return 0 ; +if (!of_get_property (dev->of_node,"mbox-names" ,NULL ))return 0 ;
@@ -729,6 +743,8 @@ static void imx_rproc_free_mbox(struct rproc *rproc)mbox_free_channel (priv->tx_ch);mbox_free_channel (priv->rx_ch); + priv->tx_ch =NULL ; + priv->rx_ch =NULL ; } static int imx_rproc_partition_notify(struct notifier_block *nb,
@@ -961,23 +977,19 @@ static int imx_rproc_probe(struct platform_device *pdev) goto err_put_rproc; } - ret =imx_rproc_xtr_mbox_init (rproc); -if (ret) - goto err_put_wkq; - ret =imx_rproc_addr_init (priv, pdev);if (ret) {dev_err (dev,"failed on imx_rproc_addr_init\n" ); - goto err_put_mbox; + goto err_put_wkq; } ret =imx_rproc_detect_mode (priv);if (ret) - goto err_put_mbox; + goto err_put_wkq; ret =imx_rproc_clk_enable (priv);if (ret) - goto err_put_mbox; + goto err_put_wkq;INIT_WORK (&priv->rproc_work, imx_rproc_vq_work);
@@ -994,8 +1006,6 @@ static int imx_rproc_probe(struct platform_device *pdev) err_put_clk:clk_disable_unprepare (priv->clk); -err_put_mbox: -imx_rproc_free_mbox (rproc); err_put_wkq:destroy_workqueue (priv->workqueue); err_put_rproc:
@@ -1011,7 +1021,6 @@ static int imx_rproc_remove(struct platform_device *pdev)clk_disable_unprepare (priv->clk);rproc_del (rproc); -imx_rproc_free_mbox (rproc);destroy_workqueue (priv->workqueue);rproc_free (rproc);
Signature · 1 line
2.30.0