diff options
author | Raghavendra Rao Ananta <rananta@google.com> | 2021-10-07 23:34:26 +0000 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2021-10-17 11:15:51 +0100 |
commit | 272a067df3c89f6f2176a350f88661625a2c8b3b (patch) | |
tree | fa939b293662c647b24fffd664e1c98c3ec9be3e /tools/testing/selftests/kvm/include/aarch64/processor.h | |
parent | KVM: arm64: selftests: Add MMIO readl/writel support (diff) | |
download | wireguard-linux-272a067df3c89f6f2176a350f88661625a2c8b3b.tar.xz wireguard-linux-272a067df3c89f6f2176a350f88661625a2c8b3b.zip |
tools: arm64: Import sysreg.h
Bring-in the kernel's arch/arm64/include/asm/sysreg.h
into tools/ for arm64 to make use of all the standard
register definitions in consistence with the kernel.
Make use of the register read/write definitions from
sysreg.h, instead of the existing definitions. A syntax
correction is needed for the files that use write_sysreg()
to make it compliant with the new (kernel's) syntax.
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Oliver Upton <oupton@google.com>
Signed-off-by: Raghavendra Rao Ananta <rananta@google.com>
[maz: squashed two commits in order to keep the series bisectable]
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211007233439.1826892-3-rananta@google.com
Link: https://lore.kernel.org/r/20211007233439.1826892-4-rananta@google.com
Diffstat (limited to 'tools/testing/selftests/kvm/include/aarch64/processor.h')
-rw-r--r-- | tools/testing/selftests/kvm/include/aarch64/processor.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h index 96578bd46a85..7989e832cafb 100644 --- a/tools/testing/selftests/kvm/include/aarch64/processor.h +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h @@ -10,6 +10,7 @@ #include "kvm_util.h" #include <linux/stringify.h> #include <linux/types.h> +#include <asm/sysreg.h> #define ARM64_CORE_REG(x) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ @@ -119,18 +120,6 @@ void vm_install_exception_handler(struct kvm_vm *vm, void vm_install_sync_handler(struct kvm_vm *vm, int vector, int ec, handler_fn handler); -#define write_sysreg(reg, val) \ -({ \ - u64 __val = (u64)(val); \ - asm volatile("msr " __stringify(reg) ", %x0" : : "rZ" (__val)); \ -}) - -#define read_sysreg(reg) \ -({ u64 val; \ - asm volatile("mrs %0, "__stringify(reg) : "=r"(val) : : "memory");\ - val; \ -}) - #define isb() asm volatile("isb" : : : "memory") #define dsb(opt) asm volatile("dsb " #opt : : : "memory") #define dmb(opt) asm volatile("dmb " #opt : : : "memory") |