From: Marc Zyngier <marc.zyngier@arm.com>
To: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Peter Maydell <peter.maydell@linaro.org>,
Christoffer Dall <christoffer.dall@linaro.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Robin Murphy <robin.murphy@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Andrew Jones <drjones@redhat.com>,
Hanjun Guo <guohanjun@huawei.com>,
Jayachandran C <jnair@caviumnetworks.com>,
Jon Masters <jcm@redhat.com>,
Russell King - ARM Linux <linux@armlinux.org.uk>
Subject: [PATCH v4 14/17] arm/arm64: smccc: Make function identifiers an unsigned quantity
Date: Tue, 6 Feb 2018 17:56:18 +0000 [thread overview]
Message-ID: <20180206175621.929-15-marc.zyngier@arm.com> (raw)
In-Reply-To: <20180206175621.929-1-marc.zyngier@arm.com>
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: stable@vger.kernel.org
Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
include/linux/arm-smccc.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index e1ef944ef1da..dd44d8458c04 100644
--- 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
--
2.14.2
next prev parent reply other threads:[~2018-02-06 17:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 17:56 [PATCH v4 00/17] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 01/17] arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 02/17] arm: " Marc Zyngier
2018-02-07 8:32 ` Christoffer Dall
2018-02-06 17:56 ` [PATCH v4 03/17] arm64: KVM: Increment PC after handling an SMC trap Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 04/17] arm/arm64: KVM: Consolidate the PSCI include files Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 05/17] arm/arm64: KVM: Add PSCI_VERSION helper Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 06/17] arm/arm64: KVM: Add smccc accessors to PSCI code Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 07/17] arm/arm64: KVM: Implement PSCI 1.0 support Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 08/17] arm/arm64: KVM: Advertise SMCCC v1.1 Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 09/17] arm/arm64: KVM: Turn kvm_psci_version into a static inline Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 10/17] arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 11/17] arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 12/17] firmware/psci: Expose PSCI conduit Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 13/17] firmware/psci: Expose SMCCC version through psci_ops Marc Zyngier
2018-02-06 17:56 ` Marc Zyngier [this message]
2018-02-06 17:56 ` [PATCH v4 15/17] arm/arm64: smccc: Implement SMCCC v1.1 inline primitive Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 16/17] arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support Marc Zyngier
2018-02-06 17:56 ` [PATCH v4 17/17] arm64: Kill PSCI_GET_VERSION as a variant-2 workaround Marc Zyngier
2018-02-06 22:42 ` [PATCH v4 00/17] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Catalin Marinas
2018-02-15 20:59 ` Jon Masters
2018-02-15 21:28 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180206175621.929-15-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=drjones@redhat.com \
--cc=guohanjun@huawei.com \
--cc=jcm@redhat.com \
--cc=jnair@caviumnetworks.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=peter.maydell@linaro.org \
--cc=robin.murphy@arm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox