4.9-stable review patch. If anyone has any objections, please let me know.
------------------ From: Mark Rutland <mark.rutl...@arm.com> From: Marc Zyngier <marc.zyng...@arm.com> commit ded4c39e93f3b72968fdb79baba27f3b83dad34c upstream. Function identifiers are a 32bit, unsigned quantity. But we never tell so to the compiler, resulting in the following: 4ac: b26187e0 mov x0, #0xffffffff80000001 We thus rely on the firmware narrowing it for us, which is not always a reasonable expectation. Cc: sta...@vger.kernel.org Reported-by: Ard Biesheuvel <ard.biesheu...@linaro.org> Acked-by: Ard Biesheuvel <ard.biesheu...@linaro.org> Reviewed-by: Robin Murphy <robin.mur...@arm.com> Tested-by: Ard Biesheuvel <ard.biesheu...@linaro.org> Signed-off-by: Marc Zyngier <marc.zyng...@arm.com> Signed-off-by: Catalin Marinas <catalin.mari...@arm.com> Signed-off-by: Mark Rutland <mark.rutl...@arm.com> [v4.9 backport] Tested-by: Greg Hackmann <ghackm...@google.com> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- include/linux/arm-smccc.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -14,14 +14,16 @@ #ifndef __LINUX_ARM_SMCCC_H #define __LINUX_ARM_SMCCC_H +#include <uapi/linux/const.h> + /* * This file provides common defines for ARM SMC Calling Convention as * specified in * http://infocenter.arm.com/help/topic/com.arm.doc.den0028a/index.html */ -#define ARM_SMCCC_STD_CALL 0 -#define ARM_SMCCC_FAST_CALL 1 +#define ARM_SMCCC_STD_CALL _AC(0,U) +#define ARM_SMCCC_FAST_CALL _AC(1,U) #define ARM_SMCCC_TYPE_SHIFT 31 #define ARM_SMCCC_SMC_32 0
