diff options
| author | Vijaya Kumar K <Vijaya.Kumar@cavium.com> | 2017-01-26 09:20:50 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2017-01-30 08:47:21 -0500 |
| commit | 5fb247d79c04240dce86c842976cde1edde7f7ed (patch) | |
| tree | fda4912879bccc3e4de9ada612c3041f4e938135 /include | |
| parent | 5c34153704898ed7ec0f8c0dceb651cbe4b713fd (diff) | |
KVM: arm/arm64: vgic: Introduce VENG0 and VENG1 fields to vmcr struct
ICC_VMCR_EL2 supports virtual access to ICC_IGRPEN1_EL1.Enable
and ICC_IGRPEN0_EL1.Enable fields. Add grpen0 and grpen1 member
variables to struct vmcr to support read and write of these fields.
Also refactor vgic_set_vmcr and vgic_get_vmcr() code.
Drop ICH_VMCR_CTLR_SHIFT and ICH_VMCR_CTLR_MASK macros and instead
use ICH_VMCR_EOI* and ICH_VMCR_CBPR* macros.
Signed-off-by: Vijaya Kumar K <Vijaya.Kumar@cavium.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip/arm-gic-v3.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 7f6d904a62c6..170e00a40826 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h | |||
| @@ -404,8 +404,6 @@ | |||
| 404 | #define ICH_HCR_EN (1 << 0) | 404 | #define ICH_HCR_EN (1 << 0) |
| 405 | #define ICH_HCR_UIE (1 << 1) | 405 | #define ICH_HCR_UIE (1 << 1) |
| 406 | 406 | ||
| 407 | #define ICH_VMCR_CTLR_SHIFT 0 | ||
| 408 | #define ICH_VMCR_CTLR_MASK (0x21f << ICH_VMCR_CTLR_SHIFT) | ||
| 409 | #define ICH_VMCR_CBPR_SHIFT 4 | 407 | #define ICH_VMCR_CBPR_SHIFT 4 |
| 410 | #define ICH_VMCR_CBPR_MASK (1 << ICH_VMCR_CBPR_SHIFT) | 408 | #define ICH_VMCR_CBPR_MASK (1 << ICH_VMCR_CBPR_SHIFT) |
| 411 | #define ICH_VMCR_EOIM_SHIFT 9 | 409 | #define ICH_VMCR_EOIM_SHIFT 9 |