aboutsummaryrefslogtreecommitdiff
path: root/src/arch/arm64/arm_tf.c
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2015-05-11 16:45:56 -0700
committerPatrick Georgi <pgeorgi@google.com>2015-05-19 20:35:03 +0200
commit745a75faac970ec5dd35472412ddb94e888e4198 (patch)
treee4ac39fe99f650ef322b88d7e8506a6b7cfc6164 /src/arch/arm64/arm_tf.c
parentbbca3a9cfa5248eb49bd2e42e8db25a6733835bb (diff)
arm64: Add support for using ARM Trusted Firmware as secure monitor
This patch adds support for integrating the runtime-resident component of ARM Trusted Firmware (github.com/ARM-software/arm-trusted-firmware) called BL31. It expects the ARM TF source tree to be checked out under $(top)/3rdparty/arm-trusted-firmware, which will be set up in a later patch. Also include optional support for VBOOT2 verification (pretty hacky for now, since CBFSv1 is just around the corner and will make all this so much better). BRANCH=None BUG=None TEST=Booted Oak with ARM TF and working PSCI (with additional platform patches). Change-Id: I8c923226135bdf88a9a30a7f5ff163510c35608d Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: a1b3b2d56b25bfc1f3b2d19bf7876205075a987a Original-Change-Id: I0714cc10b5b10779af53ecbe711ceeb89fb30da2 Original-Signed-off-by: Julius Werner <jwerner@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/270784 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/10249 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch/arm64/arm_tf.c')
-rw-r--r--src/arch/arm64/arm_tf.c98
1 files changed, 98 insertions, 0 deletions
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c
new file mode 100644
index 0000000000..c193fa7228
--- /dev/null
+++ b/src/arch/arm64/arm_tf.c
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2015 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ */
+
+#include <arch/cache.h>
+#include <arm_tf.h>
+#include <assert.h>
+#include <cbfs.h>
+#include <cbmem.h>
+#include <vendorcode/google/chromeos/vboot_handoff.h>
+
+/*
+ * TODO: Many of these structures are currently unused. Better not fill them out
+ * to make future changes fail fast, rather than try to come up with content
+ * that might turn out to not make sense. Implement later as required.
+ *
+static image_info_t bl31_image_info;
+static image_info_t bl32_image_info;
+static image_info_t bl33_image_info;
+static entry_point_info_t bl32_ep_info;
+ */
+static entry_point_info_t bl33_ep_info;
+static bl31_params_t bl31_params;
+
+/* TODO: Replace with glorious new CBFSv1 solution when it's available. */
+static void *vboot_get_bl31(void)
+{
+ void *bl31_entry;
+ struct cbfs_media *media;
+ struct firmware_component *component;
+ struct vboot_handoff *handoff = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
+
+ if (!handoff)
+ return NULL;
+
+ assert(CONFIG_VBOOT_BL31_INDEX < MAX_PARSED_FW_COMPONENTS);
+ component = &handoff->components[CONFIG_VBOOT_BL31_INDEX];
+
+ /* components[] is zeroed out before filling, so size == 0 -> missing */
+ if (!component->size)
+ return NULL;
+
+ init_default_cbfs_media(media);
+ bl31_entry = cbfs_load_stage_by_offset(media, component->address);
+ if (bl31_entry == CBFS_LOAD_ERROR)
+ return NULL;
+
+ printk(BIOS_INFO, "Loaded %u bytes verified BL31 from %#.8x to EP %p\n",
+ component->size, component->address, bl31_entry);
+ return bl31_entry;
+}
+
+void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr)
+{
+ const char *bl31_filename = CONFIG_CBFS_PREFIX"/bl31";
+ void (*bl31_entry)(bl31_params_t *params, void *plat_params) = NULL;
+
+ if (IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE))
+ bl31_entry = vboot_get_bl31();
+
+ if (!bl31_entry) {
+ bl31_entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, bl31_filename);
+ if (bl31_entry == CBFS_LOAD_ERROR)
+ die("BL31 not found in CBFS");
+ }
+
+ SET_PARAM_HEAD(&bl31_params, PARAM_BL31, VERSION_1, 0);
+ bl31_params.bl33_ep_info = &bl33_ep_info;
+
+ SET_PARAM_HEAD(&bl33_ep_info, PARAM_EP, VERSION_1, PARAM_EP_NON_SECURE);
+ bl33_ep_info.pc = payload_entry;
+ bl33_ep_info.spsr = payload_spsr;
+ bl33_ep_info.args.arg0 = payload_arg0;
+
+ /* May update bl31_params if necessary. Must flush all added structs. */
+ void *bl31_plat_params = soc_get_bl31_plat_params(&bl31_params);
+
+ dcache_clean_by_mva(&bl31_params, sizeof(bl31_params));
+ dcache_clean_by_mva(&bl33_ep_info, sizeof(bl33_ep_info));
+ dcache_mmu_disable();
+ bl31_entry(&bl31_params, bl31_plat_params);
+ die("BL31 returned!");
+}