From: Suman Anna <s-anna@ti.com> To: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Mathieu Poirier <mathieu.poirier@linaro.org>, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Loic Pallardy <loic.pallardy@st.com> Subject: Re: [PATCH 1/2] remoteproc: Add prepare and unprepare ops Date: Tue, 21 Apr 2020 09:12:43 -0500 [thread overview] Message-ID: <2feee391-9f8e-410e-2a20-5b5bdd949940@ti.com> (raw) In-Reply-To: <20200421025254.GK1868936@builder.lan> On 4/20/20 9:52 PM, Bjorn Andersson wrote: > On Thu 16 Apr 17:20 PDT 2020, Suman Anna wrote: > >> From: Loic Pallardy <loic.pallardy@st.com> >> >> On some SoC architecture, it is needed to enable HW like >> clock, bus, regulator, memory region... before loading >> co-processor firmware. >> >> This patch introduces prepare and unprepare ops to execute >> platform specific function before firmware loading and after >> stop execution. >> >> Signed-off-by: Loic Pallardy <loic.pallardy@st.com> >> Signed-off-by: Suman Anna <s-anna@ti.com> >> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> >> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > Do we have an inbound user of these new oops? Yes, both the TI K3 R5F and DSP remoteproc drivers use these ops, the patches are already on the lists. regards Suman > > Regards, > Bjorn > >> --- >> v1: >> - Make the direct ops into inline helper functions in line >> with the comments on the MCU sync series (v1 comments). >> No change in functionality. >> - Picked up the Reviewed-by tags >> v0: https://patchwork.kernel.org/patch/11456383/ >> >> drivers/remoteproc/remoteproc_core.c | 15 ++++++++++++++- >> drivers/remoteproc/remoteproc_internal.h | 16 ++++++++++++++++ >> include/linux/remoteproc.h | 4 ++++ >> 3 files changed, 34 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c >> index d681eeb962b6..e38f627059ac 100644 >> --- a/drivers/remoteproc/remoteproc_core.c >> +++ b/drivers/remoteproc/remoteproc_core.c >> @@ -1394,12 +1394,19 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) >> return ret; >> } >> >> + /* Prepare rproc for firmware loading if needed */ >> + ret = rproc_prepare_device(rproc); >> + if (ret) { >> + dev_err(dev, "can't prepare rproc %s: %d\n", rproc->name, ret); >> + goto disable_iommu; >> + } >> + >> rproc->bootaddr = rproc_get_boot_addr(rproc, fw); >> >> /* Load resource table, core dump segment list etc from the firmware */ >> ret = rproc_parse_fw(rproc, fw); >> if (ret) >> - goto disable_iommu; >> + goto unprepare_rproc; >> >> /* reset max_notifyid */ >> rproc->max_notifyid = -1; >> @@ -1433,6 +1440,9 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) >> kfree(rproc->cached_table); >> rproc->cached_table = NULL; >> rproc->table_ptr = NULL; >> +unprepare_rproc: >> + /* release HW resources if needed */ >> + rproc_unprepare_device(rproc); >> disable_iommu: >> rproc_disable_iommu(rproc); >> return ret; >> @@ -1838,6 +1848,9 @@ void rproc_shutdown(struct rproc *rproc) >> /* clean up all acquired resources */ >> rproc_resource_cleanup(rproc); >> >> + /* release HW resources if needed */ >> + rproc_unprepare_device(rproc); >> + >> rproc_disable_iommu(rproc); >> >> /* Free the copy of the resource table */ >> diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h >> index b389dc79da81..101e6be8d240 100644 >> --- a/drivers/remoteproc/remoteproc_internal.h >> +++ b/drivers/remoteproc/remoteproc_internal.h >> @@ -64,6 +64,22 @@ struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc, >> struct rproc_mem_entry * >> rproc_find_carveout_by_name(struct rproc *rproc, const char *name, ...); >> >> +static inline int rproc_prepare_device(struct rproc *rproc) >> +{ >> + if (rproc->ops->prepare) >> + return rproc->ops->prepare(rproc); >> + >> + return 0; >> +} >> + >> +static inline int rproc_unprepare_device(struct rproc *rproc) >> +{ >> + if (rproc->ops->unprepare) >> + return rproc->ops->unprepare(rproc); >> + >> + return 0; >> +} >> + >> static inline >> int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw) >> { >> diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h >> index 38607107b7cb..b8481ac969f1 100644 >> --- a/include/linux/remoteproc.h >> +++ b/include/linux/remoteproc.h >> @@ -355,6 +355,8 @@ enum rsc_handling_status { >> >> /** >> * struct rproc_ops - platform-specific device handlers >> + * @prepare: prepare device for code loading >> + * @unprepare: unprepare device after stop >> * @start: power on the device and boot it >> * @stop: power off the device >> * @kick: kick a virtqueue (virtqueue id given as a parameter) >> @@ -373,6 +375,8 @@ enum rsc_handling_status { >> * panic at least the returned number of milliseconds >> */ >> struct rproc_ops { >> + int (*prepare)(struct rproc *rproc); >> + int (*unprepare)(struct rproc *rproc); >> int (*start)(struct rproc *rproc); >> int (*stop)(struct rproc *rproc); >> void (*kick)(struct rproc *rproc, int vqid); >> -- >> 2.26.0 >>
WARNING: multiple messages have this Message-ID (diff)
From: Suman Anna <s-anna@ti.com> To: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Mathieu Poirier <mathieu.poirier@linaro.org>, <linux-remoteproc@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, Loic Pallardy <loic.pallardy@st.com> Subject: Re: [PATCH 1/2] remoteproc: Add prepare and unprepare ops Date: Tue, 21 Apr 2020 09:12:43 -0500 [thread overview] Message-ID: <2feee391-9f8e-410e-2a20-5b5bdd949940@ti.com> (raw) Message-ID: <20200421141243.4hPc9M_U3-indPWXd6eh2nGjUHZ4j9tLB_14WMwOpbo@z> (raw) In-Reply-To: <20200421025254.GK1868936@builder.lan> On 4/20/20 9:52 PM, Bjorn Andersson wrote: > On Thu 16 Apr 17:20 PDT 2020, Suman Anna wrote: > >> From: Loic Pallardy <loic.pallardy@st.com> >> >> On some SoC architecture, it is needed to enable HW like >> clock, bus, regulator, memory region... before loading >> co-processor firmware. >> >> This patch introduces prepare and unprepare ops to execute >> platform specific function before firmware loading and after >> stop execution. >> >> Signed-off-by: Loic Pallardy <loic.pallardy@st.com> >> Signed-off-by: Suman Anna <s-anna@ti.com> >> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> >> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > Do we have an inbound user of these new oops? Yes, both the TI K3 R5F and DSP remoteproc drivers use these ops, the patches are already on the lists. regards Suman > > Regards, > Bjorn > >> --- >> v1: >> - Make the direct ops into inline helper functions in line >> with the comments on the MCU sync series (v1 comments). >> No change in functionality. >> - Picked up the Reviewed-by tags >> v0: https://patchwork.kernel.org/patch/11456383/ >> >> drivers/remoteproc/remoteproc_core.c | 15 ++++++++++++++- >> drivers/remoteproc/remoteproc_internal.h | 16 ++++++++++++++++ >> include/linux/remoteproc.h | 4 ++++ >> 3 files changed, 34 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c >> index d681eeb962b6..e38f627059ac 100644 >> --- a/drivers/remoteproc/remoteproc_core.c >> +++ b/drivers/remoteproc/remoteproc_core.c >> @@ -1394,12 +1394,19 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) >> return ret; >> } >> >> + /* Prepare rproc for firmware loading if needed */ >> + ret = rproc_prepare_device(rproc); >> + if (ret) { >> + dev_err(dev, "can't prepare rproc %s: %d\n", rproc->name, ret); >> + goto disable_iommu; >> + } >> + >> rproc->bootaddr = rproc_get_boot_addr(rproc, fw); >> >> /* Load resource table, core dump segment list etc from the firmware */ >> ret = rproc_parse_fw(rproc, fw); >> if (ret) >> - goto disable_iommu; >> + goto unprepare_rproc; >> >> /* reset max_notifyid */ >> rproc->max_notifyid = -1; >> @@ -1433,6 +1440,9 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) >> kfree(rproc->cached_table); >> rproc->cached_table = NULL; >> rproc->table_ptr = NULL; >> +unprepare_rproc: >> + /* release HW resources if needed */ >> + rproc_unprepare_device(rproc); >> disable_iommu: >> rproc_disable_iommu(rproc); >> return ret; >> @@ -1838,6 +1848,9 @@ void rproc_shutdown(struct rproc *rproc) >> /* clean up all acquired resources */ >> rproc_resource_cleanup(rproc); >> >> + /* release HW resources if needed */ >> + rproc_unprepare_device(rproc); >> + >> rproc_disable_iommu(rproc); >> >> /* Free the copy of the resource table */ >> diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h >> index b389dc79da81..101e6be8d240 100644 >> --- a/drivers/remoteproc/remoteproc_internal.h >> +++ b/drivers/remoteproc/remoteproc_internal.h >> @@ -64,6 +64,22 @@ struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc, >> struct rproc_mem_entry * >> rproc_find_carveout_by_name(struct rproc *rproc, const char *name, ...); >> >> +static inline int rproc_prepare_device(struct rproc *rproc) >> +{ >> + if (rproc->ops->prepare) >> + return rproc->ops->prepare(rproc); >> + >> + return 0; >> +} >> + >> +static inline int rproc_unprepare_device(struct rproc *rproc) >> +{ >> + if (rproc->ops->unprepare) >> + return rproc->ops->unprepare(rproc); >> + >> + return 0; >> +} >> + >> static inline >> int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw) >> { >> diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h >> index 38607107b7cb..b8481ac969f1 100644 >> --- a/include/linux/remoteproc.h >> +++ b/include/linux/remoteproc.h >> @@ -355,6 +355,8 @@ enum rsc_handling_status { >> >> /** >> * struct rproc_ops - platform-specific device handlers >> + * @prepare: prepare device for code loading >> + * @unprepare: unprepare device after stop >> * @start: power on the device and boot it >> * @stop: power off the device >> * @kick: kick a virtqueue (virtqueue id given as a parameter) >> @@ -373,6 +375,8 @@ enum rsc_handling_status { >> * panic at least the returned number of milliseconds >> */ >> struct rproc_ops { >> + int (*prepare)(struct rproc *rproc); >> + int (*unprepare)(struct rproc *rproc); >> int (*start)(struct rproc *rproc); >> int (*stop)(struct rproc *rproc); >> void (*kick)(struct rproc *rproc, int vqid); >> -- >> 2.26.0 >>
next prev parent reply other threads:[~2020-04-21 14:12 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-17 0:20 [PATCH 0/2] rproc core patches needed for TI K3 drivers Suman Anna 2020-04-17 0:20 ` Suman Anna 2020-04-17 0:20 ` [PATCH 1/2] remoteproc: Add prepare and unprepare ops Suman Anna 2020-04-17 0:20 ` Suman Anna 2020-04-21 2:52 ` Bjorn Andersson 2020-04-21 2:52 ` Bjorn Andersson 2020-04-21 14:12 ` Suman Anna [this message] 2020-04-21 14:12 ` Suman Anna 2020-04-23 5:01 ` Bjorn Andersson 2020-04-23 5:01 ` Bjorn Andersson 2020-04-17 0:20 ` [PATCH 2/2] remoteproc: Use a local copy for the name field Suman Anna 2020-04-17 0:20 ` Suman Anna 2020-04-17 17:04 ` Mathieu Poirier 2020-04-17 17:04 ` Mathieu Poirier 2020-04-20 4:59 ` Bjorn Andersson 2020-04-20 4:59 ` Bjorn Andersson
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=2feee391-9f8e-410e-2a20-5b5bdd949940@ti.com \ --to=s-anna@ti.com \ --cc=bjorn.andersson@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-remoteproc@vger.kernel.org \ --cc=loic.pallardy@st.com \ --cc=mathieu.poirier@linaro.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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).