From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: bjorn.andersson@linaro.org
Cc: linux-remoteproc@vger.kernel.org, ohad@wizery.com,
loic.pallardy@st.com, s-anna@ti.com, peng.fan@nxp.com,
arnaud.pouliquen@st.com, fabien.dessenne@st.com
Subject: [PATCH 09/18] remoteproc: Call the right core function based on synchronisation state
Date: Thu, 12 Mar 2020 16:11:49 -0600 [thread overview]
Message-ID: <20200312221158.3613-10-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200312221158.3613-1-mathieu.poirier@linaro.org>
Call the right core function based on whether we should synchronise
with an MCU or boot it from scratch.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/remoteproc/remoteproc_internal.h | 35 +++++++++++-------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
index 73ea32df0156..53d63ee2c8bf 100644
--- a/drivers/remoteproc/remoteproc_internal.h
+++ b/drivers/remoteproc/remoteproc_internal.h
@@ -106,38 +106,40 @@ static inline void rproc_set_mcu_sync_state(struct rproc *rproc,
}
}
+#define RPROC_OPS_HELPER(__operation, ...) \
+ do { \
+ if (rproc_sync_with_mcu(rproc) && \
+ rproc->sync_ops && \
+ rproc->sync_ops->__operation) \
+ return rproc->sync_ops->__operation(__VA_ARGS__); \
+ 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 +147,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 +155,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;
}
--
2.20.1
next prev parent reply other threads:[~2020-03-12 22:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 22:11 [PATCH 00/18] remoteproc: Add support for synchronisation with MCU Mathieu Poirier
2020-03-12 22:11 ` [PATCH 01/18] remoteproc: Add new operation and state machine for MCU synchronisation Mathieu Poirier
2020-03-13 2:03 ` Xiang Xiao
2020-03-13 15:01 ` Mathieu Poirier
2020-03-30 19:24 ` Suman Anna
2020-03-12 22:11 ` [PATCH 02/18] remoteproc: Introduce function rproc_set_mcu_sync_state() Mathieu Poirier
2020-03-12 22:11 ` [PATCH 03/18] remoteproc: Split firmware name allocation from rproc_alloc() Mathieu Poirier
2020-03-12 22:11 ` [PATCH 04/18] remoteproc: Split rproc_ops " Mathieu Poirier
2020-03-12 22:11 ` [PATCH 05/18] remoteproc: Get rid of tedious error path Mathieu Poirier
2020-03-12 22:11 ` [PATCH 06/18] remoteproc: Introduce function rproc_alloc_internals() Mathieu Poirier
2020-03-12 22:11 ` [PATCH 07/18] remoteproc: Introduce function rproc_alloc_state_machine() Mathieu Poirier
2020-03-12 22:11 ` [PATCH 08/18] remoteproc: Allocate synchronisation state machine Mathieu Poirier
2020-03-12 22:11 ` Mathieu Poirier [this message]
2020-03-12 22:11 ` [PATCH 10/18] remoteproc: Decouple firmware load and remoteproc booting Mathieu Poirier
2020-03-12 22:11 ` [PATCH 11/18] remoteproc: Repurpose function rproc_trigger_auto_boot() Mathieu Poirier
2020-03-12 22:11 ` [PATCH 12/18] remoteproc: Rename function rproc_fw_boot() Mathieu Poirier
2020-03-12 22:11 ` [PATCH 13/18] remoteproc: Introducting new functions to start and stop an MCU Mathieu Poirier
2020-03-12 22:11 ` [PATCH 14/18] remoteproc: Refactor function rproc_trigger_recovery() Mathieu Poirier
2020-03-12 22:11 ` [PATCH 15/18] remoteproc: Correctly deal with MCU synchronisation when changing FW image Mathieu Poirier
2020-03-12 22:11 ` [PATCH 16/18] remoteproc: Correctly deal with MCU synchronisation when changing state Mathieu Poirier
2020-03-12 22:11 ` [PATCH 17/18] remoteproc: Make MCU synchronisation state changes on stop and crashed Mathieu Poirier
2020-03-12 22:11 ` [PATCH 18/18] remoteproc: stm32: add support for co-processor booted before kernel 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=20200312221158.3613-10-mathieu.poirier@linaro.org \
--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 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.