Message ID | 20220517064937.4033441-4-peng.fan@oss.nxp.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | remoteproc: imx_rproc: support i.MX8QM/QXP | expand |
Hi Peng, On Tue, May 17, 2022 at 02:49:34PM +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 | 88 ++++++++++++++++++++++++++++++++++ > 1 file changed, 88 insertions(+) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 4a3352821b1d..2e751fc90760 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), > @@ -683,6 +708,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, 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" }; > @@ -692,6 +733,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: > @@ -702,6 +744,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; > + } I woul have expected to see imx_scu_irq_register_notifier() being called when the driver is removed and in the probe() error path. More comments to come. Thanks, Mathieu > + > + 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; > } > @@ -855,6 +942,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.25.1 >
> Subject: Re: [PATCH V3 3/6] remoteproc: imx_rproc: support attaching to > i.MX8QXP M4 > > Hi Peng, > > On Tue, May 17, 2022 at 02:49:34PM +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 | 88 > > ++++++++++++++++++++++++++++++++++ > > 1 file changed, 88 insertions(+) > > > > diff --git a/drivers/remoteproc/imx_rproc.c > > b/drivers/remoteproc/imx_rproc.c index 4a3352821b1d..2e751fc90760 > > 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), > > @@ -683,6 +708,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, > > +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" }; @@ -692,6 > > +733,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: > > @@ -702,6 +744,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; > > + } > > I woul have expected to see imx_scu_irq_register_notifier() being called when > the driver is removed and in the probe() error path. You mean unregister, right? I not included driver removing in my test case, will add the test and fix the issues. Thanks, Peng. More comments to > come. > > Thanks, > Mathieu > > > + > > + 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; > > } > > @@ -855,6 +942,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.25.1 > >
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 4a3352821b1d..2e751fc90760 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), @@ -683,6 +708,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, 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" }; @@ -692,6 +733,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: @@ -702,6 +744,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; } @@ -855,6 +942,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 }, {},