The new TEE remoteproc driver is used to manage remote firmware in a
secure, trusted context. The 'st,stm32mp1-m4-tee' compatibility is
introduced to delegate the loading of the firmware to the trusted
execution context. In such cases, the firmware should be signed and
adhere to the image format defined by the TEE.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliq...@foss.st.com>
---
updates vs version V13:
- register load_fw() ops instead of load() to call rproc_tee_load_fw()

Signed-off-by: Arnaud Pouliquen <arnaud.pouliq...@foss.st.com>
---
 drivers/remoteproc/stm32_rproc.c | 57 ++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index 1586978c5757..c155822324d8 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>
@@ -255,6 +256,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;
@@ -691,8 +705,20 @@ 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_fw        = 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" },
+       { .compatible = "st,stm32mp1-m4-tee" },
        {},
 };
 MODULE_DEVICE_TABLE(of, stm32_rproc_match);
@@ -853,15 +879,36 @@ static int stm32_rproc_probe(struct platform_device *pdev)
        struct device_node *np = dev->of_node;
        struct rproc *rproc;
        unsigned int state;
+       u32 proc_id;
        int ret;
 
        ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
        if (ret)
                return ret;
 
-       rproc = devm_rproc_alloc(dev, np->name, &st_rproc_ops, NULL, 
sizeof(*ddata));
-       if (!rproc)
-               return -ENOMEM;
+       if (of_device_is_compatible(np, "st,stm32mp1-m4-tee")) {
+               /*
+                * Delegate the firmware management to the secure context.
+                * The firmware loaded has to be signed.
+                */
+               ret = of_property_read_u32(np, "st,proc-id", &proc_id);
+               if (ret) {
+                       dev_err(dev, "failed to read st,rproc-id property\n");
+                       return ret;
+               }
+
+               rproc = devm_rproc_alloc(dev, np->name, &st_rproc_tee_ops, 
NULL, sizeof(*ddata));
+               if (!rproc)
+                       return -ENOMEM;
+
+               ret = rproc_tee_register(dev, rproc, proc_id);
+               if (ret)
+                       return dev_err_probe(dev, ret,  "signed firmware not 
supported by TEE\n");
+       } else {
+               rproc = devm_rproc_alloc(dev, np->name, &st_rproc_ops, NULL, 
sizeof(*ddata));
+               if (!rproc)
+                       return -ENOMEM;
+       }
 
        ddata = rproc->priv;
 
@@ -913,6 +960,8 @@ static int stm32_rproc_probe(struct platform_device *pdev)
                dev_pm_clear_wake_irq(dev);
                device_init_wakeup(dev, false);
        }
+       rproc_tee_unregister(rproc);
+
        return ret;
 }
 
@@ -933,6 +982,8 @@ static void stm32_rproc_remove(struct platform_device *pdev)
                dev_pm_clear_wake_irq(dev);
                device_init_wakeup(dev, false);
        }
+
+       rproc_tee_unregister(rproc);
 }
 
 static int stm32_rproc_suspend(struct device *dev)
-- 
2.25.1


Reply via email to