From: Marc Zyngier <marc.zyngier@arm.com> To: Christoffer Dall <christoffer.dall@linaro.org> Cc: kvm@vger.kernel.org, Mark Rutland <marc.rutland@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/21] arm64: add macros to read/write system registers Date: Mon, 16 Nov 2015 13:11:39 +0000 [thread overview] Message-ID: <1447679519-17888-2-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1447679519-17888-1-git-send-email-marc.zyngier@arm.com> From: Mark Rutland <mark.rutland@arm.com> Rather than crafting custom macros for reading/writing each system register provide generics accessors, read_sysreg and write_sysreg, for this purpose. Unlike read_cpuid, calls to read_exception_reg are never expected to be optimized away or replaced with synthetic values. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Suzuki Poulose <suzuki.poulose@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/include/asm/sysreg.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index d48ab5b..c9c283a 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -20,6 +20,8 @@ #ifndef __ASM_SYSREG_H #define __ASM_SYSREG_H +#include <linux/stringify.h> + #include <asm/opcodes.h> /* @@ -208,6 +210,8 @@ #else +#include <linux/types.h> + asm( " .irp num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" " .equ __reg_num_x\\num, \\num\n" @@ -232,6 +236,19 @@ static inline void config_sctlr_el1(u32 clear, u32 set) val |= set; asm volatile("msr sctlr_el1, %0" : : "r" (val)); } + +#define read_sysreg(r) ({ \ + u64 __val; \ + asm volatile("mrs %0, " __stringify(r) : "=r" (__val)); \ + __val; \ +}) + +#define write_sysreg(v, r) do { \ + u64 __val = (u64)v; \ + asm volatile("msr " __stringify(r) ", %0" \ + : : "r" (__val)); \ +} while (0) + #endif #endif /* __ASM_SYSREG_H */ -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/21] arm64: add macros to read/write system registers Date: Mon, 16 Nov 2015 13:11:39 +0000 [thread overview] Message-ID: <1447679519-17888-2-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1447679519-17888-1-git-send-email-marc.zyngier@arm.com> From: Mark Rutland <mark.rutland@arm.com> Rather than crafting custom macros for reading/writing each system register provide generics accessors, read_sysreg and write_sysreg, for this purpose. Unlike read_cpuid, calls to read_exception_reg are never expected to be optimized away or replaced with synthetic values. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Suzuki Poulose <suzuki.poulose@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/include/asm/sysreg.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index d48ab5b..c9c283a 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -20,6 +20,8 @@ #ifndef __ASM_SYSREG_H #define __ASM_SYSREG_H +#include <linux/stringify.h> + #include <asm/opcodes.h> /* @@ -208,6 +210,8 @@ #else +#include <linux/types.h> + asm( " .irp num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" " .equ __reg_num_x\\num, \\num\n" @@ -232,6 +236,19 @@ static inline void config_sctlr_el1(u32 clear, u32 set) val |= set; asm volatile("msr sctlr_el1, %0" : : "r" (val)); } + +#define read_sysreg(r) ({ \ + u64 __val; \ + asm volatile("mrs %0, " __stringify(r) : "=r" (__val)); \ + __val; \ +}) + +#define write_sysreg(v, r) do { \ + u64 __val = (u64)v; \ + asm volatile("msr " __stringify(r) ", %0" \ + : : "r" (__val)); \ +} while (0) + #endif #endif /* __ASM_SYSREG_H */ -- 2.1.4
next prev parent reply other threads:[~2015-11-16 13:11 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-16 13:11 [PATCH 00/21] arm64: KVM: world switch in C Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier [this message] 2015-11-16 13:11 ` [PATCH 01/21] arm64: add macros to read/write system registers Marc Zyngier 2015-11-16 13:11 ` [PATCH 02/21] arm64: KVM: Add a HYP-specific header file Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 03/21] arm64: KVM: Implement vgic-v2 save/restore Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-20 15:22 ` Steve Capper 2015-11-20 15:22 ` Steve Capper 2015-11-20 15:54 ` Marc Zyngier 2015-11-20 15:54 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 04/21] arm64: KVM: Implement vgic-v3 save/restore Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-20 16:48 ` Steve Capper 2015-11-20 16:48 ` Steve Capper 2015-11-20 17:41 ` Marc Zyngier 2015-11-20 17:41 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 05/21] arm64: KVM: Implement timer save/restore Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-23 10:47 ` Steve Capper 2015-11-23 10:47 ` Steve Capper 2015-11-25 8:23 ` Marc Zyngier 2015-11-25 8:23 ` Marc Zyngier 2015-11-25 8:23 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 06/21] arm64: KVM: Implement system register save/restore Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 07/21] arm64: KVM: Implement 32bit " Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 08/21] arm64: KVM: Implement debug save/restore Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 09/21] arm64: KVM: Implement guest entry Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 10/21] arm64: KVM: Add patchable function selector Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 11/21] arm64: KVM: Implement the core world switch Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-24 17:29 ` Alex Bennée 2015-11-24 17:29 ` Alex Bennée 2015-11-24 17:40 ` Marc Zyngier 2015-11-24 17:40 ` Marc Zyngier 2015-11-24 17:40 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 12/21] arm64: KVM: Implement fpsimd save/restore Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-17 11:13 ` Steve Capper 2015-11-17 11:13 ` Steve Capper 2015-11-17 11:25 ` Marc Zyngier 2015-11-17 11:25 ` Marc Zyngier 2015-11-17 11:49 ` Steve Capper 2015-11-17 11:49 ` Steve Capper 2015-11-17 11:56 ` Marc Zyngier 2015-11-17 11:56 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 13/21] arm64: KVM: Implement TLB handling Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 14/21] arm64: KVM: HYP mode entry points Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 15/21] arm64: KVM: Add panic handling Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 14:16 ` Mark Rutland 2015-11-16 14:16 ` Mark Rutland 2015-11-16 14:26 ` Marc Zyngier 2015-11-16 14:26 ` Marc Zyngier 2015-11-16 14:32 ` Mark Rutland 2015-11-16 14:32 ` Mark Rutland 2015-11-16 14:44 ` Marc Zyngier 2015-11-16 14:44 ` Marc Zyngier 2015-11-16 15:53 ` Ard Biesheuvel 2015-11-16 15:53 ` Ard Biesheuvel 2015-11-16 16:57 ` Marc Zyngier 2015-11-16 16:57 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 16/21] arm64: KVM: Add compatibility aliases Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 17/21] arm64: KVM: Map the kernel RO section into HYP Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 14:27 ` Mark Rutland 2015-11-16 14:27 ` Mark Rutland 2015-11-16 14:43 ` Marc Zyngier 2015-11-16 14:43 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 18/21] arm64: KVM: Move away from the assembly version of the world switch Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 19/21] arm64: KVM: Turn system register numbers to an enum Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 20/21] arm64: KVM: Cleanup asm-offset.c Marc Zyngier 2015-11-16 13:11 ` Marc Zyngier 2015-11-16 13:11 ` [PATCH 21/21] arm64: KVM: Remove weak attributes Marc Zyngier 2015-11-16 13:11 ` 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=1447679519-17888-2-git-send-email-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.rutland@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.