From: Mathieu Poirier <mathieu.poirier@linaro.org> To: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> Cc: bjorn.andersson@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan <peng.fan@nxp.com> Subject: Re: [PATCH 6/9] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Date: Wed, 19 Jan 2022 11:31:18 -0700 [thread overview] Message-ID: <20220119183118.GA1284752@p14s> (raw) In-Reply-To: <20220111033333.403448-9-peng.fan@oss.nxp.com> On Tue, Jan 11, 2022 at 11:33:30AM +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. > > When M4 crash reboot, it could notify Linux, so Linux could prepare to > reattach to M4 after M4 recovery. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > drivers/remoteproc/imx_rproc.c | 96 ++++++++++++++++++++++++++++++++++ > 1 file changed, 96 insertions(+) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 0e99a3ca6fbc..5f04aea2f6a1 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 > @@ -90,6 +93,23 @@ struct imx_rproc { > struct workqueue_struct *workqueue; > void __iomem *rsc_table; > bool has_clk; > + struct imx_sc_ipc *ipc_handle; > + struct notifier_block proc_nb; > + u32 rproc_pt; > + u32 rsrc; > +}; > + > +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[] = { > @@ -236,6 +256,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), > @@ -491,6 +517,11 @@ static int imx_rproc_attach(struct rproc *rproc) > return 0; > } > > +static int imx_rproc_detach(struct rproc *rproc) > +{ > + 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; > @@ -525,6 +556,7 @@ imx_rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware * > static 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, > @@ -671,6 +703,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("Patition%d reset!\n", priv->rproc_pt); s/Patition/Partition > + > + return 0; > +} > + > static int imx_rproc_detect_mode(struct imx_rproc *priv) > { > struct regmap_config config = { .name = "imx-rproc" }; > @@ -680,6 +728,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: > @@ -690,6 +739,52 @@ 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)) { if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc)) return 0; > + > + priv->has_clk = false; > + priv->rproc->self_recovery = true; > + priv->rproc->state = RPROC_DETACHED; This is further proof that information is already available to determine if clocks should be managed on the application processor or not and that priv->has_clk carries redundant information. > + > + /* 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; > } > @@ -847,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 }, > {}, > }; > -- > 2.25.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Mathieu Poirier <mathieu.poirier@linaro.org> To: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> Cc: bjorn.andersson@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan <peng.fan@nxp.com> Subject: Re: [PATCH 6/9] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Date: Wed, 19 Jan 2022 11:31:18 -0700 [thread overview] Message-ID: <20220119183118.GA1284752@p14s> (raw) In-Reply-To: <20220111033333.403448-9-peng.fan@oss.nxp.com> On Tue, Jan 11, 2022 at 11:33:30AM +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. > > When M4 crash reboot, it could notify Linux, so Linux could prepare to > reattach to M4 after M4 recovery. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > drivers/remoteproc/imx_rproc.c | 96 ++++++++++++++++++++++++++++++++++ > 1 file changed, 96 insertions(+) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 0e99a3ca6fbc..5f04aea2f6a1 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 > @@ -90,6 +93,23 @@ struct imx_rproc { > struct workqueue_struct *workqueue; > void __iomem *rsc_table; > bool has_clk; > + struct imx_sc_ipc *ipc_handle; > + struct notifier_block proc_nb; > + u32 rproc_pt; > + u32 rsrc; > +}; > + > +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[] = { > @@ -236,6 +256,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), > @@ -491,6 +517,11 @@ static int imx_rproc_attach(struct rproc *rproc) > return 0; > } > > +static int imx_rproc_detach(struct rproc *rproc) > +{ > + 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; > @@ -525,6 +556,7 @@ imx_rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware * > static 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, > @@ -671,6 +703,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("Patition%d reset!\n", priv->rproc_pt); s/Patition/Partition > + > + return 0; > +} > + > static int imx_rproc_detect_mode(struct imx_rproc *priv) > { > struct regmap_config config = { .name = "imx-rproc" }; > @@ -680,6 +728,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: > @@ -690,6 +739,52 @@ 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)) { if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc)) return 0; > + > + priv->has_clk = false; > + priv->rproc->self_recovery = true; > + priv->rproc->state = RPROC_DETACHED; This is further proof that information is already available to determine if clocks should be managed on the application processor or not and that priv->has_clk carries redundant information. > + > + /* 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; > } > @@ -847,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 }, > {}, > }; > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-01-19 18:31 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-11 3:33 [PATCH V2] remoteproc: imx_rproc: use imx specific hook for find_loaded_rsc_table Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-11 3:33 ` [PATCH] remoteproc: imx_rproc: validate resource table Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-17 18:25 ` Mathieu Poirier 2022-01-17 18:25 ` Mathieu Poirier 2022-01-18 1:24 ` Peng Fan 2022-01-18 1:24 ` Peng Fan 2022-01-11 3:33 ` [PATCH 0/9] remoteproc: imx_rproc: support i.MX8QXP/QM and self recovery Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-11 3:33 ` [PATCH 1/9] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-11 6:44 ` Peng Fan 2022-01-11 6:44 ` Peng Fan 2022-01-18 18:41 ` Mathieu Poirier 2022-01-18 18:41 ` Mathieu Poirier 2022-01-19 2:20 ` Peng Fan 2022-01-19 2:20 ` Peng Fan 2022-01-11 3:33 ` [PATCH 2/9] dt-bindings: remoteproc: imx_rproc: support i.MX8QM Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-11 6:45 ` Peng Fan 2022-01-11 6:45 ` Peng Fan 2022-01-11 3:33 ` [PATCH 3/9] remoteproc: support self recovery after rproc crash Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-18 18:44 ` Mathieu Poirier 2022-01-18 18:44 ` Mathieu Poirier 2022-01-19 2:21 ` Peng Fan 2022-01-19 2:21 ` Peng Fan 2022-01-11 3:33 ` [PATCH 4/9] remoteproc: imx_rproc: ignore create mem entry for resource table Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-18 18:47 ` Mathieu Poirier 2022-01-18 18:47 ` Mathieu Poirier 2022-01-19 2:23 ` Peng Fan 2022-01-19 2:23 ` Peng Fan 2022-01-11 3:33 ` [PATCH 5/9] remoteproc: imx_rproc: make clk optional Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-18 18:50 ` Mathieu Poirier 2022-01-18 18:50 ` Mathieu Poirier 2022-01-19 2:25 ` Peng Fan 2022-01-19 2:25 ` Peng Fan 2022-01-19 17:49 ` Mathieu Poirier 2022-01-19 17:49 ` Mathieu Poirier 2022-01-11 3:33 ` [PATCH 6/9] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-18 18:57 ` Mathieu Poirier 2022-01-18 18:57 ` Mathieu Poirier 2022-01-19 2:28 ` Peng Fan 2022-01-19 2:28 ` Peng Fan 2022-01-19 18:04 ` Mathieu Poirier 2022-01-19 18:04 ` Mathieu Poirier 2022-01-19 18:31 ` Mathieu Poirier [this message] 2022-01-19 18:31 ` Mathieu Poirier 2022-01-11 3:33 ` [PATCH 7/9] remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-19 18:58 ` Mathieu Poirier 2022-01-19 18:58 ` Mathieu Poirier 2022-01-11 3:33 ` [PATCH 8/9] remoteproc: imx_rproc: support i.MX8QM Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-20 17:23 ` Mathieu Poirier 2022-01-20 17:23 ` Mathieu Poirier 2022-01-21 1:00 ` Peng Fan 2022-01-21 1:00 ` Peng Fan 2022-01-11 3:33 ` [PATCH 9/9] remoteproc: imx_rproc: request mbox channel later Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-12-21 10:55 ` [PATCH V2] remoteproc: imx_rproc: use imx specific hook for find_loaded_rsc_table Marco Felsch 2022-12-21 10:55 ` Marco Felsch 2023-01-02 22:46 ` Mathieu Poirier 2023-01-02 22:46 ` Mathieu Poirier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220119183118.GA1284752@p14s \ --to=mathieu.poirier@linaro.org \ --cc=bjorn.andersson@linaro.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-remoteproc@vger.kernel.org \ --cc=peng.fan@nxp.com \ --cc=peng.fan@oss.nxp.com \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.