From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5B8CC3DA41 for ; Thu, 11 Jul 2024 14:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=osjTBwb7sjSTUn6bIHDswECnPzdqYsftCG4SzCpQzDE=; b=ilbGy4YNcT9J7uowXm1O9FH1yC QpMoqddm8GyCXbt9FHski66BafwjlHeDTyjBtZ1aknora3l7y3EONI71cn3rSo3bXr1HZAXc0yx6X SwpuahAc8gkhrVv4PO7UqGPjGPEYHsOsDup0rTx1n9Sc2XEaDlVHAgSav1OVCMjYmd6cs1vY22RXP jPhYCprLHJ6xGutkc0O3Y68TD5EmlReU7km+Z3O7f7z9EWPaq8fmdAbg3VK829/1S6QJiS6NgW/80 NePlGne033Rn6UUwD5PQl5t2z8upas5FgTMCpBnz1HHyAnSZZTs09ij3AvvgxOOgPml9svDsTF/Cu PjPgg0jg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sRufS-0000000EK9s-0gTv; Thu, 11 Jul 2024 14:21:06 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sRuf9-0000000EK2S-0w9t for linux-arm-kernel@lists.infradead.org; Thu, 11 Jul 2024 14:20:48 +0000 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 C1F14FEC; Thu, 11 Jul 2024 07:21:11 -0700 (PDT) Received: from pluto (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 377EE3F766; Thu, 11 Jul 2024 07:20:44 -0700 (PDT) Date: Thu, 11 Jul 2024 15:20:41 +0100 From: Cristian Marussi To: Peng Fan Cc: Cristian Marussi , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "arm-scmi@vger.kernel.org" , "sudeep.holla@arm.com" , "james.quinlan@broadcom.com" , "f.fainelli@gmail.com" , "vincent.guittot@linaro.org" , "etienne.carriere@st.com" , "Peng Fan (OSS)" , "michal.simek@amd.com" , "quic_sibis@quicinc.com" , "quic_nkela@quicinc.com" , "ptosi@google.com" , "dan.carpenter@linaro.org" , "souvik.chakravarty@arm.com" , Etienne Carriere Subject: Re: [PATCH v2 6/8] firmware: arm_scmi: Make OPTEE transport a standalone driver Message-ID: References: <20240710173153.4060457-1-cristian.marussi@arm.com> <20240710173153.4060457-7-cristian.marussi@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240711_072047_391462_302A4281 X-CRM114-Status: GOOD ( 23.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Jul 11, 2024 at 12:57:46PM +0000, Peng Fan wrote: > > Subject: [PATCH v2 6/8] firmware: arm_scmi: Make OPTEE transport a > > standalone driver > > > > Make SCMI OPTEE transport a standalone driver that can be optionally > > loaded as a module. > > > > CC: Etienne Carriere > > Signed-off-by: Cristian Marussi > > --- > > v1 --> v2 > > - handle platform_driver_register() failures > > --- > > drivers/firmware/arm_scmi/Kconfig | 6 +- > > drivers/firmware/arm_scmi/Makefile | 2 +- > > drivers/firmware/arm_scmi/common.h | 3 - > > drivers/firmware/arm_scmi/driver.c | 3 - > > .../{optee.c => scmi_transport_optee.c} | 91 ++++++++++--------- > > 5 files changed, 52 insertions(+), 53 deletions(-) rename > > drivers/firmware/arm_scmi/{optee.c => scmi_transport_optee.c} (90%) > > > > diff --git a/drivers/firmware/arm_scmi/Kconfig > > b/drivers/firmware/arm_scmi/Kconfig > > index a4d44ef8bf45..def7e3f09356 100644 > > --- a/drivers/firmware/arm_scmi/Kconfig > > +++ b/drivers/firmware/arm_scmi/Kconfig > > @@ -89,8 +89,8 @@ config ARM_SCMI_TRANSPORT_MAILBOX > > will be called scmi_transport_mailbox. > > > > config ARM_SCMI_TRANSPORT_OPTEE > > - bool "SCMI transport based on OP-TEE service" > > - depends on OPTEE=y || OPTEE=ARM_SCMI_PROTOCOL > > + tristate "SCMI transport based on OP-TEE service" > > + depends on OPTEE > > select ARM_SCMI_HAVE_TRANSPORT > > select ARM_SCMI_HAVE_SHMEM > > select ARM_SCMI_HAVE_MSG > > @@ -100,6 +100,8 @@ config ARM_SCMI_TRANSPORT_OPTEE > > > > If you want the ARM SCMI PROTOCOL stack to include > > support for a > > transport based on OP-TEE SCMI service, answer Y. > > + This driver can also be built as a module. If so, the module > > + will be called scmi_transport_optee. > > > > config ARM_SCMI_TRANSPORT_SMC > > tristate "SCMI transport based on SMC" > > diff --git a/drivers/firmware/arm_scmi/Makefile > > b/drivers/firmware/arm_scmi/Makefile > > index 6868a47fa4ab..b04119ce972f 100644 > > --- a/drivers/firmware/arm_scmi/Makefile > > +++ b/drivers/firmware/arm_scmi/Makefile > > @@ -7,13 +7,13 @@ scmi-driver- > > $(CONFIG_ARM_SCMI_RAW_MODE_SUPPORT) += raw_mode.o > > scmi-transport-$(CONFIG_ARM_SCMI_HAVE_SHMEM) = shmem.o > > scmi-transport-$(CONFIG_ARM_SCMI_HAVE_MSG) += msg.o > > scmi-transport-$(CONFIG_ARM_SCMI_TRANSPORT_VIRTIO) += virtio.o > > -scmi-transport-$(CONFIG_ARM_SCMI_TRANSPORT_OPTEE) += optee.o > > scmi-protocols-y := base.o clock.o perf.o power.o reset.o sensors.o > > system.o voltage.o powercap.o scmi-protocols-y += pinctrl.o scmi- > > module-objs := $(scmi-driver-y) $(scmi-protocols-y) $(scmi-transport-y) > > > > obj-$(CONFIG_ARM_SCMI_TRANSPORT_SMC) += > > scmi_transport_smc.o > > obj-$(CONFIG_ARM_SCMI_TRANSPORT_MAILBOX) += > > scmi_transport_mailbox.o > > +obj-$(CONFIG_ARM_SCMI_TRANSPORT_OPTEE) += > > scmi_transport_optee.o > > > > obj-$(CONFIG_ARM_SCMI_PROTOCOL) += scmi-core.o > > obj-$(CONFIG_ARM_SCMI_PROTOCOL) += scmi-module.o diff --git > > a/drivers/firmware/arm_scmi/common.h > > b/drivers/firmware/arm_scmi/common.h > > index edb786cde25c..0ce1d804b3fc 100644 > > --- a/drivers/firmware/arm_scmi/common.h > > +++ b/drivers/firmware/arm_scmi/common.h > > @@ -289,9 +289,6 @@ int > > scmi_xfer_raw_wait_for_message_response(struct scmi_chan_info > > *cinfo, #ifdef CONFIG_ARM_SCMI_TRANSPORT_VIRTIO extern const > > struct scmi_desc scmi_virtio_desc; #endif -#ifdef > > CONFIG_ARM_SCMI_TRANSPORT_OPTEE -extern const struct > > scmi_desc scmi_optee_desc; -#endif > > > > void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr, > > void *priv); > > > > diff --git a/drivers/firmware/arm_scmi/driver.c > > b/drivers/firmware/arm_scmi/driver.c > > index b14c5326930a..67b416c7f2f5 100644 > > --- a/drivers/firmware/arm_scmi/driver.c > > +++ b/drivers/firmware/arm_scmi/driver.c > > @@ -3251,9 +3251,6 @@ ATTRIBUTE_GROUPS(versions); > > > > /* Each compatible listed below must have descriptor associated with > > it */ static const struct of_device_id scmi_of_match[] = { -#ifdef > > CONFIG_ARM_SCMI_TRANSPORT_OPTEE > > - { .compatible = "linaro,scmi-optee", .data = > > &scmi_optee_desc }, > > -#endif > > #ifdef CONFIG_ARM_SCMI_TRANSPORT_VIRTIO > > { .compatible = "arm,scmi-virtio", .data = &scmi_virtio_desc}, > > #endif diff --git a/drivers/firmware/arm_scmi/optee.c > > b/drivers/firmware/arm_scmi/scmi_transport_optee.c > > similarity index 90% > > rename from drivers/firmware/arm_scmi/optee.c rename to > > drivers/firmware/arm_scmi/scmi_transport_optee.c > > index 99f3b0bfb956..7a16c8d3e213 100644 > > --- a/drivers/firmware/arm_scmi/optee.c > > +++ b/drivers/firmware/arm_scmi/scmi_transport_optee.c > > @@ -1,6 +1,6 @@ > > // SPDX-License-Identifier: GPL-2.0 > > /* > > - * Copyright (C) 2019-2021 Linaro Ltd. > > + * Copyright (C) 2019-2024 Linaro Ltd. > > This should be kept unchanged? Not sure, like I said previously, how to go about years. Thanks, Cristian