Message-ID: <92c2a978-73df-4bde-c28c-bc0185934605@linaro.org>
Date:   Fri, 27 Jan 2023 10:43:16 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: [PATCH] nvmem: stm32: fix OPTEE dependency
Content-Language: en-US
To:     Arnd Bergmann <arnd@kernel.org>,
        Etienne Carriere <etienne.carriere@linaro.org>,
        Patrick Delaunay <patrick.delaunay@foss.st.com>
Cc:     Arnd Bergmann <arnd@arndb.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org
References: <20230127094200.2451839-1-arnd@kernel.org>
From:   Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
In-Reply-To: <20230127094200.2451839-1-arnd@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 27/01/2023 09:41, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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 <arnd@arndb.de>
> ---

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.