Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
dbc963e2
Commit
dbc963e2
authored
Jun 02, 2015
by
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
Changes
2
Show whitespace changes
Inline
Side-by-side
include/plat/arm/css/common/css_def.h
View file @
dbc963e2
...
@@ -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( \
...
...
plat/arm/css/common/aarch64/css_helpers.S
View file @
dbc963e2
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment