Re: [PATCH v9 2/8] arm: snapdragon: Guard PSCI functions with CONFIG_ARM_SMCCC

[Balaji Selvanathan <balaji.selvanathan@oss.qualcomm.com>]

Hi Casey,

On 11/6/2026 10:15 PM, Casey Connolly wrote:
>
> On 21/10/2026 19:35, Tom Rini wrote:
>> On Wed, Oct 21, 2026 at 09:48:21PM +0530, Balaji Selvanathan wrote:
>>
>>> In snagboot mode, U-Boot is loaded directly by XBL without PSCI
>>> firmware support. The functions show_psci_version() and
>>> qcom_psci_fixup() call arm_smccc_smc() which is unavailable when
>>> CONFIG_ARM_SMCCC is disabled, causing build failures.
>>>
>>> Hence, added CONFIG_ARM_SMCCC guards to both functions.
>>>
>>> Signed-off-by: Balaji Selvanathan <balaji.selvanathan@oss.qualcomm.com>
>>> ---
>>> Changes in v7:
>>> - No changes
>>>
>>> Changes in v5:
>>> - No changes
>>>
>>> Changes in v4:
>>> - No changes
>>>
>>> Changes in v3:
>>> - Added CONFIG_ARM_SMCCC guards
>>>
>>> Changes in v2:
>>> - Newly introduced in v2
>>> ---
>>>   arch/arm/mach-snapdragon/board.c | 6 ++++++
>>>   1 file changed, 6 insertions(+)
>>>
>>> diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
>>> index 87adb100edd..daee2ed4fa0 100644
>>> --- a/arch/arm/mach-snapdragon/board.c
>>> +++ b/arch/arm/mach-snapdragon/board.c
>>> @@ -35,6 +35,9 @@ static void show_psci_version(void)
>>>   {
>>>   	struct arm_smccc_res res;
>>>   
>>> +	if (!IS_ENABLED(CONFIG_ARM_SMCCC))
>>> +		return;
>>> +
>>>   	arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res);
>>>   
>>>   	/* Some older SoCs like MSM8916 don't always support PSCI */
>>> @@ -58,6 +61,9 @@ static void qcom_psci_fixup(void *fdt)
>>>   	int offset, ret;
>>>   	struct arm_smccc_res res;
>>>   
>>> +	if (!IS_ENABLED(CONFIG_ARM_SMCCC))
>>> +		return;
>>> +
>>>   	arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res);
>>>   
>>>   	if ((int)res.a0 != PSCI_RET_NOT_SUPPORTED)
>>>
>> Do we even need this, patch 1 of the series disables SYSRESET_PSCI when
>> you're doing this special snagboot mode so we shouldn't be calling
>> show_psci_version at all.
> Somehow this show_psci_version() function has managed to stick around
> mach-snapdragon since before I took over, I'm not sure why it's here, it
> can certainly be dropped.
>
> The second hunk unfortunately seems necessary still.>

We moved to v10 for this series: 
https://lore.kernel.org/u-boot/20261101-snagboot-v10-0-e73d5cfedb8a@oss.qualcomm.com/

In v10, this patch is removed as SYSRESET_PSCI is disabled if 
QCOM_SNAGBOOT_MODE is enabled (in patch1), so psci functions will not 
execute.

Thanks,

Balaji

>