Add plat_psci_cpu_resume cpu and entry point parameters
Add cpu and entry point parameters to PSCI resume function
called upon cold boot or CPU resume from off.
Change-Id: Ic1710e85297772210a3e52595a978cf949d409b1
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/inc/hf/arch/plat/psci.h b/inc/hf/arch/plat/psci.h
index d42cbc7..5cbef53 100644
--- a/inc/hf/arch/plat/psci.h
+++ b/inc/hf/arch/plat/psci.h
@@ -28,4 +28,4 @@
void plat_psci_cpu_suspend(uint32_t power_state);
/** Called when a CPU resumes from being off or suspended. */
-void plat_psci_cpu_resume(void);
+void plat_psci_cpu_resume(struct cpu *c, ipaddr_t entry_point);
diff --git a/src/arch/aarch64/hypervisor/cpu.c b/src/arch/aarch64/hypervisor/cpu.c
index f49a06b..fc4fd73 100644
--- a/src/arch/aarch64/hypervisor/cpu.c
+++ b/src/arch/aarch64/hypervisor/cpu.c
@@ -158,7 +158,7 @@
void arch_cpu_init(void)
{
- plat_psci_cpu_resume();
+ plat_psci_cpu_resume(NULL, ipa_init(0));
/*
* Linux expects LORegions to be disabled, hence if the current system
diff --git a/src/arch/aarch64/plat/psci/hypervisor.c b/src/arch/aarch64/plat/psci/hypervisor.c
index 9f1b5bf..d647bf3 100644
--- a/src/arch/aarch64/plat/psci/hypervisor.c
+++ b/src/arch/aarch64/plat/psci/hypervisor.c
@@ -55,6 +55,8 @@
(void)power_state;
}
-void plat_psci_cpu_resume(void)
+void plat_psci_cpu_resume(struct cpu *c, ipaddr_t entry_point)
{
+ (void)c;
+ (void)entry_point;
}
diff --git a/src/arch/aarch64/plat/psci/spmc.c b/src/arch/aarch64/plat/psci/spmc.c
index cc43ea3..fbee952 100644
--- a/src/arch/aarch64/plat/psci/spmc.c
+++ b/src/arch/aarch64/plat/psci/spmc.c
@@ -33,6 +33,8 @@
(void)power_state;
}
-void plat_psci_cpu_resume(void)
+void plat_psci_cpu_resume(struct cpu *c, ipaddr_t entry_point)
{
+ (void)c;
+ (void)entry_point;
}