]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
pmdomain: rockchip: Check if SMC could be handled by TA
authorShawn Lin <shawn.lin@rock-chips.com>
Wed, 19 Feb 2025 00:58:09 +0000 (08:58 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 19 Feb 2025 11:44:33 +0000 (12:44 +0100)
Non-existent trusted-firmware could lead to SMC calls into some unset
location, that breaks the system. Let's check that it's supported before
executing the SMC.

Reported-by: 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>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Steven Price <steven.price@arm.com>
Link: https://lore.kernel.org/r/1739926689-151827-1-git-send-email-shawn.lin@rock-chips.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/pmdomain/rockchip/pm-domains.c

index 49842f16f33d0aa2e1c826876e5ed1ec27200a10..27a5c68ff8ba0820ef7cb0c8695952da793fd0aa 100644 (file)
@@ -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)