Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-21 03:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "plat: imx8m: Fix the race condition during cpu hotplug" into integration

Browse source
This commit is contained in:
Manish Pandey 2020-08-20 15:07:13 +00:00 • committed by TrustedFirmware Code Review
commit 1566bc3e53
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plat/imx/imx8m/gpc_common.c
View file

@ -18,6 +18,8 @@
static uint32_t gpc_imr_offset[] = { IMR1_CORE0_A53, IMR1_CORE1_A53, IMR1_CORE2_A53, IMR1_CORE3_A53, }; static uint32_t gpc_imr_offset[] = { IMR1_CORE0_A53, IMR1_CORE1_A53, IMR1_CORE2_A53, IMR1_CORE3_A53, };
DEFINE_BAKERY_LOCK(gpc_lock);
#pragma weak imx_set_cpu_pwr_off #pragma weak imx_set_cpu_pwr_off
#pragma weak imx_set_cpu_pwr_on #pragma weak imx_set_cpu_pwr_on
#pragma weak imx_set_cpu_lpm #pragma weak imx_set_cpu_lpm
@ -38,16 +40,27 @@ void imx_set_cpu_secure_entry(unsigned int core_id, uintptr_t sec_entrypoint)
void imx_set_cpu_pwr_off(unsigned int core_id) void imx_set_cpu_pwr_off(unsigned int core_id)
{ {
bakery_lock_get(&gpc_lock);
/* enable the wfi power down of the core */ /* enable the wfi power down of the core */
mmio_setbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id)); mmio_setbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id));
bakery_lock_release(&gpc_lock);
/* assert the pcg pcr bit of the core */ /* assert the pcg pcr bit of the core */
mmio_setbits_32(IMX_GPC_BASE + COREx_PGC_PCR(core_id), 0x1); mmio_setbits_32(IMX_GPC_BASE + COREx_PGC_PCR(core_id), 0x1);
} }
void imx_set_cpu_pwr_on(unsigned int core_id) void imx_set_cpu_pwr_on(unsigned int core_id)
{ {
bakery_lock_get(&gpc_lock);
/* clear the wfi power down bit of the core */ /* clear the wfi power down bit of the core */
mmio_clrbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id)); mmio_clrbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id));
bakery_lock_release(&gpc_lock);
/* assert the ncpuporeset */ /* assert the ncpuporeset */
mmio_clrbits_32(IMX_SRC_BASE + SRC_A53RCR1, (1 << core_id)); mmio_clrbits_32(IMX_SRC_BASE + SRC_A53RCR1, (1 << core_id));
/* assert the pcg pcr bit of the core */ /* assert the pcg pcr bit of the core */
@ -67,6 +80,8 @@ void imx_set_cpu_pwr_on(unsigned int core_id)
void imx_set_cpu_lpm(unsigned int core_id, bool pdn) void imx_set_cpu_lpm(unsigned int core_id, bool pdn)
{ {
bakery_lock_get(&gpc_lock);
if (pdn) { if (pdn) {
/* enable the core WFI PDN & IRQ PUP */ /* enable the core WFI PDN & IRQ PUP */
mmio_setbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id) | mmio_setbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id) |
@ -80,6 +95,8 @@ void imx_set_cpu_lpm(unsigned int core_id, bool pdn)
/* deassert the pcg pcr bit of the core */ /* deassert the pcg pcr bit of the core */
mmio_clrbits_32(IMX_GPC_BASE + COREx_PGC_PCR(core_id), 0x1); mmio_clrbits_32(IMX_GPC_BASE + COREx_PGC_PCR(core_id), 0x1);
} }
bakery_lock_release(&gpc_lock);
} }
/* /*

9
plat/imx/imx8m/imx8mq/gpc.c
View file

@ -19,9 +19,14 @@
/* use wfi power down the core */ /* use wfi power down the core */
void imx_set_cpu_pwr_off(unsigned int core_id) void imx_set_cpu_pwr_off(unsigned int core_id)
{ {
bakery_lock_get(&gpc_lock);
/* enable the wfi power down of the core */ /* enable the wfi power down of the core */
mmio_setbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id) | mmio_setbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id) |
(1 << (core_id + 20))); (1 << (core_id + 20)));
bakery_lock_release(&gpc_lock);
/* assert the pcg pcr bit of the core */ /* assert the pcg pcr bit of the core */
mmio_setbits_32(IMX_GPC_BASE + COREx_PGC_PCR(core_id), 0x1); mmio_setbits_32(IMX_GPC_BASE + COREx_PGC_PCR(core_id), 0x1);
}; };
@ -29,6 +34,8 @@ void imx_set_cpu_pwr_off(unsigned int core_id)
/* if out of lpm, we need to do reverse steps */ /* if out of lpm, we need to do reverse steps */
void imx_set_cpu_lpm(unsigned int core_id, bool pdn) void imx_set_cpu_lpm(unsigned int core_id, bool pdn)
{ {
bakery_lock_get(&gpc_lock);
if (pdn) { if (pdn) {
/* enable the core WFI PDN & IRQ PUP */ /* enable the core WFI PDN & IRQ PUP */
mmio_setbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id) | mmio_setbits_32(IMX_GPC_BASE + LPCR_A53_AD, COREx_WFI_PDN(core_id) |
@ -42,6 +49,8 @@ void imx_set_cpu_lpm(unsigned int core_id, bool pdn)
/* deassert the pcg pcr bit of the core */ /* deassert the pcg pcr bit of the core */
mmio_setbits_32(IMX_GPC_BASE + COREx_PGC_PCR(core_id), 0x1); mmio_setbits_32(IMX_GPC_BASE + COREx_PGC_PCR(core_id), 0x1);
} }
bakery_lock_release(&gpc_lock);
} }
void imx_pup_pdn_slot_config(int last_core, bool pdn) void imx_pup_pdn_slot_config(int last_core, bool pdn)

2
plat/imx/imx8m/include/gpc.h
View file

@ -54,6 +54,8 @@ struct imx_pwr_domain {
bool always_on; bool always_on;
}; };
DECLARE_BAKERY_LOCK(gpc_lock);
/* function declare */ /* function declare */
void imx_gpc_init(void); void imx_gpc_init(void);
void imx_set_cpu_secure_entry(unsigned int core_index, uintptr_t sec_entrypoint); void imx_set_cpu_secure_entry(unsigned int core_index, uintptr_t sec_entrypoint);