From 7173f5f61866d525b9786d31a01f105f58e90c72 Mon Sep 17 00:00:00 2001 From: Vikram Kanigiri Date: Thu, 24 Sep 2015 15:45:43 +0100 Subject: Fix relocation of __PERCPU_BAKERY_LOCK_SIZE__ When a platform port does not define PLAT_PERCPU_BAKERY_LOCK_SIZE, the total memory that should be allocated per-cpu to accommodate all bakery locks is calculated by the linker in bl31.ld.S. The linker stores this value in the __PERCPU_BAKERY_LOCK_SIZE__ linker symbol. The runtime value of this symbol is different from the link time value as the symbol is relocated into the current section (.bss). This patch fixes this issue by marking the symbol as ABSOLUTE which allows it to retain its correct value even at runtime. The description of PLAT_PERCPU_BAKERY_LOCK_SIZE in the porting-guide.md has been made clearer as well. Change-Id: Ia0cfd42f51deaf739d792297e60cad5c6e6e610b --- bl31/bl31.ld.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bl31') diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index 72507911..e572f9be 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -124,7 +124,7 @@ SECTIONS __BAKERY_LOCK_START__ = .; *(bakery_lock) . = ALIGN(CACHE_WRITEBACK_GRANULE); - __PERCPU_BAKERY_LOCK_SIZE__ = . - __BAKERY_LOCK_START__; + __PERCPU_BAKERY_LOCK_SIZE__ = ABSOLUTE(. - __BAKERY_LOCK_START__); . = . + (__PERCPU_BAKERY_LOCK_SIZE__ * (PLATFORM_CORE_COUNT - 1)); __BAKERY_LOCK_END__ = .; #ifdef PLAT_PERCPU_BAKERY_LOCK_SIZE -- cgit