Merge "intel: agilex: Fix psci power domain off" into integration

8911a32a · Soby Mathew · TrustedFirmware Code Review · 91624b7f · afac9681 · 8911a32a
Commit 8911a32a authored 5 years ago by Soby Mathew Committed by TrustedFirmware Code Review 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 8 deletions
+2 -8
--- a/plat/intel/soc/agilex/socfpga_psci.c
+++ b/plat/intel/soc/agilex/socfpga_psci.c
@@ -61,18 +61,12 @@ int socfpga_pwr_domain_on(u_register_t mpidr)
 ******************************************************************************/
 void socfpga_pwr_domain_off(const psci_power_state_t *target_state)
 {
-	unsigned int cpu_id = plat_my_core_pos();
-
 	for (size_t i = 0; i <= PLAT_MAX_PWR_LVL; i++)
 		VERBOSE("%s: target_state->pwr_domain_state[%lu]=%x\n",
 			__func__, i, target_state->pwr_domain_state[i]);

-	/* TODO: Prevent interrupts from spuriously waking up this cpu */
-	/* gicv2_cpuif_disable(); */
-
-	/* assert core reset */
-	mmio_setbits_32(AGX_RSTMGR_OFST + AGX_RSTMGR_MPUMODRST_OFST,
-		1 << cpu_id);
+	/* Prevent interrupts from spuriously waking up this cpu */
+	gicv2_cpuif_disable();
 }

 /*******************************************************************************