commit 73003ac720430d1f06040b5e357873afc2e12729
author Soby Mathew <soby.mathew@arm.com> Tue May 26 16:58:54 2015 +0100
committer Soby Mathew <soby.mathew@arm.com> Wed May 27 10:08:55 2015 +0100
tree 3a948425ab294ba4b1ae8e8bd6656d367b73bd34
parent a4bf875fbeb1883bece835a551a5af9dc50c0316

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

plat/arm/css/common/aarch64/css_helpers.S

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 @@
 	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