]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ARM: Add CONFIG_ARMV7_SECURE_MAX_SIZE and check size of secure section
authorChen-Yu Tsai <wens@csie.org>
Sun, 19 Jun 2016 04:38:39 +0000 (12:38 +0800)
committerHans de Goede <hdegoede@redhat.com>
Fri, 15 Jul 2016 13:54:57 +0000 (15:54 +0200)
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>
arch/arm/cpu/u-boot.lds

index 002706ae635da668b11f675985f400367ccd2d2d..5a65c27cfa74f90237c21fd0670909adb2690fe7 100644 (file)
@@ -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