From 2a246d2e3284d853d1276b9495518aa52d8dba3c Mon Sep 17 00:00:00 2001 From: Dimitris Papastamos Date: Mon, 18 Jun 2018 13:01:06 +0100 Subject: CSS: Use SCMI AP core protocol to set the warm boot entrypoint Change-Id: Iaebbeac1a1d6fbd531e5694b95ed068b7a193e62 Signed-off-by: Dimitris Papastamos --- plat/arm/common/arm_pm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'plat/arm/common/arm_pm.c') diff --git a/plat/arm/common/arm_pm.c b/plat/arm/common/arm_pm.c index 4632099e..73d7106b 100644 --- a/plat/arm/common/arm_pm.c +++ b/plat/arm/common/arm_pm.c @@ -14,8 +14,9 @@ #include #include -/* Allow ARM Standard platforms to override this function */ +/* Allow ARM Standard platforms to override these functions */ #pragma weak plat_arm_psci_override_pm_ops +#pragma weak plat_arm_program_trusted_mailbox /* Standard ARM platforms are expected to export plat_arm_psci_pm_ops */ extern plat_psci_ops_t plat_arm_psci_pm_ops; @@ -192,11 +193,11 @@ void arm_system_pwr_domain_resume(void) } /******************************************************************************* - * Private function to program the mailbox for a cpu before it is released + * ARM platform function to program the mailbox for a cpu before it is released * from reset. This function assumes that the Trusted mail box base is within * the ARM_SHARED_RAM region ******************************************************************************/ -void arm_program_trusted_mailbox(uintptr_t address) +void plat_arm_program_trusted_mailbox(uintptr_t address) { uintptr_t *mailbox = (void *) PLAT_ARM_TRUSTED_MAILBOX_BASE; @@ -221,6 +222,6 @@ int plat_setup_psci_ops(uintptr_t sec_entrypoint, *psci_ops = plat_arm_psci_override_pm_ops(&plat_arm_psci_pm_ops); /* Setup mailbox with entry point. */ - arm_program_trusted_mailbox(sec_entrypoint); + plat_arm_program_trusted_mailbox(sec_entrypoint); return 0; } -- cgit v1.2.3