KVM: arm64: Migrate _elx sysreg accessors to msr_s/mrs_s

Currently, the {read,write}_sysreg_el*() accessors for accessing
particular ELs' sysregs in the presence of VHE rely on some local
hacks and define their system register encodings in a way that is
inconsistent with the core definitions in <asm/sysreg.h>.

As a result, it is necessary to add duplicate definitions for any
system register that already needs a definition in sysreg.h for
other reasons.

This is a bit of a maintenance headache, and the reasons for the
_el*() accessors working the way they do is a bit historical.

This patch gets rid of the shadow sysreg definitions in
<asm/kvm_hyp.h>, converts the _el*() accessors to use the core
__msr_s/__mrs_s interface, and converts all call sites to use the
standard sysreg #define names (i.e., upper case, with SYS_ prefix).

This patch will conflict heavily anyway, so the opportunity
to clean up some bad whitespace in the context of the changes is
taken.

The change exposes a few system registers that have no sysreg.h
definition, due to msr_s/mrs_s being used in place of msr/mrs:
additions are made in order to fill in the gaps.

Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoffer Dall <christoffer.dall@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Link: https://www.spinics.net/lists/kvm-arm/msg31717.html
[Rebased to v4.21-rc1]
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
[Rebased to v5.2-rc5, changelog updates]
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 1be486d5d7cb..e2bb5bd60227 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -237,10 +237,10 @@ static bool kvm_timer_should_fire(struct arch_timer_context *timer_ctx)
 
                 switch (index) {
                 case TIMER_VTIMER:
-                        cnt_ctl = read_sysreg_el0(cntv_ctl);
+                        cnt_ctl = read_sysreg_el0(SYS_CNTV_CTL);
                         break;
                 case TIMER_PTIMER:
-                        cnt_ctl = read_sysreg_el0(cntp_ctl);
+                        cnt_ctl = read_sysreg_el0(SYS_CNTP_CTL);
                         break;
                 case NR_KVM_TIMERS:
                         /* GCC is braindead */
@@ -350,20 +350,20 @@ static void timer_save_state(struct arch_timer_context *ctx)
 
         switch (index) {
         case TIMER_VTIMER:
-                ctx->cnt_ctl = read_sysreg_el0(cntv_ctl);
-                ctx->cnt_cval = read_sysreg_el0(cntv_cval);
+                ctx->cnt_ctl = read_sysreg_el0(SYS_CNTV_CTL);
+                ctx->cnt_cval = read_sysreg_el0(SYS_CNTV_CVAL);
 
                 /* Disable the timer */
-                write_sysreg_el0(0, cntv_ctl);
+                write_sysreg_el0(0, SYS_CNTV_CTL);
                 isb();
 
                 break;
         case TIMER_PTIMER:
-                ctx->cnt_ctl = read_sysreg_el0(cntp_ctl);
-                ctx->cnt_cval = read_sysreg_el0(cntp_cval);
+                ctx->cnt_ctl = read_sysreg_el0(SYS_CNTP_CTL);
+                ctx->cnt_cval = read_sysreg_el0(SYS_CNTP_CVAL);
 
                 /* Disable the timer */
-                write_sysreg_el0(0, cntp_ctl);
+                write_sysreg_el0(0, SYS_CNTP_CTL);
                 isb();
 
                 break;
@@ -429,14 +429,14 @@ static void timer_restore_state(struct arch_timer_context *ctx)
 
         switch (index) {
         case TIMER_VTIMER:
-                write_sysreg_el0(ctx->cnt_cval, cntv_cval);
+                write_sysreg_el0(ctx->cnt_cval, SYS_CNTV_CVAL);
                 isb();
-                write_sysreg_el0(ctx->cnt_ctl, cntv_ctl);
+                write_sysreg_el0(ctx->cnt_ctl, SYS_CNTV_CTL);
                 break;
         case TIMER_PTIMER:
-                write_sysreg_el0(ctx->cnt_cval, cntp_cval);
+                write_sysreg_el0(ctx->cnt_cval, SYS_CNTP_CVAL);
                 isb();
-                write_sysreg_el0(ctx->cnt_ctl, cntp_ctl);
+                write_sysreg_el0(ctx->cnt_ctl, SYS_CNTP_CTL);
                 break;
         case NR_KVM_TIMERS:
                 BUG();