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

fix(mt8188): refine gic init flow after system resume

Browse source 
Call gicv3_distif_init() instead of mt_gic_init() in
armv8_2_mcusys_pwr_on_common(). This is to prevent
gicv3_rdistif_init() and gicv3_cpuif_enable() from being called twice
in the power-on flow. gicv3_rdistif_init() and gicv3_cpuif_enable()
are called in later armv8_2_cpu_pwr_on_common().

BUG=b:244215539
TEST=Suspend Resume Test pass

Change-Id: Id752c1ccbb9eab277ed6278c2dd90a051a894146
Signed-off-by: Liju-Clr Chen <liju-clr.chen@mediatek.com>
This commit is contained in:
James Liao 2022-09-23 16:37:59 +08:00 • committed by Liju-Clr Chen
parent 600f168172
commit 210ebbb0a6
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plat/mediatek/lib/pm/armv8_2/pwr_ctrl.c
View file

@ -103,7 +103,7 @@ unsigned int armv8_2_get_pwr_afflv(const psci_power_state_t *state_info)
/* MediaTek mcusys power on control interface */ /* MediaTek mcusys power on control interface */
static void armv8_2_mcusys_pwr_on_common(const struct mtk_cpupm_pwrstate *state) static void armv8_2_mcusys_pwr_on_common(const struct mtk_cpupm_pwrstate *state)
{ {
mt_gic_init(); gicv3_distif_init();
mt_gic_distif_restore(); mt_gic_distif_restore();
gic_sgi_restore_all(); gic_sgi_restore_all();
@ -154,9 +154,8 @@ static void armv8_2_cpu_pwr_on_common(const struct mtk_cpupm_pwrstate *state, un
{ {
coordinate_cluster_pwron(); coordinate_cluster_pwron();
gicv3_rdistif_on(plat_my_core_pos()); gicv3_rdistif_init(plat_my_core_pos());
gicv3_cpuif_enable(plat_my_core_pos()); gicv3_cpuif_enable(plat_my_core_pos());
mt_gic_rdistif_init();
/* If MCUSYS has been powered down then restore GIC redistributor for all CPUs. */ /* If MCUSYS has been powered down then restore GIC redistributor for all CPUs. */
if (IS_PLAT_SYSTEM_RETENTION(state->pwr.afflv)) { if (IS_PLAT_SYSTEM_RETENTION(state->pwr.afflv)) {