hw/intc/arm_gicv3: Have GIC kconfig select GICv3 for HVF and WHPX
PATCH 1/1 hw/intc/arm_gicv3: Have GIC kconfig select GICv3 for HVF and WHPX
While trying to fix the GICv3 dependency on KVM and WHPX in commit 39a8c3941eb, we missed the Kconfig ARM_GIC symbol only selects GICv3 for TCG, not HVF and WHPX. Fix that.
--- hw/intc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Kconfig +1 -1
@@ -26,7 +26,7 @@ config APIC config ARM_GIC bool - select ARM_GICV3 if TCG + select ARM_GICV3 if TCG || HVF || WHPX select ARM_GIC_KVM if KVM select MSI_NONBROKEN
Signature · 1 line
2.53.0
Quoted 17 lines · Philippe Mathieu-Daudé
While trying to fix the GICv3 dependency on KVM and WHPX in commit
39a8c3941eb, we missed theKconfigARM_GICsymbol only selects GICv3 for TCG, not HVF and WHPX. Fix that.Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/intc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/intc/Kconfig +0
-0
hw/intc/Kconfig config APIC · line 31
Quoted 7 lines
hw/intc/Kconfig +1
-1@@ -26,7 +26,7 @@ config APIC config ARM_GIC bool - select ARM_GICV3 if TCG + select ARM_GICV3 if TCG || HVF || WHPX select ARM_GIC_KVM if KVM select MSI_NONBROKEN
Is this instead of RTH's patch "hw/intc: Fix arm kvm gicv3 selection", or do we need both?
thanks
-- PMM
Quoted 20 lines · Peter Maydell
Quoted 18 lines · Philippe Mathieu-Daudé
While trying to fix the GICv3 dependency on KVM and WHPX in commit
39a8c3941eb, we missed theKconfigARM_GICsymbol only selects GICv3 for TCG, not HVF and WHPX. Fix that.Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/intc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/intc/Kconfig +0
-0@@ -26,7 +26,7 @@ config APIC
Quoted 9 lines
hw/intc/Kconfig config APIC · line 31
Quoted 6 lines
hw/intc/Kconfig +1
-1config ARM_GIC bool - select ARM_GICV3 if TCG + select ARM_GICV3 if TCG || HVF || WHPX select ARM_GIC_KVM if KVM select MSI_NONBROKENIs this instead of RTH's patch "hw/intc: Fix arm kvm gicv3 selection", or do we need both?
Richard's patch only touch KVM, so we surely need both.
I haven't tested KVM but rth's reported error is the same error I'm having on HVF and WHPX. The ARM GIC Kconfig are confuse to me, so I don't feel confident to review his change. My gut feeling is what we have is too complex and could be simplified, but I haven't spent time thinking about it.
Quoted 32 lines · Philippe Mathieu-Daudé
Quoted 20 lines · Peter Maydell
Quoted 18 lines · Philippe Mathieu-Daudé
While trying to fix the GICv3 dependency on KVM and WHPX in commit
39a8c3941eb, we missed theKconfigARM_GICsymbol only selects GICv3 for TCG, not HVF and WHPX. Fix that.Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/intc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/intc/Kconfig +0
-0@@ -26,7 +26,7 @@ config APICQuoted 9 lines
hw/intc/Kconfig config APIC · line 31
Quoted 6 lines
hw/intc/Kconfig +1
-1config ARM_GIC bool - select ARM_GICV3 if TCG + select ARM_GICV3 if TCG || HVF || WHPX select ARM_GIC_KVM if KVM select MSI_NONBROKENIs this instead of RTH's patch "hw/intc: Fix arm kvm gicv3 selection", or do we need both?
Quoted 1 line
Richard's patch only touch KVM, so we surely need both.
Thanks for clarifying.
Quoted 5 lines
I haven't tested KVM but rth's reported error is the same error I'm having on HVF and WHPX. The ARM GIC
Kconfigare confuse to me, so I don't feel confident to review his change. My gut feeling is what we have is too complex and could be simplified, but I haven't spent time thinking about it.
I definitely agree that what we have is confusing; I don't understand it either :-)
-- PMM
Peter Maydell
AppliedQuoted 9 lines · Philippe Mathieu-Daudé
While trying to fix the GICv3 dependency on KVM and WHPX in commit
39a8c3941eb, we missed theKconfigARM_GICsymbol only selects GICv3 for TCG, not HVF and WHPX. Fix that.Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Applied to target-arm.next, thanks.
-- PMM