linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Shi <alex.shi@linaro.org>
To: Marc Zyngier <marc.zyngier@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	stable@vger.kernel.org, linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 42/52] arm/arm64: smccc: Make function identifiers an unsigned quantity
Date: Mon, 26 Feb 2018 16:20:16 +0800	[thread overview]
Message-ID: <1519633227-29832-43-git-send-email-alex.shi@linaro.org> (raw)
In-Reply-To: <1519633227-29832-1-git-send-email-alex.shi@linaro.org>

From: Marc Zyngier <marc.zyngier@arm.com>

commit ded4c39e93f3 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: 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>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Alex Shi <alex.shi@linaro.org>
---
 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 e1ef944..dd44d84 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.7.4

  parent reply	other threads:[~2018-02-26  8:30 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1519633227-29832-1-git-send-email-alex.shi@linaro.org>
2018-02-26  8:19 ` [PATCH 01/52] mm: Introduce lm_alias Alex Shi
2018-02-26  8:19 ` [PATCH 02/52] arm64: alternatives: apply boot time fixups via the linear mapping Alex Shi
2018-02-26  8:19 ` [PATCH 03/52] arm64: barrier: Add CSDB macros to control data-value prediction Alex Shi
2018-02-26  8:19 ` [PATCH 04/52] arm64: Implement array_index_mask_nospec() Alex Shi
2018-02-26  8:19 ` [PATCH 05/52] arm64: move TASK_* definitions to <asm/processor.h> Alex Shi
2018-02-26  8:19 ` [PATCH 06/52] arm64: Factor out PAN enabling/disabling into separate uaccess_* macros Alex Shi
2018-02-26  8:19 ` [PATCH 07/52] arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro Alex Shi
2018-02-26  8:19 ` [PATCH 08/52] arm64: uaccess: consistently check object sizes Alex Shi
2018-02-26  8:19 ` [PATCH 09/52] arm64: Make USER_DS an inclusive limit Alex Shi
2018-02-26  8:19 ` [PATCH 10/52] arm64: Use pointer masking to limit uaccess speculation Alex Shi
2018-02-26  8:19 ` [PATCH 11/52] arm64: syscallno is secretly an int, make it official Alex Shi
2018-02-26  8:19 ` [PATCH 12/52] arm64: entry: Ensure branch through syscall table is bounded under speculation Alex Shi
2018-02-26  8:19 ` [PATCH 13/52] arm64: uaccess: Prevent speculative use of the current addr_limit Alex Shi
2018-02-26  8:19 ` [PATCH 14/52] arm64: uaccess: Don't bother eliding access_ok checks in __{get, put}_user Alex Shi
2018-02-26  8:19 ` [PATCH 15/52] arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_user Alex Shi
2018-02-26  8:19 ` [PATCH 16/52] arm64: futex: Mask __user pointers prior to dereference Alex Shi
2018-02-26  8:19 ` [PATCH 17/52] drivers/firmware: Expose psci_get_version through psci_ops structure Alex Shi
2018-02-26  8:19 ` [PATCH 18/52] arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early Alex Shi
2018-02-26  8:19 ` [PATCH 19/52] arm64: cpu_errata: Allow an erratum to be match for all revisions of a core Alex Shi
2018-02-26  8:19 ` [PATCH 20/52] arm64: Run enable method for errata work arounds on late CPUs Alex Shi
2018-02-26  8:19 ` [PATCH 21/52] arm64: cpufeature: Pass capability structure to ->enable callback Alex Shi
2018-02-26  8:19 ` [PATCH 22/52] arm64: Move post_ttbr_update_workaround to C code Alex Shi
2018-02-26  8:19 ` [PATCH 23/52] arm64: Add skeleton to harden the branch predictor against aliasing attacks Alex Shi
2018-02-26  8:19 ` [PATCH 24/52] arm64: Move BP hardening to check_and_switch_context Alex Shi
2018-02-26  8:19 ` [PATCH 25/52] arm64: KVM: Use per-CPU vector when BP hardening is enabled Alex Shi
2018-02-26  8:20 ` [PATCH 26/52] arm64: entry: Apply BP hardening for high-priority synchronous exceptions Alex Shi
2018-02-26  8:20 ` [PATCH 27/52] arm64: entry: Apply BP hardening for suspicious interrupts from EL0 Alex Shi
2018-02-26  8:20 ` [PATCH 28/52] arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75 Alex Shi
2018-02-26  8:20 ` [PATCH 29/52] arm64: Implement branch predictor hardening for affected Cortex-A CPUs Alex Shi
2018-02-26  8:20 ` [PATCH 30/52] arm64: KVM: Increment PC after handling an SMC trap Alex Shi
2018-02-26  8:20 ` [PATCH 31/52] arm/arm64: KVM: Consolidate the PSCI include files Alex Shi
2018-02-26  8:20 ` [PATCH 32/52] arm/arm64: KVM: Add PSCI_VERSION helper Alex Shi
2018-02-26  8:20 ` [PATCH 33/52] arm/arm64: KVM: Add smccc accessors to PSCI code Alex Shi
2018-02-26  8:20 ` [PATCH 34/52] arm/arm64: KVM: Implement PSCI 1.0 support Alex Shi
2018-02-26  8:20 ` [PATCH 35/52] arm/arm64: KVM: Advertise SMCCC v1.1 Alex Shi
2018-02-26  8:20 ` [PATCH 36/52] arm64: KVM: Make PSCI_VERSION a fast path Alex Shi
2018-02-26  8:20 ` [PATCH 37/52] arm/arm64: KVM: Turn kvm_psci_version into a static inline Alex Shi
2018-02-26  8:20 ` [PATCH 38/52] arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support Alex Shi
2018-02-26  8:20 ` [PATCH 39/52] arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling Alex Shi
2018-02-26  8:20 ` [PATCH 40/52] firmware/psci: Expose PSCI conduit Alex Shi
2018-02-26  8:20 ` [PATCH 41/52] firmware/psci: Expose SMCCC version through psci_ops Alex Shi
2018-02-26  8:20 ` Alex Shi [this message]
2018-02-26  8:20 ` [PATCH 43/52] arm/arm64: smccc: Implement SMCCC v1.1 inline primitive Alex Shi
2018-02-26  8:20 ` [PATCH 44/52] arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support Alex Shi
2018-02-26  8:20 ` [PATCH 45/52] arm64: Kill PSCI_GET_VERSION as a variant-2 workaround Alex Shi
2018-02-26  8:20 ` [PATCH 46/52] arm: Add BTB invalidation on switch_mm for Cortex-A9, A12 and A17 Alex Shi
2018-02-26 10:05   ` Greg KH
2018-02-26 10:40     ` Alex Shi
2018-02-26 10:45       ` Will Deacon
2018-02-28  4:10         ` Alex Shi
2018-02-26  8:20 ` [PATCH 47/52] arm: Invalidate BTB on prefetch abort outside of user mapping on Cortex A8, A9, " Alex Shi
2018-02-26  8:20 ` [PATCH 48/52] arm: KVM: Invalidate BTB on guest exit for Cortex-A12/A17 Alex Shi
2018-02-26  8:20 ` [PATCH 49/52] arm: Add icache invalidation on switch_mm for Cortex-A15 Alex Shi
2018-02-26  8:20 ` [PATCH 50/52] arm: Invalidate icache on prefetch abort outside of user mapping on Cortex-A15 Alex Shi
2018-02-26  8:20 ` [PATCH 51/52] arm: KVM: Invalidate icache on guest exit for Cortex-A15 Alex Shi
2018-02-26  8:20 ` [PATCH 52/52] arm64: Add README describing the branch Alex Shi

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=1519633227-29832-43-git-send-email-alex.shi@linaro.org \
    --to=alex.shi@linaro.org \
    --cc=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=stable@vger.kernel.org \
    --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;
as well as URLs for NNTP newsgroup(s).