From: Marco Felsch <m.felsch@pengutronix.de> To: Anson Huang <Anson.Huang@nxp.com> Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, aisheng.dong@nxp.com, leonard.crestez@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linux-imx@nxp.com Subject: Re: [PATCH] firmware: imx: Skip return value check for some special SCU firmware APIs Date: Thu, 26 Sep 2019 09:59:14 +0200 [thread overview] Message-ID: <20190926075914.i7tsd3cbpitrqe4q@pengutronix.de> (raw) In-Reply-To: <1569406066-16626-1-git-send-email-Anson.Huang@nxp.com> Hi, On 19-09-25 18:07, Anson Huang wrote: > The SCU firmware does NOT always have return value stored in message > header's function element even the API has response data, those special > APIs are defined as void function in SCU firmware, so they should be > treated as return success always. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > --- > - This patch is based on the patch of https://patchwork.kernel.org/patch/11129553/ > --- > drivers/firmware/imx/imx-scu.c | 34 ++++++++++++++++++++++++++++++++-- > 1 file changed, 32 insertions(+), 2 deletions(-) > > diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c > index 869be7a..ced5b12 100644 > --- a/drivers/firmware/imx/imx-scu.c > +++ b/drivers/firmware/imx/imx-scu.c > @@ -78,6 +78,11 @@ static int imx_sc_linux_errmap[IMX_SC_ERR_LAST] = { > -EIO, /* IMX_SC_ERR_FAIL */ > }; > > +static const struct imx_sc_rpc_msg whitelist[] = { > + { .svc = IMX_SC_RPC_SVC_MISC, .func = IMX_SC_MISC_FUNC_UNIQUE_ID }, > + { .svc = IMX_SC_RPC_SVC_MISC, .func = IMX_SC_MISC_FUNC_GET_BUTTON_STATUS }, > +}; Is this going to be extended in the near future? I see some upcoming problems here if someone uses a different scu-fw<->kernel combination as nxp would suggest. Regards, Marco > + > static struct imx_sc_ipc *imx_sc_ipc_handle; > > static inline int imx_sc_to_linux_errno(int errno) > @@ -157,11 +162,24 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg) > return 0; > } > > +static bool imx_scu_call_skip_return_value_check(uint8_t svc, uint8_t func) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(whitelist); i++) > + if (svc == whitelist[i].svc && > + func == whitelist[i].func) > + return true; > + > + return false; > +} > + > /* > * RPC command/response > */ > int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp) > { > + uint8_t saved_svc, saved_func; > struct imx_sc_rpc_msg *hdr; > int ret; > > @@ -171,8 +189,11 @@ int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp) > mutex_lock(&sc_ipc->lock); > reinit_completion(&sc_ipc->done); > > - if (have_resp) > + if (have_resp) { > sc_ipc->msg = msg; > + saved_svc = ((struct imx_sc_rpc_msg *)msg)->svc; > + saved_func = ((struct imx_sc_rpc_msg *)msg)->func; > + } > sc_ipc->count = 0; > ret = imx_scu_ipc_write(sc_ipc, msg); > if (ret < 0) { > @@ -190,7 +211,16 @@ int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp) > > /* response status is stored in hdr->func field */ > hdr = msg; > - ret = hdr->func; > + /* > + * Some special SCU firmware APIs do NOT have return value > + * in hdr->func, but they do have response data, those special > + * APIs are defined as void function in SCU firmware, so they > + * should be treated as return success always. > + */ > + if (!imx_scu_call_skip_return_value_check(saved_svc, saved_func)) > + ret = hdr->func; > + else > + ret = 0; > } > > out: > -- > 2.7.4 > > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
WARNING: multiple messages have this Message-ID (diff)
From: Marco Felsch <m.felsch@pengutronix.de> To: Anson Huang <Anson.Huang@nxp.com> Cc: aisheng.dong@nxp.com, shawnguo@kernel.org, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, Linux-imx@nxp.com, kernel@pengutronix.de, leonard.crestez@nxp.com, festevam@gmail.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] firmware: imx: Skip return value check for some special SCU firmware APIs Date: Thu, 26 Sep 2019 09:59:14 +0200 [thread overview] Message-ID: <20190926075914.i7tsd3cbpitrqe4q@pengutronix.de> (raw) In-Reply-To: <1569406066-16626-1-git-send-email-Anson.Huang@nxp.com> Hi, On 19-09-25 18:07, Anson Huang wrote: > The SCU firmware does NOT always have return value stored in message > header's function element even the API has response data, those special > APIs are defined as void function in SCU firmware, so they should be > treated as return success always. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > --- > - This patch is based on the patch of https://patchwork.kernel.org/patch/11129553/ > --- > drivers/firmware/imx/imx-scu.c | 34 ++++++++++++++++++++++++++++++++-- > 1 file changed, 32 insertions(+), 2 deletions(-) > > diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c > index 869be7a..ced5b12 100644 > --- a/drivers/firmware/imx/imx-scu.c > +++ b/drivers/firmware/imx/imx-scu.c > @@ -78,6 +78,11 @@ static int imx_sc_linux_errmap[IMX_SC_ERR_LAST] = { > -EIO, /* IMX_SC_ERR_FAIL */ > }; > > +static const struct imx_sc_rpc_msg whitelist[] = { > + { .svc = IMX_SC_RPC_SVC_MISC, .func = IMX_SC_MISC_FUNC_UNIQUE_ID }, > + { .svc = IMX_SC_RPC_SVC_MISC, .func = IMX_SC_MISC_FUNC_GET_BUTTON_STATUS }, > +}; Is this going to be extended in the near future? I see some upcoming problems here if someone uses a different scu-fw<->kernel combination as nxp would suggest. Regards, Marco > + > static struct imx_sc_ipc *imx_sc_ipc_handle; > > static inline int imx_sc_to_linux_errno(int errno) > @@ -157,11 +162,24 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg) > return 0; > } > > +static bool imx_scu_call_skip_return_value_check(uint8_t svc, uint8_t func) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(whitelist); i++) > + if (svc == whitelist[i].svc && > + func == whitelist[i].func) > + return true; > + > + return false; > +} > + > /* > * RPC command/response > */ > int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp) > { > + uint8_t saved_svc, saved_func; > struct imx_sc_rpc_msg *hdr; > int ret; > > @@ -171,8 +189,11 @@ int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp) > mutex_lock(&sc_ipc->lock); > reinit_completion(&sc_ipc->done); > > - if (have_resp) > + if (have_resp) { > sc_ipc->msg = msg; > + saved_svc = ((struct imx_sc_rpc_msg *)msg)->svc; > + saved_func = ((struct imx_sc_rpc_msg *)msg)->func; > + } > sc_ipc->count = 0; > ret = imx_scu_ipc_write(sc_ipc, msg); > if (ret < 0) { > @@ -190,7 +211,16 @@ int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp) > > /* response status is stored in hdr->func field */ > hdr = msg; > - ret = hdr->func; > + /* > + * Some special SCU firmware APIs do NOT have return value > + * in hdr->func, but they do have response data, those special > + * APIs are defined as void function in SCU firmware, so they > + * should be treated as return success always. > + */ > + if (!imx_scu_call_skip_return_value_check(saved_svc, saved_func)) > + ret = hdr->func; > + else > + ret = 0; > } > > out: > -- > 2.7.4 > > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ 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:[~2019-09-26 7:59 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-25 10:07 [PATCH] firmware: imx: Skip return value check for some special SCU firmware APIs Anson Huang 2019-09-25 10:07 ` Anson Huang 2019-09-25 13:13 ` Leonard Crestez 2019-09-25 13:13 ` Leonard Crestez 2019-09-26 0:34 ` Anson Huang 2019-09-26 0:34 ` Anson Huang 2019-09-26 7:59 ` Marco Felsch [this message] 2019-09-26 7:59 ` Marco Felsch 2019-09-26 8:03 ` Anson Huang 2019-09-26 8:03 ` Anson Huang 2019-09-26 10:05 ` Marco Felsch 2019-09-26 10:05 ` Marco Felsch 2019-09-26 13:25 ` Leonard Crestez 2019-09-26 13:25 ` Leonard Crestez 2019-09-27 1:20 ` Anson Huang 2019-09-27 1:20 ` Anson Huang 2019-09-27 9:06 ` Marco Felsch 2019-09-27 9:06 ` Marco Felsch 2019-09-27 9:27 ` Anson Huang 2019-09-27 9:27 ` Anson Huang 2019-09-27 11:22 ` Leonard Crestez 2019-09-27 11:22 ` Leonard Crestez 2019-09-29 1:12 ` Anson Huang 2019-09-29 1:12 ` Anson Huang 2019-09-27 11:16 ` Leonard Crestez 2019-09-27 11:16 ` Leonard Crestez 2019-09-30 7:28 ` Leonard Crestez 2019-09-30 7:28 ` Leonard Crestez 2019-09-30 7:42 ` Anson Huang 2019-09-30 7:42 ` Anson Huang 2019-09-30 7:54 ` Anson Huang 2019-09-30 7:54 ` Anson Huang 2019-09-30 8:14 ` Marco Felsch 2019-09-30 8:14 ` Marco Felsch 2019-09-30 8:32 ` Anson Huang 2019-09-30 8:32 ` Anson Huang 2019-09-30 10:02 ` Marco Felsch 2019-09-30 10:02 ` Marco Felsch 2019-10-07 1:21 ` Anson Huang 2019-10-07 1:21 ` Anson Huang 2019-10-07 8:07 ` Marco Felsch 2019-10-07 8:07 ` Marco Felsch
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=20190926075914.i7tsd3cbpitrqe4q@pengutronix.de \ --to=m.felsch@pengutronix.de \ --cc=Anson.Huang@nxp.com \ --cc=Linux-imx@nxp.com \ --cc=aisheng.dong@nxp.com \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=leonard.crestez@nxp.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --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.