diff options
| author |   Mark Rutland <mark.rutland@arm.com> | 2017-03-09 16:50:51 +0000 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2017-03-22 18:38:09 +0000 |
| commit | b2d693ced214f808059d539b6cc0fe551d1bc0e4 (patch) | |
| tree | e46766dea89b5a47022890a0d5c2019b5fd5b6ff | |
| parent | KVM: arm64: Use common GICv3 sysreg definitions (diff) | |
| download | linux-dev-b2d693ced214f808059d539b6cc0fe551d1bc0e4.tar.xz linux-dev-b2d693ced214f808059d539b6cc0fe551d1bc0e4.zip | |
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
| -rw-r--r-- | arch/arm64/kvm/sys_regs.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 1f3062bfa071..860707fdb912 100644 --- 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), |