diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2015-05-26 16:58:54 +0100 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2015-05-27 10:08:55 +0100 |
| commit | 19af6fceaf039339f456d96b7a444b5d48217d77 (patch) | |
| tree | 3a948425ab294ba4b1ae8e8bd6656d367b73bd34 | |
| parent | c163ec455b9f7432a8f677b8d35981e6d11b39cb (diff) | |
CSS: Extract primary cpu id using the correct bit width
This patch fixes the incorrect bit width used to extract the primary
cpu id from `ap_data` exported by scp at SCP_BOOT_CFG_ADDR in
platform_is_primary_cpu().
Change-Id: I14abb361685f31164ecce0755fc1a145903b27aa
| -rw-r--r-- | include/plat/arm/css/common/css_def.h | 2 | ||||
| -rw-r--r-- | plat/arm/css/common/aarch64/css_helpers.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 12a0550..056c00d 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -69,7 +69,7 @@ /* SCP <=> AP boot configuration */ #define SCP_BOOT_CFG_ADDR 0x04000080 #define PRIMARY_CPU_SHIFT 8 -#define PRIMARY_CPU_MASK 0xf +#define PRIMARY_CPU_BIT_WIDTH 4 #define CSS_MAP_DEVICE MAP_REGION_FLAT( \ diff --git a/plat/arm/css/common/aarch64/css_helpers.S b/plat/arm/css/common/aarch64/css_helpers.S index 1eee762..3903278 100644 --- a/plat/arm/css/common/aarch64/css_helpers.S +++ b/plat/arm/css/common/aarch64/css_helpers.S @@ -115,7 +115,7 @@ func platform_is_primary_cpu bl platform_get_core_pos ldr x1, =SCP_BOOT_CFG_ADDR ldr x1, [x1] - ubfx x1, x1, #PRIMARY_CPU_SHIFT, #PRIMARY_CPU_MASK + ubfx x1, x1, #PRIMARY_CPU_SHIFT, #PRIMARY_CPU_BIT_WIDTH cmp x0, x1 cset x0, eq ret x9 |