From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: Patrick Delaunay <patrick.delaunay@foss.st.com>,
Alexandre TORGUE <alexandre.torgue@foss.st.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Etienne CARRIERE <etienne.carriere@linaro.org>,
Fabrice GASNIER <fabrice.gasnier@foss.st.com>,
Amelie DELAUNAY <amelie.delaunay@foss.st.com>,
Lionel DEBIEVE <lionel.debieve@foss.st.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com
Subject: Re: [PATCH v6 3/3] nvmem: stm32: detect bsec pta presence for STM32MP15x
Date: Fri, 20 Jan 2023 17:42:15 +0000 [thread overview]
Message-ID: <2b77d20c-efe4-a0f3-4260-5817f3068eb0@linaro.org> (raw)
In-Reply-To: <20230118182856.v6.3.I59210046e368cfc22bd3cca2afe1653674f8ece8@changeid>
On 18/01/2023 17:29, Patrick Delaunay wrote:
> On STM32MP15x SoC, the SMC backend is optional when OP-TEE is used;
> the PTA BSEC should be used as it is done on STM32MP13x platform,
> but the BSEC SMC can be also used: it is a legacy mode in OP-TEE,
> not recommended but used in previous OP-TEE firmware.
>
> The presence of OP-TEE is dynamically detected in STM32MP15x device tree
> and the supported NVMEM backend is dynamically detected:
> - PTA with stm32_bsec_pta_find
> - SMC with stm32_bsec_check
>
> With OP-TEE but without PTA and SMC detection, the probe is deferred for
> STM32MP15x devices.
>
> On STM32MP13x platform, only the PTA is supported with cfg->ta = true
> and this detection is skipped.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
Applied thanks,
--srini
>
> Changes in v6:
> - added reviewed by Etienne Carriere
>
> Changes in v5:
> - update the BSEC SMC detection logic in stm32_romem_probe()
> after Etienne Carierre review to support NVMEM probe after OP-TEE probe
>
> Changes in v3:
> - use of_find_compatible_node in optee_presence_check function
> instead of of_find_node_by_path("/firmware/optee")
>
> Changes in v2:
> - Added patch in the serie for BSEC PTA support on STM32MP15x
> with dynamic detection of OP-TEE presence and SMC support (legacy mode)
>
> drivers/nvmem/stm32-romem.c | 38 +++++++++++++++++++++++++++++++++----
> 1 file changed, 34 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/nvmem/stm32-romem.c b/drivers/nvmem/stm32-romem.c
> index 978a63edf297..ba779e26937a 100644
> --- a/drivers/nvmem/stm32-romem.c
> +++ b/drivers/nvmem/stm32-romem.c
> @@ -159,6 +159,31 @@ static int stm32_bsec_pta_write(void *context, unsigned int offset, void *buf,
> return stm32_bsec_optee_ta_write(priv->ctx, priv->lower, offset, buf, bytes);
> }
>
> +static bool stm32_bsec_smc_check(void)
> +{
> + u32 val;
> + int ret;
> +
> + /* check that the OP-TEE support the BSEC SMC (legacy mode) */
> + ret = stm32_bsec_smc(STM32_SMC_READ_SHADOW, 0, 0, &val);
> +
> + return !ret;
> +}
> +
> +static bool optee_presence_check(void)
> +{
> + struct device_node *np;
> + bool tee_detected = false;
> +
> + /* check that the OP-TEE node is present and available. */
> + np = of_find_compatible_node(NULL, NULL, "linaro,optee-tz");
> + if (np && of_device_is_available(np))
> + tee_detected = true;
> + of_node_put(np);
> +
> + return tee_detected;
> +}
> +
> static int stm32_romem_probe(struct platform_device *pdev)
> {
> const struct stm32_romem_cfg *cfg;
> @@ -195,11 +220,16 @@ static int stm32_romem_probe(struct platform_device *pdev)
> } else {
> priv->cfg.size = cfg->size;
> priv->lower = cfg->lower;
> - if (cfg->ta) {
> + if (cfg->ta || optee_presence_check()) {
> rc = stm32_bsec_optee_ta_open(&priv->ctx);
> - /* wait for OP-TEE client driver to be up and ready */
> - if (rc)
> - return rc;
> + if (rc) {
> + /* wait for OP-TEE client driver to be up and ready */
> + if (rc == -EPROBE_DEFER)
> + return -EPROBE_DEFER;
> + /* BSEC PTA is required or SMC not supported */
> + if (cfg->ta || !stm32_bsec_smc_check())
> + return rc;
> + }
> }
> if (priv->ctx) {
> rc = devm_add_action_or_reset(dev, stm32_bsec_optee_ta_close, priv->ctx);
next prev parent reply other threads:[~2023-01-20 17:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 17:29 [PATCH v6 0/3] nvmem: stm32: add OP-TEE support for STM32MP13x Patrick Delaunay
2023-01-18 17:29 ` [PATCH v6 1/3] ARM: dts: stm32mp13: fix compatible for BSEC Patrick Delaunay
2023-01-19 12:06 ` [Linux-stm32] " Ahmad Fatoum
2023-02-02 12:31 ` Alexandre TORGUE
2023-01-18 17:29 ` [PATCH v6 2/3] nvmem: stm32: add OP-TEE support for STM32MP13x Patrick Delaunay
2023-01-20 17:42 ` Srinivas Kandagatla
2023-01-18 17:29 ` [PATCH v6 3/3] nvmem: stm32: detect bsec pta presence for STM32MP15x Patrick Delaunay
2023-01-20 17:42 ` Srinivas Kandagatla [this message]
2023-01-26 21:02 ` [PATCH v6 0/3] nvmem: stm32: add OP-TEE support for STM32MP13x Arnd Bergmann
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=2b77d20c-efe4-a0f3-4260-5817f3068eb0@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=alexandre.torgue@foss.st.com \
--cc=amelie.delaunay@foss.st.com \
--cc=etienne.carriere@linaro.org \
--cc=fabrice.gasnier@foss.st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=lionel.debieve@foss.st.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=patrick.delaunay@foss.st.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).