andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

CSS: Extract primary cpu id using the correct bit width
This commit is contained in:
Achin Gupta 2015-06-02 11:18:18 +01:00
parent 1081e9c800 19af6fceaf
commit dbc963e2bf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/plat/arm/css/common/css_def.h
View File

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

2
plat/arm/css/common/aarch64/css_helpers.S
View File

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