From 8744162a0e942c1bd12e0abddc947dd9dfd50b89 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Mon, 28 Jun 2021 09:25:27 +0800 Subject: [PATCH] arch: gic: Change restoring order of GICR register If GICR_CTLR is restored before GICR_PROPBASER and GICR_PENDBASER, the restoring of the latter registers will fail, as the LPI enable bit is already set in GICR_CTLR. Therefore, in this commit, the order of restoring GICR registers is changed. Signed-off-by: Jianyong Wu --- arch/src/aarch64/gic/redist_regs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/src/aarch64/gic/redist_regs.rs b/arch/src/aarch64/gic/redist_regs.rs index d730891f4..d886ea646 100644 --- a/arch/src/aarch64/gic/redist_regs.rs +++ b/arch/src/aarch64/gic/redist_regs.rs @@ -62,11 +62,11 @@ macro_rules! VGIC_RDIST_REG { // List with relevant distributor registers that we will be restoring. static VGIC_RDIST_REGS: &'static [RdistReg] = &[ - VGIC_RDIST_REG!(GICR_CTLR, 4), VGIC_RDIST_REG!(GICR_STATUSR, 4), VGIC_RDIST_REG!(GICR_WAKER, 4), VGIC_RDIST_REG!(GICR_PROPBASER, 8), VGIC_RDIST_REG!(GICR_PENDBASER, 8), + VGIC_RDIST_REG!(GICR_CTLR, 4), ]; // List with relevant distributor registers that we will be restoring.