From nobody Thu May 16 11:22:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1689926582644145.9701950184559; Fri, 21 Jul 2023 01:03:02 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.567396.886375 (Exim 4.92) (envelope-from ) id 1qMl5e-0008WE-1y; Fri, 21 Jul 2023 08:02:18 +0000 Received: by outflank-mailman (output) from mailman id 567396.886375; Fri, 21 Jul 2023 08:02:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMl5d-0008W7-Vh; Fri, 21 Jul 2023 08:02:17 +0000 Received: by outflank-mailman (input) for mailman id 567396; Fri, 21 Jul 2023 08:02:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMl5c-0008W1-Ba for xen-devel@lists.xenproject.org; Fri, 21 Jul 2023 08:02:16 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id e76a6f5a-279c-11ee-b23a-6b7b168915f2; Fri, 21 Jul 2023 10:02:15 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6D4402F4; Fri, 21 Jul 2023 01:02:57 -0700 (PDT) Received: from C3HXLD123V.emea.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 35CBA3F67D; Fri, 21 Jul 2023 01:02:13 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e76a6f5a-279c-11ee-b23a-6b7b168915f2 From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: jens.wiklander@linaro.org, Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH] xen/arm: Move TEE mediators in a kconfig submenu Date: Fri, 21 Jul 2023 10:02:04 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1689926583503100001 Content-Type: text/plain; charset="utf-8" Rework TEE mediators to put them under a submenu in Kconfig. The submenu is only visible if UNSUPPORTED is activated as all currently existing mediators are UNSUPPORTED. While there rework a bit the configuration so that OP-TEE and FF-A mediators are selecting the generic TEE interface instead of depending on it. Make the TEE option hidden as it is of no interest for anyone to select it without one of the mediators so having them select it instead should be enough. Rework makefile inclusion and selection so that generic TEE is included only when selected and include the tee Makefile all the time making the directory tee self contained. Signed-off-by: Bertrand Marquis --- xen/arch/arm/Kconfig | 7 ------- xen/arch/arm/Makefile | 2 +- xen/arch/arm/tee/Kconfig | 18 ++++++++++++++++-- xen/arch/arm/tee/Makefile | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 439cc94f3344..fd57a82dd284 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -175,13 +175,6 @@ config ARM64_BTI Branch Target Identification support. This feature is not supported in Xen. =20 -config TEE - bool "Enable TEE mediators support (UNSUPPORTED)" if UNSUPPORTED - default n - help - This option enables generic TEE mediators support. It allows guests - to access real TEE via one of TEE mediators implemented in XEN. - source "arch/arm/tee/Kconfig" =20 config STATIC_SHM diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7bf07e992046..d47d5c20aa73 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_HAS_PCI) +=3D pci/ ifneq ($(CONFIG_NO_PLAT),y) obj-y +=3D platforms/ endif -obj-$(CONFIG_TEE) +=3D tee/ +obj-y +=3D tee/ obj-$(CONFIG_HAS_VPCI) +=3D vpci.o =20 obj-$(CONFIG_HAS_ALTERNATIVE) +=3D alternative.o diff --git a/xen/arch/arm/tee/Kconfig b/xen/arch/arm/tee/Kconfig index 923f08ba8cb7..cecbf7e12b43 100644 --- a/xen/arch/arm/tee/Kconfig +++ b/xen/arch/arm/tee/Kconfig @@ -1,7 +1,17 @@ +menu "TEE mediators" + visible if UNSUPPORTED + +config TEE + bool + default n + help + This option enables generic TEE mediators support. It allows guests + to access real TEE via one of TEE mediators implemented in XEN. + config OPTEE - bool "Enable OP-TEE mediator" + bool "Enable OP-TEE mediator (UNSUPPORTED)" if UNSUPPORTED default n - depends on TEE + select TEE help Enable the OP-TEE mediator. It allows guests to access OP-TEE running on your platform. This requires @@ -13,9 +23,13 @@ config FFA bool "Enable FF-A mediator support (UNSUPPORTED)" if UNSUPPORTED default n depends on ARM_64 + select TEE help This option enables a minimal FF-A mediator. The mediator is generic as it follows the FF-A specification [1], but it only implements a small subset of the specification. =20 [1] https://developer.arm.com/documentation/den0077/latest + +endmenu + diff --git a/xen/arch/arm/tee/Makefile b/xen/arch/arm/tee/Makefile index 58a1015e40e0..1ef49a271fdb 100644 --- a/xen/arch/arm/tee/Makefile +++ b/xen/arch/arm/tee/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_FFA) +=3D ffa.o -obj-y +=3D tee.o +obj-$(CONFIG_TEE) +=3D tee.o obj-$(CONFIG_OPTEE) +=3D optee.o --=20 2.39.2 (Apple Git-143)