drivers: remoteproc: ti_k3 : enable secure booting with firmware images

Remoteproc firmware images aren't authenticated in the current boot flow.
Authenticates remoteproc firmware images to complete the root of trust
in secure booting.

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> # Intel Edison
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index 57fe1037da02ee98ece237f7727e755487f20447..7617bbb986df6e0e3b0b92d54426fb025c6a7ca9 100644 (file)
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -21,6 +21,7 @@
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include "ti_sci_proc.h"
+#include <mach/security.h>
 
 #define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK      (SZ_16M - 1)
 
@@ -127,6 +128,7 @@ static int k3_dsp_load(struct udevice *dev, ulong addr, ulong size)
        struct k3_dsp_privdata *dsp = dev_get_priv(dev);
        struct k3_dsp_boot_data *data = dsp->data;
        u32 boot_vector;
+       void *image_addr = (void *)addr;
        int ret;
 
        if (dsp->in_use) {
@@ -148,6 +150,8 @@ static int k3_dsp_load(struct udevice *dev, ulong addr, ulong size)
                goto proc_release;
        }
 
+       ti_secure_image_post_process(&image_addr, &size);
+
        ret = rproc_elf_load_image(dev, addr, size);
        if (ret < 0) {
                dev_err(dev, "Loading elf failed %d\n", ret);

diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index b55b1dc10d4a9567f2ecd7904b2b2a7b066c15c8..b9c6549e1853b91f9c054083f4f4e0ce8e179e00 100644 (file)
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include "ti_sci_proc.h"
+#include <mach/security.h>
 
 /*
  * R5F's view of this address can either be for ATCM or BTCM with the other
@@ -301,6 +302,7 @@ static int k3_r5f_load(struct udevice *dev, ulong addr, ulong size)
        u64 boot_vector;
        u32 ctrl, sts, cfg = 0;
        bool mem_auto_init;
+       void *image_addr = (void *)addr;
        int ret;
 
        dev_dbg(dev, "%s addr = 0x%lx, size = 0x%lx\n", __func__, addr, size);
@@ -328,6 +330,8 @@ static int k3_r5f_load(struct udevice *dev, ulong addr, ulong size)
 
        k3_r5f_init_tcm_memories(core, mem_auto_init);
 
+       ti_secure_image_post_process(&image_addr, &size);
+
        ret = rproc_elf_load_image(dev, addr, size);
        if (ret < 0) {
                dev_err(dev, "Loading elf failedi %d\n", ret);