diff mbox series

pmdomain: rockchip: Check if smcc could be handled by TA

Message ID 1739926689-151827-1-git-send-email-shawn.lin@rock-chips.com
State New
Headers show
Series pmdomain: rockchip: Check if smcc could be handled by TA | expand

Commit Message

Shawn Lin Feb. 19, 2025, 12:58 a.m. UTC 
Non-existent trusted-firmware could lead smcc calls into some
unset location which breaks the system.

Reported-by: Steven Price <steven.price@arm.com>
Cc: Steven Price <steven.price@arm.com>
Suggested-by: Heiko Stuebner <heiko@sntech.de>
Fixes: 58ebba35ddab ("pmdomain: rockchip: Add smc call to inform firmware")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
Hi Ulf, this's a follow-up patch fixing the issue Steven saw.

 drivers/pmdomain/rockchip/pm-domains.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
index 49842f1..27a5c68 100644
--- a/drivers/pmdomain/rockchip/pm-domains.c
+++ b/drivers/pmdomain/rockchip/pm-domains.c
@@ -572,9 +572,10 @@  static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd,
 	}
 
 	/* Inform firmware to keep this pd on or off */
-	arm_smccc_smc(ROCKCHIP_SIP_SUSPEND_MODE, ROCKCHIP_SLEEP_PD_CONFIG,
-			pmu->info->pwr_offset + pd_pwr_offset,
-			pd->info->pwr_mask, on, 0, 0, 0, &res);
+	if (arm_smccc_1_1_get_conduit() != SMCCC_CONDUIT_NONE)
+		arm_smccc_smc(ROCKCHIP_SIP_SUSPEND_MODE, ROCKCHIP_SLEEP_PD_CONFIG,
+				pmu->info->pwr_offset + pd_pwr_offset,
+				pd->info->pwr_mask, on, 0, 0, 0, &res);
 }
 
 static int rockchip_pd_power(struct rockchip_pm_domain *pd, bool power_on)