Merge pull request #1205 from petegriffin/hikey-protect-memory

Hikey protect optee / sdp memory

diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c
index 86c205d38b59cc602c7c4878771c58ef69b05d3a..3f5e48607d30af38212e705e6b9839b678271c6c 100644 (file)
--- a/plat/hisilicon/hikey/hikey_bl2_setup.c
+++ b/plat/hisilicon/hikey/hikey_bl2_setup.c
@@ -489,4 +489,5 @@ void bl2_plat_arch_setup(void)
 
 void bl2_platform_setup(void)
 {
+       hikey_security_setup();
 }

diff --git a/plat/hisilicon/hikey/hikey_private.h b/plat/hisilicon/hikey/hikey_private.h
index a7709b26c7cc53cefae4e2d081f32cc10802e9e8..da98734955362e6ef7573bd0edac8ec3ac316436 100644 (file)
--- a/plat/hisilicon/hikey/hikey_private.h
+++ b/plat/hisilicon/hikey/hikey_private.h
@@ -44,6 +44,7 @@ int hikey_erase(const char *arg);
 int hikey_flash(const char *arg);
 int hikey_oem(const char *arg);
 int hikey_reboot(const char *arg);
+void hikey_security_setup(void);
 
 const char *hikey_init_serialno(void);
 int hikey_read_serialno(struct random_serial_num *serialno);

diff --git a/plat/hisilicon/hikey/hikey_security.c b/plat/hisilicon/hikey/hikey_security.c
new file mode 100644 (file)
index 0000000..be8c39f
--- /dev/null
+++ b/plat/hisilicon/hikey/hikey_security.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <assert.h>
+#include <debug.h>
+#include <platform_def.h>
+#include <stdint.h>
+#include <strings.h>
+#include <utils_def.h>
+#include "hikey_private.h"
+
+#define PORTNUM_MAX            5
+
+#define MDDRC_SECURITY_BASE    0xF7121000
+
+struct int_en_reg {
+       unsigned in_en:1;
+       unsigned reserved:31;
+};
+
+struct rgn_map_reg {
+       unsigned rgn_base_addr:24;
+       unsigned rgn_size:6;
+       unsigned reserved:1;
+       unsigned rgn_en:1;
+};
+
+struct rgn_attr_reg {
+       unsigned sp:4;
+       unsigned security_inv:1;
+       unsigned reserved_0:3;
+       unsigned mid_en:1;
+       unsigned mid_inv:1;
+       unsigned reserved_1:6;
+       unsigned rgn_en:1;
+       unsigned subrgn_disable:16;
+};
+
+static volatile struct int_en_reg *get_int_en_reg(uint32_t base)
+{
+       uint64_t addr = base + 0x20;
+       return (struct int_en_reg *)addr;
+}
+
+static volatile struct rgn_map_reg *get_rgn_map_reg(uint32_t base, int region, int port)
+{
+       uint64_t addr = base + 0x100 + 0x10 * region + 0x400 * (uint64_t)port;
+       return (struct rgn_map_reg *)addr;
+}
+
+static volatile struct rgn_attr_reg *get_rgn_attr_reg(uint32_t base, int region,
+                                            int port)
+{
+       uint64_t addr = base + 0x104 + 0x10 * region + 0x400 * (uint64_t)port;
+       return (struct rgn_attr_reg *)addr;
+}
+
+/*
+ * Configure secure memory region
+ * region_size must be a power of 2 and at least 64KB
+ * region_base must be region_size aligned
+ */
+static void sec_protect(uint32_t region_base, uint32_t region_size,
+                       int region)
+{
+       volatile struct int_en_reg *int_en;
+       volatile struct rgn_map_reg *rgn_map;
+       volatile struct rgn_attr_reg *rgn_attr;
+       uint32_t i = 0;
+
+       assert(region < 1 || region > 15);
+       assert(!IS_POWER_OF_TWO(region_size) || region_size < 0x10000);
+       /* ensure secure region_base is aligned to region_size */
+       assert((region_base & (region_size - 1)));
+
+       INFO("BL2: TrustZone: protecting %u bytes of memory at 0x%x\n", region_size,
+            region_base);
+
+       int_en = get_int_en_reg(MDDRC_SECURITY_BASE);
+       int_en->in_en = 0x1;
+
+       for (i = 0; i < PORTNUM_MAX; i++) {
+               rgn_map = get_rgn_map_reg(MDDRC_SECURITY_BASE, region, i);
+               rgn_attr = get_rgn_attr_reg(MDDRC_SECURITY_BASE, region, i);
+               rgn_map->rgn_base_addr = region_base >> 16;
+               rgn_attr->subrgn_disable = 0x0;
+               rgn_attr->sp = (i == 3) ? 0xC : 0x0;
+               rgn_map->rgn_size = __builtin_ffs(region_size) - 2;
+               rgn_map->rgn_en = 0x1;
+       }
+}
+
+/*******************************************************************************
+ * Initialize the secure environment.
+ ******************************************************************************/
+void hikey_security_setup(void)
+{
+       sec_protect(DDR_SEC_BASE, DDR_SEC_SIZE, 1);
+       sec_protect(DDR_SDP_BASE, DDR_SDP_SIZE, 2);
+}

diff --git a/plat/hisilicon/hikey/platform.mk b/plat/hisilicon/hikey/platform.mk
index 524fa6a4242439a3dfa85d58eabb76c64f3b5c13..c8a29924a011388717d29a5094208336c24fcba1 100644 (file)
--- a/plat/hisilicon/hikey/platform.mk
+++ b/plat/hisilicon/hikey/platform.mk
@@ -78,6 +78,7 @@ BL2_SOURCES           +=      drivers/arm/sp804/sp804_delay_timer.c   \
                                drivers/synopsys/emmc/dw_mmc.c          \
                                plat/hisilicon/hikey/aarch64/hikey_helpers.S \
                                plat/hisilicon/hikey/hikey_bl2_setup.c  \
+                               plat/hisilicon/hikey/hikey_security.c   \
                                plat/hisilicon/hikey/hikey_ddr.c        \
                                plat/hisilicon/hikey/hikey_io_storage.c \
                                plat/hisilicon/hikey/hisi_dvfs.c        \