diff options
| author |   Mark Rutland <mark.rutland@arm.com> | 2017-01-20 18:02:39 +0000 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2017-03-22 18:38:01 +0000 |
| commit | e804d208979db63be87305fac6e659162d719d97 (patch) | |
| tree | 86cc95694d3f8d162100a15ee521c3dd7881b5c1 | |
| parent | KVM: arm64: Use common performance monitor sysreg definitions (diff) | |
| download | linux-dev-e804d208979db63be87305fac6e659162d719d97.tar.xz linux-dev-e804d208979db63be87305fac6e659162d719d97.zip | |
KVM: arm64: Use common GICv3 sysreg definitions
Now that we have common definitions for the GICv3 register encodings,
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 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 63b0785ec325..1f3062bfa071 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -973,12 +973,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { { Op0(0b11), Op1(0b000), CRn(0b1100), CRm(0b0000), Op2(0b000), NULL, reset_val, VBAR_EL1, 0 }, - /* ICC_SGI1R_EL1 */ - { Op0(0b11), Op1(0b000), CRn(0b1100), CRm(0b1011), Op2(0b101), - access_gic_sgi }, - /* ICC_SRE_EL1 */ - { Op0(0b11), Op1(0b000), CRn(0b1100), CRm(0b1100), Op2(0b101), - access_gic_sre }, + { SYS_DESC(SYS_ICC_SGI1R_EL1), access_gic_sgi }, + { SYS_DESC(SYS_ICC_SRE_EL1), access_gic_sre }, /* CONTEXTIDR_EL1 */ { Op0(0b11), Op1(0b000), CRn(0b1101), CRm(0b0000), Op2(0b001), |