From: Chen-Yu Tsai <wens@csie.org>
Date: Sun, 19 Jun 2016 04:38:39 +0000 (+0800)
Subject: ARM: Add CONFIG_ARMV7_SECURE_MAX_SIZE and check size of secure section
X-Git-Tag: v2016.09-rc1~80^2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3eff681818e2c858175a7cc4e766f75e95827920;p=oweals%2Fu-boot.git

ARM: Add CONFIG_ARMV7_SECURE_MAX_SIZE and check size of secure section

As the PSCI implementation grows, we might exceed the size of the secure
memory that holds the firmware.

Add a configurable CONFIG_ARMV7_SECURE_MAX_SIZE so platforms can define
how much secure memory is available. The linker then checks the size of
the whole secure section against this.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---

diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds
index 002706ae63..5a65c27cfa 100644
--- a/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@ -86,6 +86,17 @@ SECTIONS
 		. = ALIGN(CONSTANT(COMMONPAGESIZE));
 
 		KEEP(*(.__secure_stack_end))
+
+#ifdef CONFIG_ARMV7_SECURE_MAX_SIZE
+		/*
+		 * We are not checking (__secure_end - __secure_start) here,
+		 * as these are the load addresses, and do not include the
+		 * stack section. Instead, use the end of the stack section
+		 * and the start of the text section.
+		 */
+		ASSERT((. - ADDR(.secure_text)) <= CONFIG_ARMV7_SECURE_MAX_SIZE,
+		       "Error: secure section exceeds secure memory size");
+#endif
 	}
 
 #ifndef __ARMV7_PSCI_STACK_IN_RAM