KVM: arm64: Use common physical timer sysreg definitions

Now that we have common definitions for the physical timer control
registers, make the KVM code use these, simplifying the sys_reg_descs
table.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: kvmarm@lists.cs.columbia.edu

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 1f3062b..860707f 100644 (file)
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -1016,15 +1016,9 @@ static const struct sys_reg_desc sys_reg_descs[] = {
        { Op0(0b11), Op1(0b011), CRn(0b1101), CRm(0b0000), Op2(0b011),
          NULL, reset_unknown, TPIDRRO_EL0 },
 
-       /* CNTP_TVAL_EL0 */
-       { Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b000),
-         access_cntp_tval },
-       /* CNTP_CTL_EL0 */
-       { Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b001),
-         access_cntp_ctl },
-       /* CNTP_CVAL_EL0 */
-       { Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b010),
-         access_cntp_cval },
+       { SYS_DESC(SYS_CNTP_TVAL_EL0), access_cntp_tval },
+       { SYS_DESC(SYS_CNTP_CTL_EL0), access_cntp_ctl },
+       { SYS_DESC(SYS_CNTP_CVAL_EL0), access_cntp_cval },
 
        /* PMEVCNTRn_EL0 */
        PMU_PMEVCNTR_EL0(0),