Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

firmware: smccc: Fix check for ARCH_SOC_ID not implemented

The ARCH_FEATURES function ID is a 32-bit SMC call, which returns
a 32-bit result per the SMCCC spec. Current code is doing a 64-bit
comparison against -1 (SMCCC_RET_NOT_SUPPORTED) to detect that the
feature is unimplemented. That check doesn't work in a Hyper-V VM,
where the upper 32-bits are zero as allowed by the spec.

Cast the result as an 'int' so the comparison works. The change also
makes the code consistent with other similar checks in this file.

Fixes: 821b67fa4639 ("firmware: smccc: Add ARCH_SOC_ID support")
Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Michael Kelley and committed by
Arnd Bergmann
e95d8eae 4fd932a7

+1 -1
+1 -1
drivers/firmware/smccc/soc_id.c
··· 50 50 arm_smccc_1_1_invoke(ARM_SMCCC_ARCH_FEATURES_FUNC_ID, 51 51 ARM_SMCCC_ARCH_SOC_ID, &res); 52 52 53 - if (res.a0 == SMCCC_RET_NOT_SUPPORTED) { 53 + if ((int)res.a0 == SMCCC_RET_NOT_SUPPORTED) { 54 54 pr_info("ARCH_SOC_ID not implemented, skipping ....\n"); 55 55 return 0; 56 56 }