From 155d01ff1eea98fbec128688eedbefc8a6b798af Mon Sep 17 00:00:00 2001 From: Marcin Wojtas Date: Thu, 16 Nov 2017 18:19:02 +0100 Subject: [PATCH] marvell: pm: do not panic by default in cpu_standby Current default behavior of cpu_standby callback is problematic during the SBSA test, which is unable to run due to EL3 panic. Make it dependent on the PM firmware running. Change-Id: I7a53de8c880bd23b157dd65ce14bb48b5a5c76c8 Signed-off-by: Marcin Wojtas Reviewed-by: Grzegorz Jaszczyk Reviewed-by: Kostya Porotchkin --- plat/marvell/a8k/common/plat_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plat/marvell/a8k/common/plat_pm.c b/plat/marvell/a8k/common/plat_pm.c index ec4b55b3..0c74b2fe 100644 --- a/plat/marvell/a8k/common/plat_pm.c +++ b/plat/marvell/a8k/common/plat_pm.c @@ -379,8 +379,10 @@ static int a8k_validate_power_state(unsigned int power_state, */ static void a8k_cpu_standby(plat_local_state_t cpu_state) { - ERROR("%s: needs to be implemented\n", __func__); - panic(); + if (!is_pm_fw_running()) { + ERROR("%s: needs to be implemented\n", __func__); + panic(); + } } /***************************************************************************** -- 2.30.2