Add a device tree binding for the TEE-based remote processor control service implemented as an OP-TEE Trusted Application identified by UUID 80a4c275-0a47-4905-8285-1486a9771a08.

Signed-off-by: Arnaud Pouliquen arnaud.pouliquen@foss.st.com --- v21 updates: - rename compatible to exactly match with the TEE UUID - the remoteproc device driver is no more declared as a child, but use phandle as done for the SCMI. - remove linaro,optee-tz bindings update are now useless. --- .../bindings/remoteproc/remoteproc-tee.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/remoteproc/remoteproc-tee.yaml

diff --git a/Documentation/devicetree/bindings/remoteproc/remoteproc-tee.yaml b/Documentation/devicetree/bindings/remoteproc/remoteproc-tee.yaml new file mode 100644 index 000000000000..498a7e590905 --- /dev/null +++ b/Documentation/devicetree/bindings/remoteproc/remoteproc-tee.yaml @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/remoteproc/remoteproc-tee.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TEE Remote Processor Control Service (UUID 80a4c275-0a47-4905-8285-1486a9771a08) + +maintainers: + - Arnaud Pouliquen arnaud.pouliquen@foss.st.com + +description: + Node describing a TEE-based remote processor control service implemented as + a Trusted Application identified by UUID 80a4c275-0a47-4905-8285-1486a9771a08. + + This binding is intended to define the interface for remoteproc services + implemented as TAs running in a TEE, and is used by the a remoteproc driver + to bind to such a service and control a remote processor through it. + +properties: + compatible: + const: 80a4c275-0a47-4905-8285-1486a9771a08 + +required: + - compatible + +additionalProperties: false + +examples: + - | + firmware { + tee_rproc: optee-rproc { + compatible = "80a4c275-0a47-4905-8285-1486a9771a08"; + }; + }; +...

When a resource table is loaded by an external entity such as U-boot or OP-TEE, we do not necessarily get the device address(da) but the physical address(pa). This helper performs similar translation than the rproc_da_to_va() but based on a physical address.

Signed-off-by: Arnaud Pouliquen arnaud.pouliquen@foss.st.com --- V22 updates: - use size_t for offset and remove its comparaison with 0 --- drivers/remoteproc/remoteproc_core.c | 50 ++++++++++++++++++++++++++++ include/linux/remoteproc.h | 1 + 2 files changed, 51 insertions(+)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index b087ed21858a..ec1860e1cfa9 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -225,6 +225,56 @@ void *rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem) } EXPORT_SYMBOL(rproc_da_to_va);

+/** + * rproc_pa_to_va() - lookup the kernel virtual address for a physical address of a remoteproc + * memory + * + * @rproc: handle of a remote processor + * @pa: remoteproc physical address + * @len: length of the memory region @pa is pointing to + * @is_iomem: optional pointer filled in to indicate if @pa is iomapped memory + * + * This function is a helper function similar to rproc_da_to_va() but it deals with physical + * addresses instead of device addresses. + * + * Return: a valid kernel address on success or NULL on failure + */ +void *rproc_pa_to_va(struct rproc *rproc, phys_addr_t pa, size_t len, bool *is_iomem) +{ + struct rproc_mem_entry *carveout; + void *ptr = NULL; + size_t offset; + + list_for_each_entry(carveout, &rproc->carveouts, node) { + /* Verify that carveout is allocated */ + if (!carveout->va) + continue; + + /* try next carveout if pa is too small */ + if (pa < carveout->dma) + continue; + + offset = pa - carveout->dma; + + /* try next carveout if pa is too large */ + if (offset > carveout->len) + continue; + + if (len > carveout->len - offset) + continue; + + ptr = carveout->va + offset; + + if (is_iomem) + *is_iomem = carveout->is_iomem; + + break; + } + + return ptr; +} +EXPORT_SYMBOL(rproc_pa_to_va); + /** * rproc_find_carveout_by_name() - lookup the carveout region by a name * @rproc: handle of a remote processor diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index b4795698d8c2..8fd0d7f63c8e 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -690,6 +690,7 @@ int rproc_detach(struct rproc *rproc); int rproc_set_firmware(struct rproc *rproc, const char *fw_name); void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type); void *rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem); +void *rproc_pa_to_va(struct rproc *rproc, phys_addr_t pa, size_t len, bool *is_iomem);

/* from remoteproc_coredump.c */ void rproc_coredump_cleanup(struct rproc *rproc);

Add a remoteproc TEE (Trusted Execution Environment) driver that will be probed by the TEE bus. If the associated Trusted application is supported on the secure part, this driver offers a client interface to load firmware by the secure part. This firmware could be authenticated by the secure trusted application.

A specificity of the implementation is that the firmware has to be authenticated and optionally decrypted to access the resource table.

Consequently, the boot sequence is:

1) rproc_parse_fw --> rproc_tee_parse_fw remoteproc TEE: - Requests the TEE application to authenticate and load the firmware in the remote processor memories. - Requests the TEE application for the address of the resource table. - Creates a copy of the resource table stored in rproc->cached_table.

2) rproc_load_segments --> rproc_tee_load_fw remoteproc TEE: - Requests the TEE application to load the firmware. Nothing is done at the TEE application as the firmware is already loaded. - In case of recovery, the TEE application has to reload the firmware.

3) rproc_tee_get_loaded_rsc_table remoteproc TEE requests the TEE application for the address of the resource table.

4) rproc_start --> rproc_tee_start - Requests the TEE application to start the remote processor.

The shutdown sequence is:

5) rproc_stop --> rproc_tee_stop - Requests the TEE application to stop the remote processor.

6) rproc_tee_release_fw This function is used to request the TEE application to perform actions to return to the initial state on stop or on error during the boot sequence.

Signed-off-by: Arnaud Pouliquen arnaud.pouliquen@foss.st.com --- Version 22 updates: - Revert to version 19, as the st,stm32-rproc-tee compatible has been rejected. As a consequence, we cannot have a rproc_stm32-tee.c driver and must reuse the rproc_stm32.c driver. - Protect rproc_to_trproc() with lockdep_assert_held().

Version 21 updates: - introduce uuid_to_str() to compute the compatible from the TEE UUID - update rproc_tee_register() to provide phandle referenced in the remoteproc driver client. - use device_link_add() to link the remoteproc driver client.

Version 20 updates: - rework probe. the remoteproc-tee now probe the remoteproc devices defined in device tree as child. - creation of rproc-service-80a4c275-0a47-4905-8285-1486a9771a08 compatible - use of of_find_compatible_node() to find node in DT - use of of_platform_populate() to probe remoteproc devices - remove device_link_add() as now managed by of_platform_populate) - add "auto_boot" parameter in rproc_tee_register() - rename TA_RPROC_FW_CMD_* TEE CMD in TA_RPROC_CMD_* command - use of DEFINE_MUTEX

Version 19 updates: - rework/fix function headers - use memremap instead of ioremap for the resource table. - realign comments to 80 chars limit, with few exceptions for readability - replace spinlock by mutex and and protect APIs from concurrent access - add support of 64-bit address in rproc_tee_get_loaded_rsc_table() - update copyright year

Version 18 updates Fix warning: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing --- drivers/remoteproc/Kconfig | 10 + drivers/remoteproc/Makefile | 1 + drivers/remoteproc/remoteproc_tee.c | 789 ++++++++++++++++++++++++++++ include/linux/remoteproc_tee.h | 98 ++++ 4 files changed, 898 insertions(+) create mode 100644 drivers/remoteproc/remoteproc_tee.c create mode 100644 include/linux/remoteproc_tee.h

diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index ee54436fea5a..87d69f200590 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -23,6 +23,16 @@ config REMOTEPROC_CDEV

It's safe to say N if you don't want to use this interface.

+config REMOTEPROC_TEE + bool "Remoteproc support by a TEE application" + depends on OPTEE + help + Support a remote processor that is managed by an application running in a Trusted + Execution Environment (TEE). This application is responsible for loading the remote + processor firmware image and managing its lifecycle. + + It's safe to say N if the remote processor is not managed by a TEE. + config IMX_REMOTEPROC tristate "i.MX remoteproc support" depends on ARCH_MXC diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile index 1c7598b8475d..a1a5201982d4 100644 --- a/drivers/remoteproc/Makefile +++ b/drivers/remoteproc/Makefile @@ -11,6 +11,7 @@ remoteproc-y += remoteproc_sysfs.o remoteproc-y += remoteproc_virtio.o remoteproc-y += remoteproc_elf_loader.o obj-$(CONFIG_REMOTEPROC_CDEV) += remoteproc_cdev.o +obj-$(CONFIG_REMOTEPROC_TEE) += remoteproc_tee.o obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o obj-$(CONFIG_IMX_DSP_REMOTEPROC) += imx_dsp_rproc.o obj-$(CONFIG_INGENIC_VPU_RPROC) += ingenic_rproc.o diff --git a/drivers/remoteproc/remoteproc_tee.c b/drivers/remoteproc/remoteproc_tee.c new file mode 100644 index 000000000000..b4e01ad84010 --- /dev/null +++ b/drivers/remoteproc/remoteproc_tee.c @@ -0,0 +1,789 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) STMicroelectronics 2025 + * Author: Arnaud Pouliquen arnaud.pouliquen@foss.st.com + */ + +#include <linux/firmware.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/mutex.h> +#include <linux/remoteproc.h> +#include <linux/remoteproc_tee.h> +#include <linux/slab.h> +#include <linux/tee_drv.h> + +#include "remoteproc_internal.h" + +#define MAX_TEE_PARAM_ARRAY_MEMBER 4 + +/* + * Authentication and load of the firmware image in the remote processor + * memories by the TEE. After this step the firmware is installed in destination + * memories, which can then be locked to prevent access by Linux. + * + * [in] params[0].value.a: remote processor identifier + * [in] params[1].memref: buffer containing a temporary copy of the signed + * image to load. + */ +#define TA_RPROC_CMD_LOAD_FW 1 + +/* + * Start the remote processor by the TEE + * + * [in] params[0].value.a: remote processor identifier + */ +#define TA_RPROC_CMD_START 2 + +/* + * Stop the remote processor by the TEE + * + * [in] params[0].value.a: remote processor identifier + */ +#define TA_RPROC_CMD_STOP 3 + +/* + * Return the address of the resource table, or 0 if not found. + * + * [in] params[0].value.a: remote processor identifier + * [out] params[1].value.a: 32bit LSB resource table memory address + * [out] params[1].value.b: 32bit MSB resource table memory address + * [out] params[2].value.a: 32bit LSB resource table memory size + * [out] params[2].value.b: 32bit MSB resource table memory size + */ +#define TA_RPROC_CMD_GET_RSC_TABLE 4 + +/* + * Release remote processor firmware images and associated resources. + * This command should be used in case an error occurs between the loading of + * the firmware images (TA_RPROC_CMD_LOAD_FW) and the starting of the remote + * processor (TA_RPROC_CMD_START) or after stopping the remote processor + * to release associated resources (TA_RPROC_CMD_STOP). + * + * [in] params[0].value.a: remote processor identifier + */ +#define TA_RPROC_CMD_RELEASE_FW 6 + +/** + * struct rproc_tee_context - Global TEE backend context + * @rproc_list: List of registered TEE-backed remoteprocs + * @tee_ctx: TEE context handle + * @dev: TEE client device + */ +struct rproc_tee_context { + struct list_head rproc_list; + struct tee_context *tee_ctx; + struct device *dev; +}; + +/** + * struct rproc_tee - TEE remoteproc structure + * @node: Reference in global list + * @rproc: Remoteproc reference + * @rproc_id: remote processor identifier + * @session_id: TEE session identifier + */ +struct rproc_tee { + struct list_head node; + struct rproc *rproc; + u32 rproc_id; + u32 session_id; +}; + +static struct rproc_tee_context rproc_tee_ctx; +static DEFINE_MUTEX(ctx_lock); /* Protects concurrent manipulations of the rproc_tee_ctx*/ + +static struct rproc_tee *rproc_to_trproc(struct rproc *rproc) +{ + struct rproc_tee *trproc; + + lockdep_assert_held(&ctx_lock); + + list_for_each_entry(trproc, &rproc_tee_ctx.rproc_list, node) { + if (trproc->rproc == rproc) + return trproc; + } + + return NULL; +} + +static void rproc_tee_prepare_args(struct rproc_tee *trproc, int cmd, + struct tee_ioctl_invoke_arg *arg, + struct tee_param *param, + unsigned int num_params) +{ + memset(arg, 0, sizeof(*arg)); + memset(param, 0, MAX_TEE_PARAM_ARRAY_MEMBER * sizeof(*param)); + + arg->func = cmd; + arg->session = trproc->session_id; + arg->num_params = num_params + 1; + + param[0] = (struct tee_param) { + .attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT, + .u.value.a = trproc->rproc_id, + }; +} + +static int rproc_tee_sanity_check(struct device_node *tee_np) +{ + /* Backend not probed yet */ + if (!rproc_tee_ctx.dev || !rproc_tee_ctx.dev->of_node) + return -EPROBE_DEFER; + + /* DT error: phandle points to different node than the backend we use */ + if (tee_np != rproc_tee_ctx.dev->of_node) + return -EINVAL; + + return 0; +} + +/** + * rproc_tee_release_fw() - Release the firmware for a TEE-based remote processor + * @rproc: Pointer to the struct rproc representing the remote processor + * + * This function invokes the TA_RPROC_CMD_RELEASE_FW TEE client function to + * release the firmware. It should only be called when the remoteproc state is + * RPROC_OFFLINE or RPROC_DETACHED. The function requests the TEE remoteproc + * application to release the firmware loaded by rproc_tee_load_fw(). + * The request is ignored if the rproc state is RPROC_DETACHED as the remote + * processor is still running. + */ +void rproc_tee_release_fw(struct rproc *rproc) +{ + struct tee_param param[MAX_TEE_PARAM_ARRAY_MEMBER]; + struct rproc_tee *trproc; + struct tee_ioctl_invoke_arg arg; + int ret; + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return; + + if (!rproc_tee_ctx.dev) + goto out; + + trproc = rproc_to_trproc(rproc); + if (!trproc) + goto out; + + /* + * If the remote processor state is RPROC_DETACHED, just ignore the + * request, as the remote processor is still running. + */ + if (rproc->state == RPROC_DETACHED) + goto out; + + if (rproc->state != RPROC_OFFLINE) { + dev_err(rproc_tee_ctx.dev, "unexpected rproc state: %d\n", rproc->state); + goto out; + } + + rproc_tee_prepare_args(trproc, TA_RPROC_CMD_RELEASE_FW, &arg, param, 0); + + ret = tee_client_invoke_func(rproc_tee_ctx.tee_ctx, &arg, param); + if (ret < 0 || arg.ret != 0) { + dev_err(rproc_tee_ctx.dev, + "TA_RPROC_CMD_RELEASE_FW invoke failed TEE err: %#x, ret:%d\n", + arg.ret, ret); + } + +out: + mutex_unlock(&ctx_lock); +} +EXPORT_SYMBOL_GPL(rproc_tee_release_fw); + +/** + * rproc_tee_load_fw() - Load firmware from TEE application + * @rproc: Pointer to the struct rproc representing the remote processor + * @fw: Pointer to the firmware structure containing the firmware data and size + * + * This function invokes the TA_RPROC_CMD_LOAD_FW TEE client function to load + * the firmware. It registers the fw->data as a shared memory region with the + * TEE, and request the TEE to load the firmware. This function can be called + * twice during the remote processor boot, a first by rproc_tee_parse_fw() to + * parse the resource table , and a second time by rproc_tee_load_fw(). + * The TEE application should ignores the command if the firmware + * is already loaded by rproc_tee_parse_fw(). + * + * Return: 0 on success, or an error code on failure + */ +int rproc_tee_load_fw(struct rproc *rproc, const struct firmware *fw) +{ + struct tee_param param[MAX_TEE_PARAM_ARRAY_MEMBER]; + struct rproc_tee *trproc; + struct tee_ioctl_invoke_arg arg; + struct tee_shm *fw_shm; + int ret; + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return ret; + + if (!rproc_tee_ctx.dev) { + ret = -ENODEV; + goto out; + } + + trproc = rproc_to_trproc(rproc); + if (!trproc) { + ret = -EINVAL; + goto out; + } + + fw_shm = tee_shm_register_kernel_buf(rproc_tee_ctx.tee_ctx, (void *)fw->data, fw->size); + if (IS_ERR(fw_shm)) { + ret = PTR_ERR(fw_shm); + goto out; + } + + rproc_tee_prepare_args(trproc, TA_RPROC_CMD_LOAD_FW, &arg, param, 1); + + /* Provide the address of the firmware image */ + param[1] = (struct tee_param) { + .attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT, + .u.memref = { + .shm = fw_shm, + .size = fw->size, + .shm_offs = 0, + }, + }; + + ret = tee_client_invoke_func(rproc_tee_ctx.tee_ctx, &arg, param); + if (ret < 0 || arg.ret != 0) { + dev_err(rproc_tee_ctx.dev, + "TA_RPROC_CMD_LOAD_FW invoke failed TEE err: %#x, ret:%d\n", + arg.ret, ret); + if (!ret) + ret = -EIO; + } + + tee_shm_free(fw_shm); + +out: + mutex_unlock(&ctx_lock); + return ret; +} +EXPORT_SYMBOL_GPL(rproc_tee_load_fw); + +static int rproc_tee_get_loaded_rsc_table(struct rproc *rproc, phys_addr_t *rsc_pa, + size_t *table_sz) +{ + struct tee_param param[MAX_TEE_PARAM_ARRAY_MEMBER]; + struct rproc_tee *trproc; + struct tee_ioctl_invoke_arg arg; + int ret; + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return ret; + + if (!rproc_tee_ctx.dev) { + ret = -ENODEV; + goto out; + } + + trproc = rproc_to_trproc(rproc); + if (!trproc) { + ret = -EINVAL; + goto out; + } + + rproc_tee_prepare_args(trproc, TA_RPROC_CMD_GET_RSC_TABLE, &arg, param, 2); + + param[1].attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT; + param[2].attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT; + + ret = tee_client_invoke_func(rproc_tee_ctx.tee_ctx, &arg, param); + if (ret < 0 || arg.ret != 0) { + dev_err(rproc_tee_ctx.dev, + "TA_RPROC_CMD_GET_RSC_TABLE invoke failed TEE err: %#x, ret:%d\n", + arg.ret, ret); + ret = -EIO; + goto out; + } + + *table_sz = param[2].u.value.a; + if (sizeof(phys_addr_t) == sizeof(u64)) + *table_sz |= param[2].u.value.b << 32; + + if (*table_sz) { + *rsc_pa = param[1].u.value.a; + if (sizeof(phys_addr_t) == sizeof(u64)) + *rsc_pa |= param[1].u.value.b << 32; + } else { + *rsc_pa = 0; + } + +out: + mutex_unlock(&ctx_lock); + return ret; +} + +/** + * rproc_tee_parse_fw() - Get the resource table from TEE application + * @rproc: Pointer to the struct rproc representing the remote processor + * @fw: Pointer to the firmware structure containing the firmware data and size + * + * This function retrieves the loaded resource table and creates a cached_table + * copy. Since the firmware image is signed and potentially encrypted, the + * firmware must be loaded first to access the loaded resource table. + * + * Return: 0 on success, or an error code on failure + */ +int rproc_tee_parse_fw(struct rproc *rproc, const struct firmware *fw) +{ + phys_addr_t rsc_table; + void *rsc_va; + size_t table_sz; + int ret; + + if (!rproc) + return -EINVAL; + + /* We need first to Load the firmware, to be able to get the resource table. */ + ret = rproc_tee_load_fw(rproc, fw); + if (ret) + return ret; + + ret = rproc_tee_get_loaded_rsc_table(rproc, &rsc_table, &table_sz); + if (ret) + goto release_fw; + + /* A missing resource table is valid for some firmware images. */ + if (!table_sz) { + rproc->table_ptr = NULL; + rproc->table_sz = 0; + return 0; + } + + /* + * We assume here that the memory mapping is the same between the TEE + * and Linux kernel contexts. Else a new TEE remoteproc service could be + * needed to get a copy of the resource table. + */ + rsc_va = memremap(rsc_table, table_sz, MEMREMAP_WC); + if (!rsc_va) { + dev_err(rproc_tee_ctx.dev, "Unable to map memory region: %pa+%zx\n", + &rsc_table, table_sz); + ret = -ENOMEM; + goto release_fw; + } + + /* + * Create a copy of the resource table to have the same behavior as the + * ELF loader. This cached table will be used by the remoteproc core + * after the remoteproc stops to free resources and for crash recovery + * to reapply the settings. + * The cached table will be freed by the remoteproc core. + */ + rproc->cached_table = kmemdup(rsc_va, table_sz, GFP_KERNEL); + memunmap(rsc_va); + + if (!rproc->cached_table) { + ret = -ENOMEM; + goto release_fw; + } + + rproc->table_ptr = rproc->cached_table; + rproc->table_sz = table_sz; + + return 0; + +release_fw: + rproc_tee_release_fw(rproc); + return ret; +} +EXPORT_SYMBOL_GPL(rproc_tee_parse_fw); + +/** + * rproc_tee_find_loaded_rsc_table() - Find the loaded resource table loaded by + * the TEE application + * @rproc: Pointer to the struct rproc representing the remote processor + * @fw: Pointer to the firmware structure containing the firmware data and size + * + * This function retrieves the physical address and size of the resource table + * loaded by the TEE application. + * + * Return: pointer to the resource table if found, or NULL if not found or size + * is 0 + */ +struct resource_table *rproc_tee_find_loaded_rsc_table(struct rproc *rproc, + const struct firmware *fw) +{ + phys_addr_t rsc_table; + size_t table_sz; + int ret; + + ret = rproc_tee_get_loaded_rsc_table(rproc, &rsc_table, &table_sz); + if (ret) + return NULL; + + rproc->table_sz = table_sz; + if (!table_sz) + return NULL; + + /* + * At this step the memory area that contains the resource table should + * have been registered by the remote proc platform driver and allocated + * by rproc_alloc_registered_carveouts(). + */ + return rproc_pa_to_va(rproc, rsc_table, table_sz, NULL); +} +EXPORT_SYMBOL_GPL(rproc_tee_find_loaded_rsc_table); + +/** + * rproc_tee_start() - Request the TEE application to start the remote processor + * @rproc: Pointer to the struct rproc representing the remote processor + * + * This function invokes the TA_RPROC_CMD_START command to start the remote + * processor. + * + * Return: Returns 0 on success, -EINVAL or -EIO on failure + */ +int rproc_tee_start(struct rproc *rproc) +{ + struct tee_param param[MAX_TEE_PARAM_ARRAY_MEMBER]; + struct rproc_tee *trproc; + struct tee_ioctl_invoke_arg arg; + int ret; + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return ret; + + if (!rproc_tee_ctx.dev) { + ret = -ENODEV; + goto out; + } + + trproc = rproc_to_trproc(rproc); + if (!trproc) { + ret = -EINVAL; + goto out; + } + + rproc_tee_prepare_args(trproc, TA_RPROC_CMD_START, &arg, param, 0); + + ret = tee_client_invoke_func(rproc_tee_ctx.tee_ctx, &arg, param); + if (ret < 0 || arg.ret != 0) { + dev_err(rproc_tee_ctx.dev, + "TA_RPROC_CMD_START invoke failed TEE err: %#x, ret:%d\n", arg.ret, ret); + if (!ret) + ret = -EIO; + } + +out: + mutex_unlock(&ctx_lock); + return ret; +} +EXPORT_SYMBOL_GPL(rproc_tee_start); + +/** + * rproc_tee_stop() - Request the TEE application to start the remote processor + * @rproc: Pointer to the struct rproc representing the remote processor + * + * This function invokes the TA_RPROC_CMD_STOP command to stop the remote + * processor. + * + * Return: Returns 0 on success, -EINVAL or -EIO on failure + */ +int rproc_tee_stop(struct rproc *rproc) +{ + struct tee_param param[MAX_TEE_PARAM_ARRAY_MEMBER]; + struct rproc_tee *trproc; + struct tee_ioctl_invoke_arg arg; + int ret; + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return ret; + + if (!rproc_tee_ctx.dev) { + ret = -ENODEV; + goto out; + } + + trproc = rproc_to_trproc(rproc); + if (!trproc) { + ret = -EINVAL; + goto out; + } + + rproc_tee_prepare_args(trproc, TA_RPROC_CMD_STOP, &arg, param, 0); + + ret = tee_client_invoke_func(rproc_tee_ctx.tee_ctx, &arg, param); + if (ret < 0 || arg.ret != 0) { + dev_err(rproc_tee_ctx.dev, + "TA_RPROC_CMD_STOP invoke failed TEE err: %#x, ret:%d\n", arg.ret, ret); + if (!ret) + ret = -EIO; + } + +out: + mutex_unlock(&ctx_lock); + return ret; +} +EXPORT_SYMBOL_GPL(rproc_tee_stop); + +/** + * rproc_tee_register() - Register a remote processor controlled by the TEE application + * @dev: client rproc device + * @rproc: out pointer to the struct rproc representing the remote processor + * @tee_phandle: backend phandle args (np + 1 cell: rproc_id) + * + * The phandle must point to the same DT node that rproc_tee_probe() attached + * to the TEE client device. + * + * Returns 0 on success or a negative error code. + */ +int rproc_tee_register(struct device *dev, struct rproc *rproc, + const struct of_phandle_args *tee_phandle) +{ + struct tee_param param[MAX_TEE_PARAM_ARRAY_MEMBER]; + unsigned int rproc_id; + struct device_node *tee_np; + struct tee_ioctl_open_session_arg sess_arg; + struct tee_client_device *tee_device; + struct device_link *link; + struct rproc_tee *trproc; + int ret; + + if (!tee_phandle || !tee_phandle->np || tee_phandle->args_count < 1) + return -EINVAL; + + rproc_id = tee_phandle->args[0]; + tee_np = tee_phandle->np; + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return ret; + + ret = rproc_tee_sanity_check(tee_np); + if (ret) + goto out; + + trproc = kzalloc_obj(*trproc); + if (!trproc) { + ret = -ENOMEM; + goto out; + } + + tee_device = to_tee_client_device(rproc_tee_ctx.dev); + memset(&sess_arg, 0, sizeof(sess_arg)); + memcpy(sess_arg.uuid, tee_device->id.uuid.b, TEE_IOCTL_UUID_LEN); + + sess_arg.clnt_login = TEE_IOCTL_LOGIN_REE_KERNEL; + sess_arg.num_params = 1; + + param[0] = (struct tee_param) { + .attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT, + .u.value.a = rproc_id, + }; + + ret = tee_client_open_session(rproc_tee_ctx.tee_ctx, &sess_arg, param); + if (ret < 0 || sess_arg.ret != 0) { + dev_err(dev, "tee_client_open_session failed, err: %#x\n", + sess_arg.ret); + ret = -EINVAL; + goto free_trproc; + } + + trproc->rproc_id = rproc_id; + trproc->session_id = sess_arg.session; + + ret = rproc_add(rproc); + if (ret) + goto close_tee; + + trproc->rproc = rproc; + /* Create device link between the rproc device and the TEE device */ + link = device_link_add(dev, rproc_tee_ctx.dev, + DL_FLAG_AUTOREMOVE_CONSUMER); + if (!link) { + ret = -ENOMEM; + goto del_rproc; + } + + list_add_rcu(&trproc->node, &rproc_tee_ctx.rproc_list); + + mutex_unlock(&ctx_lock); + + return 0; + +del_rproc: + rproc_del(rproc); +close_tee: + if (tee_client_close_session(rproc_tee_ctx.tee_ctx, trproc->session_id)) + dev_err(rproc_tee_ctx.dev, + "tee_client_close_session failed\n"); +free_trproc: + kfree(trproc); +out: + mutex_unlock(&ctx_lock); + return ret; +} +EXPORT_SYMBOL_GPL(rproc_tee_register); + +/** + * rproc_tee_unregister - Unregister a remote processor controlled by the TEE + * application. + * @dev: Pointer to client rproc device + * @rproc: Pointer to the struct rproc representing the remote processor + * + * This function unregisters a remote processor previously registered by the + * rproc_tee_register() function. + * + * Return: Returns 0 on success, or an error code on failure + */ +int rproc_tee_unregister(struct device *dev, struct rproc *rproc) +{ + struct rproc_tee *trproc; + int ret; + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return ret; + + if (!rproc_tee_ctx.dev) { + ret = -ENODEV; + goto out_unlock; + } + + trproc = rproc_to_trproc(rproc); + if (!trproc) { + ret = -EINVAL; + goto out_unlock; + } + + /* + * Unlock ctx_lock before calling rproc_del(), + * they may call into rproc core and take other locks to stop the + * remote processor, if it is running. + */ + mutex_unlock(&ctx_lock); + + rproc_del(rproc); + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return ret; + + ret = tee_client_close_session(rproc_tee_ctx.tee_ctx, + trproc->session_id); + if (ret < 0) + dev_err(rproc_tee_ctx.dev, + "tee_client_close_session failed, err: %#x\n", ret); + + list_del(&trproc->node); + kfree(trproc); + +out_unlock: + mutex_unlock(&ctx_lock); + return ret; +} +EXPORT_SYMBOL_GPL(rproc_tee_unregister); + +static int rproc_tee_ctx_match(struct tee_ioctl_version_data *ver, + const void *data) +{ + /* Today we support only OP-TEE; could be extended to other TEEs */ + return ver->impl_id == TEE_IMPL_ID_OPTEE; +} + +static const struct tee_client_device_id rproc_tee_id_table[] = { + {UUID_INIT(0x80a4c275, 0x0a47, 0x4905, 0x82, 0x85, 0x14, 0x86, 0xa9, 0x77, 0x1a, 0x08)}, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(tee, rproc_tee_id_table); + +static void uuid_to_str(const struct tee_client_device_id *id, char *uuid_str) +{ + snprintf(uuid_str, UUID_STRING_LEN + 1, + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + id->uuid.b[0], id->uuid.b[1], id->uuid.b[2], id->uuid.b[3], + id->uuid.b[4], id->uuid.b[5], id->uuid.b[6], id->uuid.b[7], + id->uuid.b[8], id->uuid.b[9], id->uuid.b[10], id->uuid.b[11], + id->uuid.b[12], id->uuid.b[13], id->uuid.b[14], id->uuid.b[15]); +} + +static int rproc_tee_probe(struct tee_client_device *tee_dev) +{ + struct device *dev = &tee_dev->dev; + struct tee_context *tee_ctx; + struct device_node *np; + char uuid_str[UUID_STRING_LEN + 1]; + int ret; + + uuid_to_str(&rproc_tee_id_table[0], uuid_str); + np = of_find_compatible_node(NULL, NULL, uuid_str); + if (!np) { + dev_err(dev, "Device node not found for UUID: %s\n", uuid_str); + return -ENODEV; + } + + /* Open context with TEE driver */ + tee_ctx = tee_client_open_context(NULL, rproc_tee_ctx_match, NULL, NULL); + if (IS_ERR(tee_ctx)) { + ret = PTR_ERR(tee_ctx); + goto put_node; + } + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + goto close_ctx; + + INIT_LIST_HEAD(&rproc_tee_ctx.rproc_list); + + ret = device_add_of_node(dev, np); + + if (ret) { + mutex_unlock(&ctx_lock); + goto close_ctx; + } + rproc_tee_ctx.dev = dev; + rproc_tee_ctx.tee_ctx = tee_ctx; + + mutex_unlock(&ctx_lock); + of_node_put(np); + + return 0; + +close_ctx: + tee_client_close_context(tee_ctx); +put_node: + of_node_put(np); + return ret; +} + +static void rproc_tee_remove(struct tee_client_device *tee_dev) +{ + struct device *dev = &tee_dev->dev; + int ret; + + ret = mutex_lock_interruptible(&ctx_lock); + if (ret) + return; + + rproc_tee_ctx.dev = NULL; + mutex_unlock(&ctx_lock); + device_remove_of_node(dev); + + tee_client_close_context(rproc_tee_ctx.tee_ctx); + rproc_tee_ctx.tee_ctx = NULL; +} + +static struct tee_client_driver rproc_tee_fw_driver = { + .id_table = rproc_tee_id_table, + .probe = rproc_tee_probe, + .remove = rproc_tee_remove, + .driver = { + .name = KBUILD_MODNAME, + }, +}; + +module_tee_client_driver(rproc_tee_fw_driver); + +MODULE_DESCRIPTION("remote processor TEE module"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/remoteproc_tee.h b/include/linux/remoteproc_tee.h new file mode 100644 index 000000000000..8cf805f3b65e --- /dev/null +++ b/include/linux/remoteproc_tee.h @@ -0,0 +1,98 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright(c) 2025 STMicroelectronics + */ + +#ifndef REMOTEPROC_TEE_H +#define REMOTEPROC_TEE_H + +#include <linux/tee_drv.h> +#include <linux/firmware.h> +#include <linux/remoteproc.h> + +#if IS_ENABLED(CONFIG_REMOTEPROC_TEE) + +int rproc_tee_register(struct device *dev, struct rproc *rproc, + const struct of_phandle_args *tee_phandle); +int rproc_tee_unregister(struct device *dev, struct rproc *rproc); +int rproc_tee_parse_fw(struct rproc *rproc, const struct firmware *fw); +int rproc_tee_load_fw(struct rproc *rproc, const struct firmware *fw); +void rproc_tee_release_fw(struct rproc *rproc); +struct resource_table *rproc_tee_find_loaded_rsc_table(struct rproc *rproc, + const struct firmware *fw); +int rproc_tee_start(struct rproc *rproc); +int rproc_tee_stop(struct rproc *rproc); +int rproc_tee_pa_to_da(struct rproc *rproc, phys_addr_t pa, size_t size, u64 *da); +#else + +static inline int rproc_tee_register(struct device *dev, struct rproc *rproc, + const struct of_phandle_args *tee_phandle) +{ + return -ENODEV; +} + +static inline int rproc_tee_parse_fw(struct rproc *rproc, const struct firmware *fw) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return 0; +} + +static inline int rproc_tee_unregister(struct device *dev, struct rproc *rproc) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return 0; +} + +static inline int rproc_tee_load_fw(struct rproc *rproc, const struct firmware *fw) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return 0; +} + +static inline int rproc_tee_start(struct rproc *rproc) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return 0; +} + +static inline int rproc_tee_stop(struct rproc *rproc) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return 0; +} + +static inline int rproc_tee_pa_to_da(struct rproc *rproc, phys_addr_t pa, + size_t size, u64 *da) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return -EINVAL; +} + +static inline void rproc_tee_release_fw(struct rproc *rproc) +{ + /* This shouldn't be possible */ + WARN_ON(1); +} + +static inline struct resource_table * +rproc_tee_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return NULL; +} +#endif /* CONFIG_REMOTEPROC_TEE */ +#endif /* REMOTEPROC_TEE_H */

Integrate OP-TEE-controlled firmware loading into stm32_rproc adding support for the st,rproc-tee devicetree property.

When st,rproc-tee is present, the driver: - parses the backend phandle + ID from DT and validates it - uses the remoteproc_tee operation set and registration path - keeps reset/holdboot handling only for the non-TEE case - uses a TEE-specific flow.

Notice that the attach/detach is not yet supported and should be part of a separate patchset.

Signed-off-by: Arnaud Pouliquen arnaud.pouliquen@foss.st.com --- V21 updates: - reapply the V19 patch as the stm32_rproc-tee driver can no more be used. - update v19 patch to support the st,rproc-tee phandle. - rework the commit message. --- drivers/remoteproc/stm32_rproc.c | 167 +++++++++++++++++++++++-------- 1 file changed, 123 insertions(+), 44 deletions(-)

diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c index 4bcd6a784935..61d89f3a78b1 100644 --- a/drivers/remoteproc/stm32_rproc.c +++ b/drivers/remoteproc/stm32_rproc.c @@ -18,6 +18,7 @@ #include <linux/pm_wakeirq.h> #include <linux/regmap.h> #include <linux/remoteproc.h> +#include <linux/remoteproc_tee.h> #include <linux/reset.h> #include <linux/slab.h> #include <linux/workqueue.h> @@ -89,6 +90,7 @@ struct stm32_rproc { struct stm32_rproc_mem *rmems; struct stm32_mbox mb[MBOX_NB_MBX]; struct workqueue_struct *workqueue; + struct of_phandle_args tee_phandle; bool hold_boot_smc; void __iomem *rsc_va; }; @@ -255,6 +257,19 @@ static int stm32_rproc_release(struct rproc *rproc) return 0; }

+static int stm32_rproc_tee_stop(struct rproc *rproc) +{ + int err; + + stm32_rproc_request_shutdown(rproc); + + err = rproc_tee_stop(rproc); + if (err) + return err; + + return stm32_rproc_release(rproc); +} + static int stm32_rproc_prepare(struct rproc *rproc) { struct device *dev = rproc->dev.parent; @@ -683,6 +698,17 @@ static const struct rproc_ops st_rproc_ops = { .get_boot_addr = rproc_elf_get_boot_addr, };

+static const struct rproc_ops st_rproc_tee_ops = { + .prepare = stm32_rproc_prepare, + .start = rproc_tee_start, + .stop = stm32_rproc_tee_stop, + .kick = stm32_rproc_kick, + .load = rproc_tee_load_fw, + .parse_fw = rproc_tee_parse_fw, + .find_loaded_rsc_table = rproc_tee_find_loaded_rsc_table, + .release_fw = rproc_tee_release_fw, +}; + static const struct of_device_id stm32_rproc_match[] = { { .compatible = "st,stm32mp1-m4" }, {}, @@ -716,6 +742,7 @@ static int stm32_rproc_parse_dt(struct platform_device *pdev, { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; + struct of_phandle_args tee_phandle; struct stm32_syscon tz; unsigned int tzen; int err, irq; @@ -741,51 +768,69 @@ static int stm32_rproc_parse_dt(struct platform_device *pdev, dev_info(dev, "wdg irq registered\n"); }

- ddata->rst = devm_reset_control_get_optional(dev, "mcu_rst"); - if (!ddata->rst) { - /* Try legacy fallback method: get it by index */ - ddata->rst = devm_reset_control_get_by_index(dev, 0); + if (of_find_property(np, "st,rproc-tee", NULL)) { + err = of_parse_phandle_with_fixed_args(np, "st,rproc-tee", + 1, 0, &tee_phandle); + if (err) + return dev_err_probe(dev, err, + "failed to parse st,rproc-tee\n"); + + if (!IS_ENABLED(CONFIG_REMOTEPROC_TEE)) { + of_node_put(tee_phandle.np); + return dev_err_probe(dev, -ENODEV, + "st,rproc-tee requires REMOTEPROC_TEE support\n"); + } + + ddata->tee_phandle = tee_phandle; } - if (IS_ERR(ddata->rst)) - return dev_err_probe(dev, PTR_ERR(ddata->rst), - "failed to get mcu_reset\n");

- /* - * Three ways to manage the hold boot - * - using SCMI: the hold boot is managed as a reset - * The DT "reset-mames" property should be defined with 2 items: - * reset-names = "mcu_rst", "hold_boot"; - * - using SMC call (deprecated): use SMC reset interface - * The DT "reset-mames" property is optional, "st,syscfg-tz" is required - * - default(no SCMI, no SMC): the hold boot is managed as a syscon register - * The DT "reset-mames" property is optional, "st,syscfg-holdboot" is required - */ + if (!ddata->tee_phandle.np) { + ddata->rst = devm_reset_control_get_optional(dev, "mcu_rst"); + if (!ddata->rst) { + /* Try legacy fallback method: get it by index */ + ddata->rst = devm_reset_control_get_by_index(dev, 0); + } + if (IS_ERR(ddata->rst)) + return dev_err_probe(dev, PTR_ERR(ddata->rst), + "failed to get mcu_reset\n");

- ddata->hold_boot_rst = devm_reset_control_get_optional(dev, "hold_boot"); - if (IS_ERR(ddata->hold_boot_rst)) - return dev_err_probe(dev, PTR_ERR(ddata->hold_boot_rst), - "failed to get hold_boot reset\n"); + /* + * Three ways to manage the hold boot + * - using SCMI: the hold boot is managed as a reset + * The DT "reset-mames" property should be defined with 2 items: + * reset-names = "mcu_rst", "hold_boot"; + * - using SMC call (deprecated): use SMC reset interface + * The DT "reset-mames" property is optional, "st,syscfg-tz" is required + * - default(no SCMI, no SMC): the hold boot is managed as a syscon register + * The DT "reset-mames" property is optional, "st,syscfg-holdboot" is required + */

- if (!ddata->hold_boot_rst && IS_ENABLED(CONFIG_HAVE_ARM_SMCCC)) { - /* Manage the MCU_BOOT using SMC call */ - err = stm32_rproc_get_syscon(np, "st,syscfg-tz", &tz); - if (!err) { - err = regmap_read(tz.map, tz.reg, &tzen); - if (err) { - dev_err(dev, "failed to read tzen\n"); - return err; + ddata->hold_boot_rst = devm_reset_control_get_optional(dev, "hold_boot"); + if (IS_ERR(ddata->hold_boot_rst)) + return dev_err_probe(dev, PTR_ERR(ddata->hold_boot_rst), + "failed to get hold_boot reset\n"); + + if (!ddata->hold_boot_rst && IS_ENABLED(CONFIG_HAVE_ARM_SMCCC)) { + /* Manage the MCU_BOOT using SMC call */ + err = stm32_rproc_get_syscon(np, "st,syscfg-tz", &tz); + if (!err) { + err = regmap_read(tz.map, tz.reg, &tzen); + if (err) { + dev_err(dev, "failed to read tzen\n"); + return err; + } + ddata->hold_boot_smc = tzen & tz.mask; } - ddata->hold_boot_smc = tzen & tz.mask; } - }

- if (!ddata->hold_boot_rst && !ddata->hold_boot_smc) { - /* Default: hold boot manage it through the syscon controller */ - err = stm32_rproc_get_syscon(np, "st,syscfg-holdboot", - &ddata->hold_boot); - if (err) { - dev_err(dev, "failed to get hold boot\n"); - return err; + if (!ddata->hold_boot_rst && !ddata->hold_boot_smc) { + /* Default: hold boot manage it through the syscon controller */ + err = stm32_rproc_get_syscon(np, "st,syscfg-holdboot", + &ddata->hold_boot); + if (err) { + dev_err(dev, "failed to get hold boot\n"); + return err; + } } }

@@ -857,18 +902,31 @@ static int stm32_rproc_probe(struct platform_device *pdev) if (ret < 0 && ret != -EINVAL) return ret;

- rproc = devm_rproc_alloc(dev, np->name, &st_rproc_ops, fw_name, sizeof(*ddata)); + if (of_find_property(np, "st,rproc-tee", NULL)) + rproc = devm_rproc_alloc(dev, np->name, &st_rproc_tee_ops, fw_name, + sizeof(*ddata)); + else + rproc = devm_rproc_alloc(dev, np->name, &st_rproc_ops, fw_name, + sizeof(*ddata)); + if (!rproc) return -ENOMEM;

ddata = rproc->priv; - rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);

ret = stm32_rproc_parse_dt(pdev, ddata, &rproc->auto_boot); if (ret) goto free_rproc;

+ if (ddata->tee_phandle.np && + !of_device_is_available(ddata->tee_phandle.np)) { + of_node_put(ddata->tee_phandle.np); + ddata->tee_phandle.np = NULL; + ret = -EPROBE_DEFER; + goto free_rproc; + } + ret = stm32_rproc_of_memory_translations(pdev, ddata); if (ret) goto free_rproc; @@ -877,8 +935,14 @@ static int stm32_rproc_probe(struct platform_device *pdev) if (ret) goto free_rproc;

- if (state == M4_STATE_CRUN) + if (state == M4_STATE_CRUN) { + if (ddata->tee_phandle.np) { + dev_err(dev, "TEE support not yet compatible with attached state\n"); + ret = -EINVAL; + goto free_rproc; + } rproc->state = RPROC_DETACHED; + }

rproc->has_iommu = false; ddata->workqueue = create_workqueue(dev_name(dev)); @@ -894,10 +958,12 @@ static int stm32_rproc_probe(struct platform_device *pdev) if (ret) goto free_wkq;

- ret = rproc_add(rproc); + if (ddata->tee_phandle.np) + ret = rproc_tee_register(dev, rproc, &ddata->tee_phandle); + else + ret = rproc_add(rproc); if (ret) goto free_mb; - return 0;

free_mb: @@ -911,6 +977,11 @@ static int stm32_rproc_probe(struct platform_device *pdev) dev_pm_clear_wake_irq(dev); device_init_wakeup(dev, false); } + if (ddata->tee_phandle.np) { + of_node_put(ddata->tee_phandle.np); + ddata->tee_phandle.np = NULL; + } + return ret; }

@@ -919,11 +990,11 @@ static void stm32_rproc_remove(struct platform_device *pdev) struct rproc *rproc = platform_get_drvdata(pdev); struct stm32_rproc *ddata = rproc->priv; struct device *dev = &pdev->dev; + struct device_node *tee_np = ddata->tee_phandle.np;

if (atomic_read(&rproc->power) > 0) rproc_shutdown(rproc);

- rproc_del(rproc); stm32_rproc_free_mbox(rproc); destroy_workqueue(ddata->workqueue);

@@ -931,6 +1002,14 @@ static void stm32_rproc_remove(struct platform_device *pdev) dev_pm_clear_wake_irq(dev); device_init_wakeup(dev, false); } + + if (tee_np) { + ddata->tee_phandle.np = NULL; + rproc_tee_unregister(dev, rproc); + of_node_put(tee_np); + } else { + rproc_del(rproc); + } }

static int stm32_rproc_suspend(struct device *dev)