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 <etienne.carriere@foss.st.com>
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Message-Id: <20240812173340.3912830-8-cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/Kconfig b/drivers/firmware/arm_scmi/Kconfig
index 27de15ad6444f28633285ad878a0f893f22d8e75..b5e3634a839957f9f0f399115bc12518cb2e6ecc 100644 (file)
--- a/drivers/firmware/arm_scmi/Kconfig
+++ b/drivers/firmware/arm_scmi/Kconfig
@@ -71,19 +71,6 @@ config ARM_SCMI_DEBUG_COUNTERS
 
 source "drivers/firmware/arm_scmi/transports/Kconfig"
 
-config ARM_SCMI_TRANSPORT_OPTEE
-       bool "SCMI transport based on OP-TEE service"
-       depends on OPTEE=y || OPTEE=ARM_SCMI_PROTOCOL
-       select ARM_SCMI_HAVE_TRANSPORT
-       select ARM_SCMI_HAVE_SHMEM
-       select ARM_SCMI_HAVE_MSG
-       default y
-       help
-         This enables the OP-TEE service based transport for SCMI.
-
-         If you want the ARM SCMI PROTOCOL stack to include support for a
-         transport based on OP-TEE SCMI service, answer Y.
-
 config ARM_SCMI_TRANSPORT_VIRTIO
        bool "SCMI transport based on VirtIO"
        depends on VIRTIO=y || VIRTIO=ARM_SCMI_PROTOCOL

diff --git a/drivers/firmware/arm_scmi/Makefile b/drivers/firmware/arm_scmi/Makefile
index 4c58c668ecc4c63afa1a2929f4a6e6104502a89a..4b6dcf241ce1739b58f943038f636b9c3cbe7a19 100644 (file)
--- a/drivers/firmware/arm_scmi/Makefile
+++ b/drivers/firmware/arm_scmi/Makefile
@@ -7,7 +7,6 @@ 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)

diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 231b061dadb9ba793b00bca2ffae7cbd7353572b..18026d446b59b8a7754c324c6a65e2fd9be90806 100644 (file)
--- 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 bdb952c385d217ccab8df3c00c535ba06ddb015e..084936e9575dba0882a1e4dff54b773fd6eaba1d 100644 (file)
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -3318,9 +3318,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/transports/Kconfig b/drivers/firmware/arm_scmi/transports/Kconfig
index 85d693811a1cbaf95f1748f5372d949d89f88726..7d478a4f69df4efabadfb51707477edd8fab0a64 100644 (file)
--- a/drivers/firmware/arm_scmi/transports/Kconfig
+++ b/drivers/firmware/arm_scmi/transports/Kconfig
@@ -62,4 +62,19 @@ config ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE
          in atomic context too, at the price of using a number of busy-waiting
          primitives all over instead. If unsure say N.
 
+config ARM_SCMI_TRANSPORT_OPTEE
+       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
+       default y
+       help
+         This enables the OP-TEE service based transport for SCMI.
+
+         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.
+
 endmenu

diff --git a/drivers/firmware/arm_scmi/transports/Makefile b/drivers/firmware/arm_scmi/transports/Makefile
index 080bd76d9dbda44228f0d386c5409921b1a5b824..efc002e7efcdde70a13474cd659068e824f7e627 100644 (file)
--- a/drivers/firmware/arm_scmi/transports/Makefile
+++ b/drivers/firmware/arm_scmi/transports/Makefile
@@ -3,6 +3,8 @@ scmi_transport_mailbox-objs := mailbox.o
 obj-$(CONFIG_ARM_SCMI_TRANSPORT_MAILBOX) += scmi_transport_mailbox.o
 scmi_transport_smc-objs := smc.o
 obj-$(CONFIG_ARM_SCMI_TRANSPORT_SMC) += scmi_transport_smc.o
+scmi_transport_optee-objs := optee.o
+obj-$(CONFIG_ARM_SCMI_TRANSPORT_OPTEE) += scmi_transport_optee.o
 
 ifeq ($(CONFIG_THUMB2_KERNEL)$(CONFIG_CC_IS_CLANG),yy)
 # The use of R7 in the SMCCC conflicts with the compiler's use of R7 as a frame

diff --git a/drivers/firmware/arm_scmi/optee.c b/drivers/firmware/arm_scmi/transports/optee.c
similarity index 91%
rename from drivers/firmware/arm_scmi/optee.c
rename to drivers/firmware/arm_scmi/transports/optee.c
index dae68adf6f9e58cc51d677842ea68a222c525c8f..978750aaf6b7992eb687258df0b8739c265394cc 100644 (file)
--- a/drivers/firmware/arm_scmi/optee.c
+++ b/drivers/firmware/arm_scmi/transports/optee.c
@@ -9,12 +9,13 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/tee_drv.h>
 #include <linux/uuid.h>
 #include <uapi/linux/tee.h>
 
-#include "common.h"
+#include "../common.h"
 
 #define SCMI_OPTEE_MAX_MSG_SIZE                128
 
@@ -148,12 +149,11 @@ struct scmi_optee_agent {
        struct list_head channel_list;
 };
 
+static struct scmi_transport_core_operations *core;
+
 /* There can be only 1 SCMI service in OP-TEE we connect to */
 static struct scmi_optee_agent *scmi_optee_private;
 
-/* Forward reference to scmi_optee transport initialization */
-static int scmi_optee_init(void);
-
 /* Open a session toward SCMI OP-TEE service with REE_KERNEL identity */
 static int open_session(struct scmi_optee_agent *agent, u32 *tee_session)
 {
@@ -312,24 +312,6 @@ static int invoke_process_msg_channel(struct scmi_optee_channel *channel, size_t
        return 0;
 }
 
-static int scmi_optee_link_supplier(struct device *dev)
-{
-       if (!scmi_optee_private) {
-               if (scmi_optee_init())
-                       dev_dbg(dev, "Optee bus not yet ready\n");
-
-               /* Wait for optee bus */
-               return -EPROBE_DEFER;
-       }
-
-       if (!device_link_add(dev, scmi_optee_private->dev, DL_FLAG_AUTOREMOVE_CONSUMER)) {
-               dev_err(dev, "Adding link to supplier optee device failed\n");
-               return -ECANCELED;
-       }
-
-       return 0;
-}
-
 static bool scmi_optee_chan_available(struct device_node *of_node, int idx)
 {
        u32 channel_id;
@@ -343,7 +325,7 @@ static void scmi_optee_clear_channel(struct scmi_chan_info *cinfo)
        struct scmi_optee_channel *channel = cinfo->transport_info;
 
        if (!channel->tee_shm)
-               scmi_shmem_ops.clear_channel(channel->req.shmem);
+               core->shmem->clear_channel(channel->req.shmem);
 }
 
 static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *channel)
@@ -368,7 +350,7 @@ static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *ch
 static int setup_static_shmem(struct device *dev, struct scmi_chan_info *cinfo,
                              struct scmi_optee_channel *channel)
 {
-       channel->req.shmem = scmi_shmem_ops.setup_iomap(cinfo, dev, true, NULL);
+       channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL);
        if (IS_ERR(channel->req.shmem))
                return PTR_ERR(channel->req.shmem);
 
@@ -479,10 +461,11 @@ static int scmi_optee_send_message(struct scmi_chan_info *cinfo,
        mutex_lock(&channel->mu);
 
        if (channel->tee_shm) {
-               scmi_msg_ops.tx_prepare(channel->req.msg, xfer);
-               ret = invoke_process_msg_channel(channel, scmi_msg_ops.command_size(xfer));
+               core->msg->tx_prepare(channel->req.msg, xfer);
+               ret = invoke_process_msg_channel(channel,
+                                                core->msg->command_size(xfer));
        } else {
-               scmi_shmem_ops.tx_prepare(channel->req.shmem, xfer, cinfo);
+               core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo);
                ret = invoke_process_smt_channel(channel);
        }
 
@@ -498,9 +481,10 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo,
        struct scmi_optee_channel *channel = cinfo->transport_info;
 
        if (channel->tee_shm)
-               scmi_msg_ops.fetch_response(channel->req.msg, channel->rx_len, xfer);
+               core->msg->fetch_response(channel->req.msg,
+                                         channel->rx_len, xfer);
        else
-               scmi_shmem_ops.fetch_response(channel->req.shmem, xfer);
+               core->shmem->fetch_response(channel->req.shmem, xfer);
 }
 
 static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret,
@@ -512,7 +496,6 @@ static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret,
 }
 
 static struct scmi_transport_ops scmi_optee_ops = {
-       .link_supplier = scmi_optee_link_supplier,
        .chan_available = scmi_optee_chan_available,
        .chan_setup = scmi_optee_chan_setup,
        .chan_free = scmi_optee_chan_free,
@@ -527,6 +510,22 @@ static int scmi_optee_ctx_match(struct tee_ioctl_version_data *ver, const void *
        return ver->impl_id == TEE_IMPL_ID_OPTEE;
 }
 
+static const struct scmi_desc scmi_optee_desc = {
+       .ops = &scmi_optee_ops,
+       .max_rx_timeout_ms = 30,
+       .max_msg = 20,
+       .max_msg_size = SCMI_OPTEE_MAX_MSG_SIZE,
+       .sync_cmds_completed_on_ret = true,
+};
+
+static const struct of_device_id scmi_of_match[] = {
+       { .compatible = "linaro,scmi-optee" },
+       { /* Sentinel */ },
+};
+
+DEFINE_SCMI_TRANSPORT_DRIVER(scmi_optee, scmi_optee_driver, scmi_optee_desc,
+                            scmi_of_match, core);
+
 static int scmi_optee_service_probe(struct device *dev)
 {
        struct scmi_optee_agent *agent;
@@ -562,6 +561,12 @@ static int scmi_optee_service_probe(struct device *dev)
        smp_mb();
        scmi_optee_private = agent;
 
+       ret = platform_driver_register(&scmi_optee_driver);
+       if (ret) {
+               scmi_optee_private = NULL;
+               goto err;
+       }
+
        return 0;
 
 err:
@@ -577,6 +582,8 @@ static int scmi_optee_service_remove(struct device *dev)
        if (!scmi_optee_private)
                return -EINVAL;
 
+       platform_driver_unregister(&scmi_optee_driver);
+
        if (!list_empty(&scmi_optee_private->channel_list))
                return -EBUSY;
 
@@ -598,7 +605,7 @@ static const struct tee_client_device_id scmi_optee_service_id[] = {
 
 MODULE_DEVICE_TABLE(tee, scmi_optee_service_id);
 
-static struct tee_client_driver scmi_optee_driver = {
+static struct tee_client_driver scmi_optee_service_driver = {
        .id_table       = scmi_optee_service_id,
        .driver         = {
                .name = "scmi-optee",
@@ -608,22 +615,18 @@ static struct tee_client_driver scmi_optee_driver = {
        },
 };
 
-static int scmi_optee_init(void)
+static int __init scmi_transport_optee_init(void)
 {
-       return driver_register(&scmi_optee_driver.driver);
+       return driver_register(&scmi_optee_service_driver.driver);
 }
+module_init(scmi_transport_optee_init);
 
-static void scmi_optee_exit(void)
+static void __exit scmi_transport_optee_exit(void)
 {
-       if (scmi_optee_private)
-               driver_unregister(&scmi_optee_driver.driver);
+       driver_unregister(&scmi_optee_service_driver.driver);
 }
+module_exit(scmi_transport_optee_exit);
 
-const struct scmi_desc scmi_optee_desc = {
-       .transport_exit = scmi_optee_exit,
-       .ops = &scmi_optee_ops,
-       .max_rx_timeout_ms = 30,
-       .max_msg = 20,
-       .max_msg_size = SCMI_OPTEE_MAX_MSG_SIZE,
-       .sync_cmds_completed_on_ret = true,
-};
+MODULE_AUTHOR("Etienne Carriere <etienne.carriere@foss.st.com>");
+MODULE_DESCRIPTION("SCMI OPTEE Transport driver");
+MODULE_LICENSE("GPL");