Skip to contentSkip to conversation

nvmem: stm32: fix OPTEE dependency

PATCH In review Arnd Bergmann 3 participants 3 messages Jan 27, 2023 – Feb 1, 2023 NVMEM framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/nvmem/Kconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/nvmem/Kconfig +2 -3
index ed8ef7460be2..ae2c5257ed97 100644
@@ -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.
Signature · 1 line
2.39.0
#1 lore raw
Quoted 10 lines · Arnd Bergmann

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'

Quoted 7 lines

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")

---

thanks Anrd,

Applied thanks

--srini

Quoted 26 lines
  drivers/nvmem/Kconfig | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
drivers/nvmem/Kconfig +2 -3
index ed8ef7460be2..ae2c5257ed97 100644
@@ -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.
Reviewed-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann

Hi

Quoted 35 lines · Arnd Bergmann

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")
---
  drivers/nvmem/Kconfig | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
drivers/nvmem/Kconfig +1 -2
index ed8ef7460be2..ae2c5257ed97 100644
@@ -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.

drivers/nvmem/Kconfig config NVMEM_STM32_BSEC_OPTEE_TA · line 312

Quoted 8 lines
drivers/nvmem/Kconfig +1 -1
@@ -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

Thanks
Patrick