2023-01-27 09:46:10

by Arnd Bergmann

Subject: [PATCH] nvmem: stm32: fix OPTEE dependency

From: Arnd Bergmann <[email protected]>

The stm32 nvmem driver fails to link as built-in when OPTEE
is a loadable module:

aarch64-linux-ld: drivers/nvmem/stm32-bsec-optee-ta.o: in function `stm32_bsec:
stm32-bsec-optee-ta.c:(.text+0xc8): undefined reference to `tee_client_open_session'
aarch64-linux-ld: drivers/nvmem/stm32-bsec-optee-ta.o: in function `stm32_bsec:
stm32-bsec-optee-ta.c:(.text+0x1fc): undefined reference to `tee_client_open_context'

Change the CONFIG_NVMEM_STM32_ROMEM definition so it can only
be built-in if OPTEE is either built-in or disabled, and
make NVMEM_STM32_BSEC_OPTEE_TA a hidden symbol instead.

Fixes: acdf68bdf2d4 ("nvmem: stm32: add OP-TEE support for STM32MP13x")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/nvmem/Kconfig | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index ed8ef7460be2..ae2c5257ed97 100644
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -295,8 +295,7 @@ config NVMEM_SPRD_EFUSE
will be called nvmem-sprd-efuse.

config NVMEM_STM32_BSEC_OPTEE_TA
- bool "STM32MP BSEC OP-TEE TA support for nvmem-stm32-romem driver"
- depends on OPTEE
+ def_bool NVMEM_STM32_ROMEM && OPTEE
help
Say y here to enable the accesses to STM32MP SoC OTPs by the OP-TEE
trusted application STM32MP BSEC.
@@ -307,7 +306,7 @@ config NVMEM_STM32_BSEC_OPTEE_TA
config NVMEM_STM32_ROMEM
tristate "STMicroelectronics STM32 factory-programmed memory support"
depends on ARCH_STM32 || COMPILE_TEST
- imply NVMEM_STM32_BSEC_OPTEE_TA
+ depends on OPTEE || !OPTEE
help
Say y here to enable read-only access for STMicroelectronics STM32
factory-programmed memory area.
--
2.39.0

2023-01-27 10:43:39

by Srinivas Kandagatla

Subject: Re: [PATCH] nvmem: stm32: fix OPTEE dependency

On 27/01/2023 09:41, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The stm32 nvmem driver fails to link as built-in when OPTEE
> is a loadable module:
>
> aarch64-linux-ld: drivers/nvmem/stm32-bsec-optee-ta.o: in function `stm32_bsec:
> stm32-bsec-optee-ta.c:(.text+0xc8): undefined reference to `tee_client_open_session'
> aarch64-linux-ld: drivers/nvmem/stm32-bsec-optee-ta.o: in function `stm32_bsec:
> stm32-bsec-optee-ta.c:(.text+0x1fc): undefined reference to `tee_client_open_context'
>
> Change the CONFIG_NVMEM_STM32_ROMEM definition so it can only
> be built-in if OPTEE is either built-in or disabled, and
> make NVMEM_STM32_BSEC_OPTEE_TA a hidden symbol instead.
>
> Fixes: acdf68bdf2d4 ("nvmem: stm32: add OP-TEE support for STM32MP13x")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---

thanks Anrd,

Applied thanks

--srini
> drivers/nvmem/Kconfig | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
> index ed8ef7460be2..ae2c5257ed97 100644
> --- a/drivers/nvmem/Kconfig
> +++ b/drivers/nvmem/Kconfig
> @@ -295,8 +295,7 @@ config NVMEM_SPRD_EFUSE
> will be called nvmem-sprd-efuse.
>
> config NVMEM_STM32_BSEC_OPTEE_TA
> - bool "STM32MP BSEC OP-TEE TA support for nvmem-stm32-romem driver"
> - depends on OPTEE
> + def_bool NVMEM_STM32_ROMEM && OPTEE
> help
> Say y here to enable the accesses to STM32MP SoC OTPs by the OP-TEE
> trusted application STM32MP BSEC.
> @@ -307,7 +306,7 @@ config NVMEM_STM32_BSEC_OPTEE_TA
> config NVMEM_STM32_ROMEM
> tristate "STMicroelectronics STM32 factory-programmed memory support"
> depends on ARCH_STM32 || COMPILE_TEST
> - imply NVMEM_STM32_BSEC_OPTEE_TA
> + depends on OPTEE || !OPTEE
> help
> Say y here to enable read-only access for STMicroelectronics STM32
> factory-programmed memory area.

2023-02-01 12:49:39

by Patrick Delaunay

Subject: Re: [PATCH] nvmem: stm32: fix OPTEE dependency

Hi

On 1/27/23 10:41, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The stm32 nvmem driver fails to link as built-in when OPTEE
> is a loadable module:
>
> aarch64-linux-ld: drivers/nvmem/stm32-bsec-optee-ta.o: in function `stm32_bsec:
> stm32-bsec-optee-ta.c:(.text+0xc8): undefined reference to `tee_client_open_session'
> aarch64-linux-ld: drivers/nvmem/stm32-bsec-optee-ta.o: in function `stm32_bsec:
> stm32-bsec-optee-ta.c:(.text+0x1fc): undefined reference to `tee_client_open_context'
>
> Change the CONFIG_NVMEM_STM32_ROMEM definition so it can only
> be built-in if OPTEE is either built-in or disabled, and
> make NVMEM_STM32_BSEC_OPTEE_TA a hidden symbol instead.
>
> Fixes: acdf68bdf2d4 ("nvmem: stm32: add OP-TEE support for STM32MP13x")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/nvmem/Kconfig | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
> index ed8ef7460be2..ae2c5257ed97 100644
> --- a/drivers/nvmem/Kconfig
> +++ b/drivers/nvmem/Kconfig
> @@ -295,8 +295,7 @@ config NVMEM_SPRD_EFUSE
> will be called nvmem-sprd-efuse.
>
> config NVMEM_STM32_BSEC_OPTEE_TA
> - bool "STM32MP BSEC OP-TEE TA support for nvmem-stm32-romem driver"
> - depends on OPTEE
> + def_bool NVMEM_STM32_ROMEM && OPTEE
> help
> Say y here to enable the accesses to STM32MP SoC OTPs by the OP-TEE
> trusted application STM32MP BSEC.
> @@ -307,7 +306,7 @@ config NVMEM_STM32_BSEC_OPTEE_TA
> config NVMEM_STM32_ROMEM
> tristate "STMicroelectronics STM32 factory-programmed memory support"
> depends on ARCH_STM32 || COMPILE_TEST
> - imply NVMEM_STM32_BSEC_OPTEE_TA
> + depends on OPTEE || !OPTEE
> help
> Say y here to enable read-only access for STMicroelectronics STM32
> factory-programmed memory area.


Thanks for the fix,


I test several case....

 at least the logical configurations:

OP-TEE=n and NVMEM_STM32_ROMEM=m

OP-TEE=y and NVMEM_STM32_ROMEM=m

OP-TEE=n and NVMEM_STM32_ROMEM=y

OP-TEE=y and NVMEM_STM32_ROMEM=y


but I miss this case

OP-TEE=m and NVMEM_STM32_ROMEM=y




Reviewed-by: Patrick Delaunay <[email protected]>

Thanks
Patrick