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
0d7b0963
Commit
0d7b0963
authored
Aug 06, 2019
by
Sandrine Bailleux
Committed by
TrustedFirmware Code Review
Aug 06, 2019
Browse files
Merge "meson: gxl: Fix CPU hotplug" into integration
parents
35c28cc9
b4694a86
Changes
1
Hide whitespace changes
Inline
Side-by-side
plat/meson/gxl/gxl_pm.c
View file @
0d7b0963
...
@@ -162,7 +162,8 @@ static void gxbb_pwr_domain_off(const psci_power_state_t *target_state)
...
@@ -162,7 +162,8 @@ static void gxbb_pwr_domain_off(const psci_power_state_t *target_state)
static
void
__dead2
gxbb_pwr_domain_pwr_down_wfi
(
const
psci_power_state_t
static
void
__dead2
gxbb_pwr_domain_pwr_down_wfi
(
const
psci_power_state_t
*
target_state
)
*
target_state
)
{
{
unsigned
int
core
=
plat_gxbb_calc_core_pos
(
read_mpidr_el1
());
u_register_t
mpidr
=
read_mpidr_el1
();
unsigned
int
core
=
plat_gxbb_calc_core_pos
(
mpidr
);
/* CPU0 can't be turned OFF, emulate it with a WFE loop */
/* CPU0 can't be turned OFF, emulate it with a WFE loop */
if
(
core
==
GXBB_PRIMARY_CPU
)
{
if
(
core
==
GXBB_PRIMARY_CPU
)
{
...
@@ -173,10 +174,19 @@ static void __dead2 gxbb_pwr_domain_pwr_down_wfi(const psci_power_state_t
...
@@ -173,10 +174,19 @@ static void __dead2 gxbb_pwr_domain_pwr_down_wfi(const psci_power_state_t
VERBOSE
(
"BL31: CPU0 resumed.
\n
"
);
VERBOSE
(
"BL31: CPU0 resumed.
\n
"
);
write_rmr_el3
(
RMR_EL3_RR_BIT
|
RMR_EL3_AA64_BIT
);
/*
* Because setting CPU0's warm reset entrypoint through PSCI
* mailbox and/or mmio mapped RVBAR (0xda834650) does not seem
* to work, jump to it manually.
* In order to avoid an assert, mmu has to be disabled.
*/
disable_mmu_el3
();
((
void
(
*
)(
void
))
gxbb_sec_entrypoint
)();
}
}
dsbsy
();
dsbsy
();
gxl_pm_set_reset_addr
(
mpidr
,
0
);
gxl_pm_reset
(
mpidr
);
for
(;;)
for
(;;)
wfi
();
wfi
();
...
...
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