Commit dbc963e2 authored by Achin Gupta's avatar Achin Gupta
Browse files

Merge pull request #307 from soby-mathew/sm/css_bit_width_fix

CSS: Extract primary cpu id using the correct bit width
parents 1081e9c8 19af6fce
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
/* SCP <=> AP boot configuration */ /* SCP <=> AP boot configuration */
#define SCP_BOOT_CFG_ADDR 0x04000080 #define SCP_BOOT_CFG_ADDR 0x04000080
#define PRIMARY_CPU_SHIFT 8 #define PRIMARY_CPU_SHIFT 8
#define PRIMARY_CPU_MASK 0xf #define PRIMARY_CPU_BIT_WIDTH 4
#define CSS_MAP_DEVICE MAP_REGION_FLAT( \ #define CSS_MAP_DEVICE MAP_REGION_FLAT( \
......
...@@ -115,7 +115,7 @@ func platform_is_primary_cpu ...@@ -115,7 +115,7 @@ func platform_is_primary_cpu
bl platform_get_core_pos bl platform_get_core_pos
ldr x1, =SCP_BOOT_CFG_ADDR ldr x1, =SCP_BOOT_CFG_ADDR
ldr x1, [x1] 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 cmp x0, x1
cset x0, eq cset x0, eq
ret x9 ret x9
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment