Skip to content

Commit 7edf259

Browse files
committed
Merge tag 'smccc-updates-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/drivers
firmware: smccc: Update for v6.17 Just a single update extending arm_smccc_hypervisor_has_uuid() to support both SMC and HVC conduits, enabling UUID retrieval when Linux runs as the root partition under Microsoft Hypervisor (MSHV), where SMC is used. It leverages arm_smccc_1_1_invoke() to dynamically select the appropriate conduit, enhancing compatibility beyond just HVC. * tag 'smccc-updates-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: firmware: smccc: Support both smc and hvc conduits for getting hyp UUID Link: https://lore.kernel.org/r/20250709122615.1171419-1-sudeep.holla@arm.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 5f931b5 + 1733432 commit 7edf259

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

drivers/firmware/smccc/smccc.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,7 @@ bool arm_smccc_hypervisor_has_uuid(const uuid_t *hyp_uuid)
7272
struct arm_smccc_res res = {};
7373
uuid_t uuid;
7474

75-
if (arm_smccc_1_1_get_conduit() != SMCCC_CONDUIT_HVC)
76-
return false;
77-
78-
arm_smccc_1_1_hvc(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, &res);
75+
arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, &res);
7976
if (res.a0 == SMCCC_RET_NOT_SUPPORTED)
8077
return false;
8178

0 commit comments

Comments
 (0)