Commit 54723bb37feac347a169359536f3dff122cabca3
1 parent
8bf9a701e1
Exists in
smarct4x-processor-sdk-linux-03.00.00.04
and in
4 other branches
arm/arm64: KVM: Use appropriate define in VGIC reset code
We currently initialize the SGIs to be enabled in the VGIC code, but we use the VGIC_NR_PPIS define for this purpose, instead of the the more natural VGIC_NR_SGIS. Change this slightly confusing use of the defines. Note: This should have no functional change, as both names are defined to the number 16. Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Showing 1 changed file with 6 additions and 2 deletions Side-by-side Diff
virt/kvm/arm/vgic.c
| ... | ... | @@ -2128,8 +2128,12 @@ |
| 2128 | 2128 | break; |
| 2129 | 2129 | } |
| 2130 | 2130 | |
| 2131 | - for (i = 0; i < dist->nr_irqs; i++) { | |
| 2132 | - if (i < VGIC_NR_PPIS) | |
| 2131 | + /* | |
| 2132 | + * Enable all SGIs and configure all private IRQs as | |
| 2133 | + * edge-triggered. | |
| 2134 | + */ | |
| 2135 | + for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) { | |
| 2136 | + if (i < VGIC_NR_SGIS) | |
| 2133 | 2137 | vgic_bitmap_set_irq_val(&dist->irq_enabled, |
| 2134 | 2138 | vcpu->vcpu_id, i, 1); |
| 2135 | 2139 | if (i < VGIC_NR_PRIVATE_IRQS) |