From patchwork Fri Jan 27 11:16:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 49232 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp780720wrn; Fri, 27 Jan 2023 03:27:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXuLZCSdzKhpM+6AZltmNNef7lO+sUlVm7Q8xSd39IJ7s4lrHnqTX2ncICN6OO+F1yKLs9vV X-Received: by 2002:a17:903:181:b0:194:a859:3e0 with SMTP id z1-20020a170903018100b00194a85903e0mr51698347plg.58.1674818867071; Fri, 27 Jan 2023 03:27:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674818867; cv=none; d=google.com; s=arc-20160816; b=JppacMC6C40NHw9zOtPQ6oN4c0W+78JKSQCnfD+G4Iu9YWt/sUkwOYIVfwwqHVLC1s kamUswO8nowMywAF8Ug48kXoRn3d2+uc3KAuMsbK99NRJzLAcREBkcZIWuT07Zsyzhlz 3C5aHjbGnEMckAUJevIrgqqdE9C2Vek2rNxaRt0nLxMrDKjXpftQD9Y/nHNclrs2PlhH YwfpWHDlhynn4ZoagyrvLjrHYgP7qMmPdBq5pWVtNnIejal3r9CeH9kty7WxqwPwmJyH f1u6nO5HIm5dLxsmdRGY3wDUZQgz0H0F3P8A8pi4HzaJNE0dwr9Gw3VnzyyH9RvJDt6i HOOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nophxsV7RTMMr7jT/+RerGv5oOL4oTpwyjcwQZkZTDc=; b=hG6UHwc9ot05NeYcPf7XwmmLHX3feUGo1I+WbVh+lbOPLA4x/GSjgrUjhzxZkfPyrj hlcNxeQ1YxP4v6vjk2haR8ef4bSkLcWibKIzZ40TatdgJkY2sdq2nCvZX4je6fkGcOG3 SfMDkcWrlt7UREnHBMiVFmRa03sLxk0qUlMAdqxILqMlNcvn5mIm8Axcx+M9B4u4YF1B TVF2JjfQtwKdhi/+pQO6/VYkEf8/CjCbgv/HSL29IUYKw13j4DopwBF6+qX8lusqp6qb mRU9ET9rxb+zkakofsGJQXtVOwzWVCU3KmxRX3GTabJbXPziFViPXEvW+jewnawESA2Q U2hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ey/fOJ1c"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h1-20020a170902f54100b001929fa56a48si4770848plf.394.2023.01.27.03.27.33; Fri, 27 Jan 2023 03:27:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ey/fOJ1c"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232489AbjA0LUv (ORCPT + 99 others); Fri, 27 Jan 2023 06:20:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232456AbjA0LTG (ORCPT ); Fri, 27 Jan 2023 06:19:06 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D5B37B420 for ; Fri, 27 Jan 2023 03:18:30 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id bk16so4642063wrb.11 for ; Fri, 27 Jan 2023 03:18:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nophxsV7RTMMr7jT/+RerGv5oOL4oTpwyjcwQZkZTDc=; b=Ey/fOJ1cRFNO9y5NIrn+b1FYncc4yFk2walPwaG5KX/r956XOp+lQSIX5FJBAmRc9m m/dHHPCnzM8t+R3teXgt11h+1EOiiEXWeajFDafLOMeKy04taSYCAQaxH8FmwuPQ11Uq 9uwXhyJKzJGDOCtlzRgc/yIPJv8k53whjMnS2aMNnJsMpmc0yskJjfgJ2YMZ8pgcNfpR C6QExyalaFoy7jyesyRW7pWNJw0YeAEPDf2+os3gVVMY0Iox9W+x4vB0FRP2KvCs0V8z xdTSfYKLsWrV7CaXYgUiUOjjkkAzxx3zAyFBj+b7bJuAsWmwLAO5NTqaMRUl1DGghUy/ F4wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nophxsV7RTMMr7jT/+RerGv5oOL4oTpwyjcwQZkZTDc=; b=TXCm3a2t0CJU7ltKTMIk5KuQZkPqryz/fmTKHGAq4pPiGdiCvcYOHJ6KraxiXOFJPy tT/beFKprN5/smJGy7uTBj9n8cYUArtTSTcRfF6uDGmuKoGLCYzrZ8rXhBmRegQTAyjH CW8WKJxEFfnUHlTqAkrH9RD745unXzNdAcQtlJEXzlZovECwXgEYKoMem4FPcxpn3W66 OQVOm0ZAWE4T9NhO30ChgFoLY5V4dFJB0Zg4WEEfyVSjIxO2WQtMce3ceqJ5OGeBB6Hh 4sg6XG4mSFD2z82Kqe9gWtFcf2Vhg+0Xj9mN2OwVn7R0dmLvXszYa+7aGUBuJXdan1Ro jRCQ== X-Gm-Message-State: AO0yUKVDC/lLr1/f2wVrDE70lP/2ISS9fLf+553Z0iKiq98RN7Ziz1iG atuSi8J76s9LYzVuNa57wY0Dvw== X-Received: by 2002:a5d:5a87:0:b0:2bf:b7ca:8ae2 with SMTP id bp7-20020a5d5a87000000b002bfb7ca8ae2mr9590774wrb.15.1674818309851; Fri, 27 Jan 2023 03:18:29 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id c13-20020adffb0d000000b002bfd190fd60sm1843314wrr.108.2023.01.27.03.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 03:18:29 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 37/37] nvmem: stm32: fix OPTEE dependency Date: Fri, 27 Jan 2023 11:16:05 +0000 Message-Id: <20230127111605.25958-38-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127111605.25958-1-srinivas.kandagatla@linaro.org> References: <20230127111605.25958-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756174868434565033?= X-GMAIL-MSGID: =?utf-8?q?1756174868434565033?= From: Arnd Bergmann 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: ae46fd89cc0cc ("nvmem: stm32: add OP-TEE support for STM32MP13x") Signed-off-by: Arnd Bergmann --- 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.