FAILED: patch "[PATCH] arm/arm64: smccc: Make function identifiers an unsigned" failed to apply to 4.15-stable tree
[email protected]
maintainerThe patch below does not apply to the 4.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
ded4c39e93f3b72968fdb79baba27f3b83dad34cMon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Tue, 6 Feb 2018 17:56:18 +0000
Subject: [PATCH] arm/arm64: smccc: Make function identifiers an unsigned
quantity
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.
include/linux/arm-smccc.h +4 -2
@@ -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
Hi Greg,
Quoted 5 lines · On 19/02/18 16:28, [email protected] wrote:
The patch below does not apply to the 4.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Looks like this change is already present in the 4.14.y and 4.15.y trees (as 37dc3e6c117e and 5fa82723fa1b respectively) by virtue of the explicit security series backports, so all seems good.
Robin.
Quoted 53 lines
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From
ded4c39e93f3b72968fdb79baba27f3b83dad34cMon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Tue, 6 Feb 2018 17:56:18 +0000
Subject: [PATCH] arm/arm64: smccc: Make function identifiers an unsigned
quantityFunction identifiers are a 32bit, unsigned quantity. But we never tell so to the compiler, resulting in the following:
4ac:
b26187e0mov x0, #0xffffffff80000001We thus rely on the firmware narrowing it for us, which is not always a reasonable expectation.
Reported-by Ard Biesheuvel <[email protected]>Acked-by Ard Biesheuvel <[email protected]>Reviewed-by Robin Murphy <[email protected]>Tested-by Ard Biesheuvel <[email protected]>Signed-off-by Marc Zyngier <[email protected]>Signed-off-by Catalin Marinas <[email protected]>include/linux/arm-smccc.h +4
-2@@ -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