From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Suman Anna <s-anna@ti.com>
Cc: bjorn.andersson@linaro.org, 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 09/17] remoteproc: Call the right core function based on synchronisation state
Date: Thu, 2 Apr 2020 14:16:42 -0600 [thread overview]
Message-ID: <20200402201642.GA9160@xps15> (raw)
In-Reply-To: <006ab94d-daf3-0e28-7098-982d473c00d5@ti.com>
On Tue, Mar 31, 2020 at 10:10:50AM -0500, Suman Anna wrote:
> Hi Mathieu,
>
> On 3/24/20 4:45 PM, Mathieu Poirier wrote:
> > Call the right core function based on whether we should synchronise
> > with an MCU or boot it from scratch.
>
> This patch does generate some checkpatch warnings.
Right, checkpatch is complaining but other than duplicating the same code for
all functions, I don't see another way to do this.
>
> >
> > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> > ---
> > drivers/remoteproc/remoteproc_internal.h | 36 +++++++++++-------------
> > 1 file changed, 17 insertions(+), 19 deletions(-)
> >
> > diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
> > index 73ea32df0156..5f711ceb97ba 100644
> > --- a/drivers/remoteproc/remoteproc_internal.h
> > +++ b/drivers/remoteproc/remoteproc_internal.h
> > @@ -106,38 +106,41 @@ static inline void rproc_set_mcu_sync_state(struct rproc *rproc,
> > }
> > }
> >
> > +#define RPROC_OPS_HELPER(__operation, ...) \
> > + do { \
> > + if (rproc_sync_with_mcu(rproc)) { \
>
> So this does make the logic a bit convoluted, since you have three
> different flags for rproc_sync_with_mcu, and you apply them in common
> for all the ops. This is what I meant in my comment on Patch 1.
There is indeed 3 different flags but they are only valid in a specific state.
What "ops" are you referring to here? I'm also not sure about the comment in
"patch 1" - which one would that be and how does it relate to the current block
of code. Apologies, I need more clarifications.
>
> > + if (!rproc->sync_ops || \
> > + !rproc->sync_ops->__operation) \
> > + return 0; \
> > + return rproc->sync_ops->__operation(__VA_ARGS__); \
>
> Use the same semantics as the regular ops instead of two return
> statements, the code should fallback to the common return 0 after the
> RPROC_OPS_HELPER when neither of them are present.
Yes the tests are exactly the same, no reason to proceed differently.
>
> regards
> Suman
>
> > + } else if (rproc->ops && rproc->ops->__operation) \
> > + return rproc->ops->__operation(__VA_ARGS__); \
> > + } while (0) \
> > +
> > static inline
> > int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw)
> > {
> > - if (rproc->ops->sanity_check)
> > - return rproc->ops->sanity_check(rproc, fw);
> > -
> > + RPROC_OPS_HELPER(sanity_check, rproc, fw);
> > return 0;
> > }
> >
> > static inline
> > u32 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw)
> > {
> > - if (rproc->ops->get_boot_addr)
> > - return rproc->ops->get_boot_addr(rproc, fw);
> > -
> > + RPROC_OPS_HELPER(get_boot_addr, rproc, fw);
> > return 0;
> > }
> >
> > static inline
> > int rproc_load_segments(struct rproc *rproc, const struct firmware *fw)
> > {
> > - if (rproc->ops->load)
> > - return rproc->ops->load(rproc, fw);
> > -
> > + RPROC_OPS_HELPER(load, rproc, fw);
> > return -EINVAL;
> > }
> >
> > static inline int rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> > {
> > - if (rproc->ops->parse_fw)
> > - return rproc->ops->parse_fw(rproc, fw);
> > -
> > + RPROC_OPS_HELPER(parse_fw, rproc, fw);
> > return 0;
> > }
> >
> > @@ -145,10 +148,7 @@ static inline
> > int rproc_handle_rsc(struct rproc *rproc, u32 rsc_type, void *rsc, int offset,
> > int avail)
> > {
> > - if (rproc->ops->handle_rsc)
> > - return rproc->ops->handle_rsc(rproc, rsc_type, rsc, offset,
> > - avail);
> > -
> > + RPROC_OPS_HELPER(handle_rsc, rproc, rsc_type, rsc, offset, avail);
> > return RSC_IGNORED;
> > }
> >
> > @@ -156,9 +156,7 @@ static inline
> > struct resource_table *rproc_find_loaded_rsc_table(struct rproc *rproc,
> > const struct firmware *fw)
> > {
> > - if (rproc->ops->find_loaded_rsc_table)
> > - return rproc->ops->find_loaded_rsc_table(rproc, fw);
> > -
> > + RPROC_OPS_HELPER(find_loaded_rsc_table, rproc, fw);
> > return NULL;
> > }
> >
> >
>
next prev parent reply other threads:[~2020-04-02 20:16 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
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 [this message]
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=20200402201642.GA9160@xps15 \
--to=mathieu.poirier@linaro.org \
--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=ohad@wizery.com \
--cc=peng.fan@nxp.com \
--cc=s-anna@ti.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).