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.pouliquen@foss.st.com>
---
updates vs previous version
- rename structures, variables and function from tee_rproc_xxx to
rproc_tee_xxx,
- rework code to take into account rproc_tee_register and
rproc_tee_unregister APIs update,
- optimize code around dev_err_probe() when rproc_tee_register() fails.
---
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 288bd70c7861..7875b26a38a5 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 = 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.1Hi Arnaud,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 42f7652d3eb527d03665b09edac47f85fb600924]
url: https://github.com/intel-lab-lkp/linux/commits/Arnaud-Pouliquen/remoteproc-core-Introduce-rproc_pa_to_va-helper/20241026-050443
base: 42f7652d3eb527d03665b09edac47f85fb600924
patch link: https://lore.kernel.org/r/20241025205924.2087768-8-arnaud.pouliquen%40foss.st.com
patch subject: [PATCH v12 7/7] remoteproc: stm32: Add support of an OP-TEE TA to load the firmware
config: alpha-allyesconfig (https://download.01.org/0day-ci/archive/20241026/202410262040.PWNrKv2Q-lkp@intel.com/config)
compiler: alpha-linux-gcc (GCC) 13.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241026/202410262040.PWNrKv2Q-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202410262040.PWNrKv2Q-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_probe':
>> drivers/remoteproc/stm32_rproc.c:904:21: warning: assignment to 'int' from 'struct rproc_tee *' makes integer from pointer without a cast [-Wint-conversion]
904 | ret = rproc_tee_register(dev, rproc, proc_id);
| ^
drivers/remoteproc/stm32_rproc.c:963:30: error: passing argument 1 of 'rproc_tee_unregister' from incompatible pointer type [-Werror=incompatible-pointer-types]
963 | rproc_tee_unregister(rproc);
| ^~~~~
| |
| struct rproc *
In file included from drivers/remoteproc/stm32_rproc.c:21:
include/linux/remoteproc_tee.h:59:58: note: expected 'struct rproc_tee *' but argument is of type 'struct rproc *'
59 | static inline int rproc_tee_unregister(struct rproc_tee *trproc)
| ~~~~~~~~~~~~~~~~~~^~~~~~
drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_remove':
drivers/remoteproc/stm32_rproc.c:986:30: error: passing argument 1 of 'rproc_tee_unregister' from incompatible pointer type [-Werror=incompatible-pointer-types]
986 | rproc_tee_unregister(rproc);
| ^~~~~
| |
| struct rproc *
include/linux/remoteproc_tee.h:59:58: note: expected 'struct rproc_tee *' but argument is of type 'struct rproc *'
59 | static inline int rproc_tee_unregister(struct rproc_tee *trproc)
| ~~~~~~~~~~~~~~~~~~^~~~~~
cc1: some warnings being treated as errors
vim +904 drivers/remoteproc/stm32_rproc.c
874
875 static int stm32_rproc_probe(struct platform_device *pdev)
876 {
877 struct device *dev = &pdev->dev;
878 struct stm32_rproc *ddata;
879 struct device_node *np = dev->of_node;
880 struct rproc *rproc;
881 unsigned int state;
882 u32 proc_id;
883 int ret;
884
885 ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
886 if (ret)
887 return ret;
888
889 if (of_device_is_compatible(np, "st,stm32mp1-m4-tee")) {
890 /*
891 * Delegate the firmware management to the secure context.
892 * The firmware loaded has to be signed.
893 */
894 ret = of_property_read_u32(np, "st,proc-id", &proc_id);
895 if (ret) {
896 dev_err(dev, "failed to read st,rproc-id property\n");
897 return ret;
898 }
899
900 rproc = devm_rproc_alloc(dev, np->name, &st_rproc_tee_ops, NULL, sizeof(*ddata));
901 if (!rproc)
902 return -ENOMEM;
903
> 904 ret = rproc_tee_register(dev, rproc, proc_id);
905 if (ret)
906 return dev_err_probe(dev, ret, "signed firmware not supported by TEE\n");
907 } else {
908 rproc = devm_rproc_alloc(dev, np->name, &st_rproc_ops, NULL, sizeof(*ddata));
909 if (!rproc)
910 return -ENOMEM;
911 }
912
913 ddata = rproc->priv;
914
915 rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
916
917 ret = stm32_rproc_parse_dt(pdev, ddata, &rproc->auto_boot);
918 if (ret)
919 goto free_rproc;
920
921 ret = stm32_rproc_of_memory_translations(pdev, ddata);
922 if (ret)
923 goto free_rproc;
924
925 ret = stm32_rproc_get_m4_status(ddata, &state);
926 if (ret)
927 goto free_rproc;
928
929 if (state == M4_STATE_CRUN)
930 rproc->state = RPROC_DETACHED;
931
932 rproc->has_iommu = false;
933 ddata->workqueue = create_workqueue(dev_name(dev));
934 if (!ddata->workqueue) {
935 dev_err(dev, "cannot create workqueue\n");
936 ret = -ENOMEM;
937 goto free_resources;
938 }
939
940 platform_set_drvdata(pdev, rproc);
941
942 ret = stm32_rproc_request_mbox(rproc);
943 if (ret)
944 goto free_wkq;
945
946 ret = rproc_add(rproc);
947 if (ret)
948 goto free_mb;
949
950 return 0;
951
952 free_mb:
953 stm32_rproc_free_mbox(rproc);
954 free_wkq:
955 destroy_workqueue(ddata->workqueue);
956 free_resources:
957 rproc_resource_cleanup(rproc);
958 free_rproc:
959 if (device_may_wakeup(dev)) {
960 dev_pm_clear_wake_irq(dev);
961 device_init_wakeup(dev, false);
962 }
963 rproc_tee_unregister(rproc);
964
965 return ret;
966 }
967
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Arnaud,
kernel test robot noticed the following build errors:
[auto build test ERROR on 42f7652d3eb527d03665b09edac47f85fb600924]
url: https://github.com/intel-lab-lkp/linux/commits/Arnaud-Pouliquen/remoteproc-core-Introduce-rproc_pa_to_va-helper/20241026-050443
base: 42f7652d3eb527d03665b09edac47f85fb600924
patch link: https://lore.kernel.org/r/20241025205924.2087768-8-arnaud.pouliquen%40foss.st.com
patch subject: [PATCH v12 7/7] remoteproc: stm32: Add support of an OP-TEE TA to load the firmware
config: x86_64-buildonly-randconfig-004-20241026 (https://download.01.org/0day-ci/archive/20241026/202410261837.eRmJAHKZ-lkp@intel.com/config)
compiler: clang version 19.1.2 (https://github.com/llvm/llvm-project 7ba7d8e2f7b6445b60679da826210cdde29eaf8b)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241026/202410261837.eRmJAHKZ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202410261837.eRmJAHKZ-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from drivers/remoteproc/stm32_rproc.c:9:
In file included from include/linux/dma-mapping.h:11:
In file included from include/linux/scatterlist.h:8:
In file included from include/linux/mm.h:2213:
include/linux/vmstat.h:518:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
518 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
>> drivers/remoteproc/stm32_rproc.c:904:7: error: incompatible pointer to integer conversion assigning to 'int' from 'struct rproc_tee *' [-Wint-conversion]
904 | ret = rproc_tee_register(dev, rproc, proc_id);
| ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/remoteproc/stm32_rproc.c:963:23: error: incompatible pointer types passing 'struct rproc *' to parameter of type 'struct rproc_tee *' [-Werror,-Wincompatible-pointer-types]
963 | rproc_tee_unregister(rproc);
| ^~~~~
include/linux/remoteproc_tee.h:59:58: note: passing argument to parameter 'trproc' here
59 | static inline int rproc_tee_unregister(struct rproc_tee *trproc)
| ^
drivers/remoteproc/stm32_rproc.c:986:23: error: incompatible pointer types passing 'struct rproc *' to parameter of type 'struct rproc_tee *' [-Werror,-Wincompatible-pointer-types]
986 | rproc_tee_unregister(rproc);
| ^~~~~
include/linux/remoteproc_tee.h:59:58: note: passing argument to parameter 'trproc' here
59 | static inline int rproc_tee_unregister(struct rproc_tee *trproc)
| ^
1 warning and 3 errors generated.
vim +904 drivers/remoteproc/stm32_rproc.c
874
875 static int stm32_rproc_probe(struct platform_device *pdev)
876 {
877 struct device *dev = &pdev->dev;
878 struct stm32_rproc *ddata;
879 struct device_node *np = dev->of_node;
880 struct rproc *rproc;
881 unsigned int state;
882 u32 proc_id;
883 int ret;
884
885 ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
886 if (ret)
887 return ret;
888
889 if (of_device_is_compatible(np, "st,stm32mp1-m4-tee")) {
890 /*
891 * Delegate the firmware management to the secure context.
892 * The firmware loaded has to be signed.
893 */
894 ret = of_property_read_u32(np, "st,proc-id", &proc_id);
895 if (ret) {
896 dev_err(dev, "failed to read st,rproc-id property\n");
897 return ret;
898 }
899
900 rproc = devm_rproc_alloc(dev, np->name, &st_rproc_tee_ops, NULL, sizeof(*ddata));
901 if (!rproc)
902 return -ENOMEM;
903
> 904 ret = rproc_tee_register(dev, rproc, proc_id);
905 if (ret)
906 return dev_err_probe(dev, ret, "signed firmware not supported by TEE\n");
907 } else {
908 rproc = devm_rproc_alloc(dev, np->name, &st_rproc_ops, NULL, sizeof(*ddata));
909 if (!rproc)
910 return -ENOMEM;
911 }
912
913 ddata = rproc->priv;
914
915 rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
916
917 ret = stm32_rproc_parse_dt(pdev, ddata, &rproc->auto_boot);
918 if (ret)
919 goto free_rproc;
920
921 ret = stm32_rproc_of_memory_translations(pdev, ddata);
922 if (ret)
923 goto free_rproc;
924
925 ret = stm32_rproc_get_m4_status(ddata, &state);
926 if (ret)
927 goto free_rproc;
928
929 if (state == M4_STATE_CRUN)
930 rproc->state = RPROC_DETACHED;
931
932 rproc->has_iommu = false;
933 ddata->workqueue = create_workqueue(dev_name(dev));
934 if (!ddata->workqueue) {
935 dev_err(dev, "cannot create workqueue\n");
936 ret = -ENOMEM;
937 goto free_resources;
938 }
939
940 platform_set_drvdata(pdev, rproc);
941
942 ret = stm32_rproc_request_mbox(rproc);
943 if (ret)
944 goto free_wkq;
945
946 ret = rproc_add(rproc);
947 if (ret)
948 goto free_mb;
949
950 return 0;
951
952 free_mb:
953 stm32_rproc_free_mbox(rproc);
954 free_wkq:
955 destroy_workqueue(ddata->workqueue);
956 free_resources:
957 rproc_resource_cleanup(rproc);
958 free_rproc:
959 if (device_may_wakeup(dev)) {
960 dev_pm_clear_wake_irq(dev);
961 device_init_wakeup(dev, false);
962 }
> 963 rproc_tee_unregister(rproc);
964
965 return ret;
966 }
967
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Arnaud,
kernel test robot noticed the following build errors:
[auto build test ERROR on 42f7652d3eb527d03665b09edac47f85fb600924]
url: https://github.com/intel-lab-lkp/linux/commits/Arnaud-Pouliquen/remoteproc-core-Introduce-rproc_pa_to_va-helper/20241026-050443
base: 42f7652d3eb527d03665b09edac47f85fb600924
patch link: https://lore.kernel.org/r/20241025205924.2087768-8-arnaud.pouliquen%40foss.st.com
patch subject: [PATCH v12 7/7] remoteproc: stm32: Add support of an OP-TEE TA to load the firmware
config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20241026/202410261701.jz99xF8B-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 14.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241026/202410261701.jz99xF8B-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202410261701.jz99xF8B-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_probe':
>> drivers/remoteproc/stm32_rproc.c:904:21: error: assignment to 'int' from 'struct rproc_tee *' makes integer from pointer without a cast [-Wint-conversion]
904 | ret = rproc_tee_register(dev, rproc, proc_id);
| ^
>> drivers/remoteproc/stm32_rproc.c:963:30: error: passing argument 1 of 'rproc_tee_unregister' from incompatible pointer type [-Wincompatible-pointer-types]
963 | rproc_tee_unregister(rproc);
| ^~~~~
| |
| struct rproc *
In file included from drivers/remoteproc/stm32_rproc.c:21:
include/linux/remoteproc_tee.h:59:58: note: expected 'struct rproc_tee *' but argument is of type 'struct rproc *'
59 | static inline int rproc_tee_unregister(struct rproc_tee *trproc)
| ~~~~~~~~~~~~~~~~~~^~~~~~
drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_remove':
drivers/remoteproc/stm32_rproc.c:986:30: error: passing argument 1 of 'rproc_tee_unregister' from incompatible pointer type [-Wincompatible-pointer-types]
986 | rproc_tee_unregister(rproc);
| ^~~~~
| |
| struct rproc *
include/linux/remoteproc_tee.h:59:58: note: expected 'struct rproc_tee *' but argument is of type 'struct rproc *'
59 | static inline int rproc_tee_unregister(struct rproc_tee *trproc)
| ~~~~~~~~~~~~~~~~~~^~~~~~
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for GET_FREE_REGION
Depends on [n]: SPARSEMEM [=n]
Selected by [y]:
- RESOURCE_KUNIT_TEST [=y] && RUNTIME_TESTING_MENU [=y] && KUNIT [=y]
vim +904 drivers/remoteproc/stm32_rproc.c
874
875 static int stm32_rproc_probe(struct platform_device *pdev)
876 {
877 struct device *dev = &pdev->dev;
878 struct stm32_rproc *ddata;
879 struct device_node *np = dev->of_node;
880 struct rproc *rproc;
881 unsigned int state;
882 u32 proc_id;
883 int ret;
884
885 ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
886 if (ret)
887 return ret;
888
889 if (of_device_is_compatible(np, "st,stm32mp1-m4-tee")) {
890 /*
891 * Delegate the firmware management to the secure context.
892 * The firmware loaded has to be signed.
893 */
894 ret = of_property_read_u32(np, "st,proc-id", &proc_id);
895 if (ret) {
896 dev_err(dev, "failed to read st,rproc-id property\n");
897 return ret;
898 }
899
900 rproc = devm_rproc_alloc(dev, np->name, &st_rproc_tee_ops, NULL, sizeof(*ddata));
901 if (!rproc)
902 return -ENOMEM;
903
> 904 ret = rproc_tee_register(dev, rproc, proc_id);
905 if (ret)
906 return dev_err_probe(dev, ret, "signed firmware not supported by TEE\n");
907 } else {
908 rproc = devm_rproc_alloc(dev, np->name, &st_rproc_ops, NULL, sizeof(*ddata));
909 if (!rproc)
910 return -ENOMEM;
911 }
912
913 ddata = rproc->priv;
914
915 rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
916
917 ret = stm32_rproc_parse_dt(pdev, ddata, &rproc->auto_boot);
918 if (ret)
919 goto free_rproc;
920
921 ret = stm32_rproc_of_memory_translations(pdev, ddata);
922 if (ret)
923 goto free_rproc;
924
925 ret = stm32_rproc_get_m4_status(ddata, &state);
926 if (ret)
927 goto free_rproc;
928
929 if (state == M4_STATE_CRUN)
930 rproc->state = RPROC_DETACHED;
931
932 rproc->has_iommu = false;
933 ddata->workqueue = create_workqueue(dev_name(dev));
934 if (!ddata->workqueue) {
935 dev_err(dev, "cannot create workqueue\n");
936 ret = -ENOMEM;
937 goto free_resources;
938 }
939
940 platform_set_drvdata(pdev, rproc);
941
942 ret = stm32_rproc_request_mbox(rproc);
943 if (ret)
944 goto free_wkq;
945
946 ret = rproc_add(rproc);
947 if (ret)
948 goto free_mb;
949
950 return 0;
951
952 free_mb:
953 stm32_rproc_free_mbox(rproc);
954 free_wkq:
955 destroy_workqueue(ddata->workqueue);
956 free_resources:
957 rproc_resource_cleanup(rproc);
958 free_rproc:
959 if (device_may_wakeup(dev)) {
960 dev_pm_clear_wake_irq(dev);
961 device_init_wakeup(dev, false);
962 }
> 963 rproc_tee_unregister(rproc);
964
965 return ret;
966 }
967
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2024 Red Hat, Inc.