From: Suman Anna <s-anna@ti.com>
To: Mathieu Poirier <mathieu.poirier@linaro.org>, bjorn.andersson@linaro.org
Cc: ohad@wizery.com, loic.pallardy@st.com, peng.fan@nxp.com,
arnaud.pouliquen@st.com, fabien.dessenne@st.com,
linux-remoteproc@vger.kernel.org
Subject: Re: [PATCH v2 04/17] remoteproc: Split rproc_ops allocation from rproc_alloc()
Date: Mon, 30 Mar 2020 14:54:00 -0500 [thread overview]
Message-ID: <eefffa40-ad4d-22ee-8c5b-7c7d64ea8b43@ti.com> (raw)
In-Reply-To: <20200324214603.14979-5-mathieu.poirier@linaro.org>
Hi Mathieu,
On 3/24/20 4:45 PM, Mathieu Poirier wrote:
> Make the rproc_ops allocation a function on its own in order to
> introduce more flexibility to function rproc_alloc().
>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
> drivers/remoteproc/remoteproc_core.c | 45 ++++++++++++++++++----------
> 1 file changed, 30 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index c0871f69929b..d22e557f27ed 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -1992,6 +1992,32 @@ static int rproc_alloc_firmware(struct rproc *rproc,
> return 0;
> }
>
> +static int rproc_alloc_ops(struct rproc *rproc, const struct rproc_ops *ops)
> +{
> + if (!rproc)
> + return -EINVAL;
This is an internal function, and this check is already performed in
rproc_alloc(), so you can drop this.
> +
> + /* Nothing to do if there isn't and ops to work with */
> + if (!ops)
> + return 0;
Hmm, ops at the moment is mandatory, and is one of the first checks done
in rproc_alloc(). So, do drop the concept of optional ops from this
patch. It needs to be moved to a later patch that makes it optional.
> +
> + rproc->ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL);
> + if (!rproc->ops)
> + return -ENOMEM;
> +
> + /* Default to ELF loader if no load function is specified */
> + if (!rproc->ops->load) {
> + rproc->ops->load = rproc_elf_load_segments;
> + rproc->ops->parse_fw = rproc_elf_load_rsc_table;
> + rproc->ops->find_loaded_rsc_table =
> + rproc_elf_find_loaded_rsc_table;
> + rproc->ops->sanity_check = rproc_elf_sanity_check;
I understand you have done this patch on the latest -rc, but this hunk
has been modified on rproc-next as part of Clement's 64-bit loader
support, and there is one more patch from him that's changing stuff here
again.
regards
Suman
> + rproc->ops->get_boot_addr = rproc_elf_get_boot_addr;
> + }
> +
> + return 0;
> +}
> +
> /**
> * rproc_alloc() - allocate a remote processor handle
> * @dev: the underlying device
> @@ -2031,12 +2057,8 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
> if (rproc_alloc_firmware(rproc, name, firmware))
> goto free_rproc;
>
> - rproc->ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL);
> - if (!rproc->ops) {
> - kfree(rproc->firmware);
> - kfree(rproc);
> - return NULL;
> - }
> + if (rproc_alloc_ops(rproc, ops))
> + goto free_firmware;
>
> rproc->name = name;
> rproc->priv = &rproc[1];
> @@ -2060,15 +2082,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
>
> atomic_set(&rproc->power, 0);
>
> - /* Default to ELF loader if no load function is specified */
> - if (!rproc->ops->load) {
> - rproc->ops->load = rproc_elf_load_segments;
> - rproc->ops->parse_fw = rproc_elf_load_rsc_table;
> - rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table;
> - rproc->ops->sanity_check = rproc_elf_sanity_check;
> - rproc->ops->get_boot_addr = rproc_elf_get_boot_addr;
> - }
> -
> mutex_init(&rproc->lock);
>
> idr_init(&rproc->notifyids);
> @@ -2086,6 +2099,8 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
>
> return rproc;
>
> +free_firmware:
> + kfree(rproc->firmware);
> free_rproc:
> kfree(rproc);
> return NULL;
>
next prev parent reply other threads:[~2020-03-30 19:54 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 21:45 [PATCH v2 00/17] remoteproc: Add support for synchronisation with MCU Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 01/17] remoteproc: Add new operation and state machine for MCU synchronisation Mathieu Poirier
2020-03-30 22:46 ` Suman Anna
2020-03-30 22:49 ` Suman Anna
2020-04-01 21:53 ` Mathieu Poirier
2020-04-09 21:38 ` Suman Anna
2020-04-09 21:38 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 02/17] remoteproc: Introduce function rproc_set_mcu_sync_state() Mathieu Poirier
2020-03-30 22:55 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 03/17] remoteproc: Split firmware name allocation from rproc_alloc() Mathieu Poirier
2020-03-27 11:05 ` Loic PALLARDY
2020-03-30 19:47 ` Suman Anna
2020-04-01 21:58 ` Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 04/17] remoteproc: Split rproc_ops " Mathieu Poirier
2020-03-30 19:54 ` Suman Anna [this message]
2020-03-24 21:45 ` [PATCH v2 05/17] remoteproc: Get rid of tedious error path Mathieu Poirier
2020-03-30 20:31 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 06/17] remoteproc: Introduce function rproc_alloc_internals() Mathieu Poirier
2020-03-27 11:10 ` Loic PALLARDY
2020-03-30 20:38 ` Suman Anna
2020-04-01 20:29 ` Mathieu Poirier
2020-04-09 21:53 ` Suman Anna
2020-04-09 21:53 ` Suman Anna
2020-03-30 23:07 ` Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 07/17] remoteproc: Introduce function rproc_alloc_state_machine() Mathieu Poirier
2020-03-27 13:12 ` Loic PALLARDY
2020-03-30 23:10 ` Suman Anna
2020-04-01 20:41 ` Mathieu Poirier
2020-04-09 18:35 ` Suman Anna
2020-04-09 18:35 ` Suman Anna
2020-03-30 23:13 ` Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 08/17] remoteproc: Allocate synchronisation state machine Mathieu Poirier
2020-03-27 13:47 ` Loic PALLARDY
2020-03-30 23:16 ` Mathieu Poirier
2020-03-30 23:20 ` Suman Anna
2020-04-01 20:46 ` Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 09/17] remoteproc: Call the right core function based on synchronisation state Mathieu Poirier
2020-03-31 15:10 ` Suman Anna
2020-04-02 20:16 ` Mathieu Poirier
2020-04-09 18:48 ` Suman Anna
2020-04-09 18:48 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 10/17] remoteproc: Decouple firmware load and remoteproc booting Mathieu Poirier
2020-03-31 21:27 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 11/17] remoteproc: Repurpose function rproc_trigger_auto_boot() Mathieu Poirier
2020-03-31 21:32 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 12/17] remoteproc: Rename function rproc_fw_boot() Mathieu Poirier
2020-03-31 21:42 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 13/17] remoteproc: Introducting new functions to start and stop an MCU Mathieu Poirier
2020-03-31 18:08 ` Suman Anna
2020-03-31 21:46 ` Suman Anna
2020-04-01 21:55 ` Mathieu Poirier
2020-03-24 21:46 ` [PATCH v2 14/17] remoteproc: Refactor function rproc_trigger_recovery() Mathieu Poirier
2020-03-31 21:52 ` Suman Anna
2020-04-02 20:35 ` Mathieu Poirier
2020-04-09 19:02 ` Suman Anna
2020-04-09 19:02 ` Suman Anna
2020-03-24 21:46 ` [PATCH v2 15/17] remoteproc: Correctly deal with MCU synchronisation when changing FW image Mathieu Poirier
2020-03-27 13:50 ` Loic PALLARDY
2020-03-30 23:21 ` Mathieu Poirier
2020-03-31 22:14 ` Suman Anna
2020-04-01 20:55 ` Mathieu Poirier
2020-04-22 21:29 ` Mathieu Poirier
2020-04-22 21:29 ` Mathieu Poirier
2020-04-22 22:56 ` Suman Anna
2020-04-22 22:56 ` Suman Anna
2020-03-24 21:46 ` [PATCH v2 16/17] remoteproc: Correctly deal with MCU synchronisation when changing state Mathieu Poirier
2020-03-27 14:04 ` Loic PALLARDY
2020-03-30 23:49 ` Mathieu Poirier
2020-03-31 22:35 ` Suman Anna
2020-04-01 21:29 ` Mathieu Poirier
2020-04-09 20:55 ` Suman Anna
2020-04-09 20:55 ` Suman Anna
2020-04-02 20:42 ` Mathieu Poirier
2020-04-09 20:40 ` Suman Anna
2020-04-09 20:40 ` Suman Anna
2020-03-24 21:46 ` [PATCH v2 17/17] remoteproc: Make MCU synchronisation state changes on stop and crashed Mathieu Poirier
2020-03-27 17:20 ` [PATCH v2 00/17] remoteproc: Add support for synchronisation with MCU Loic PALLARDY
2020-03-31 22:51 ` Suman Anna
2020-04-01 21:39 ` 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=eefffa40-ad4d-22ee-8c5b-7c7d64ea8b43@ti.com \
--to=s-anna@ti.com \
--cc=arnaud.pouliquen@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=fabien.dessenne@st.com \
--cc=linux-remoteproc@vger.kernel.org \
--cc=loic.pallardy@st.com \
--cc=mathieu.poirier@linaro.org \
--cc=ohad@wizery.com \
--cc=peng.fan@nxp.com \
/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: link
Be 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).