Skip to contentSkip to conversation

hw/intc/arm_gicv3: Have GIC kconfig select GICv3 for HVF and WHPX

PATCH Applied Philippe Mathieu-Daudé 2 participants 5 messages Aug 12 – Aug 17

lore
Share & tools
lore
#0 lore raw

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.

Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
---
 hw/intc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Kconfig +1 -1
index 097de4efc5d..05e697967d0 100644
@@ -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
#1 lore raw
Quoted 17 lines · Philippe Mathieu-Daudé

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.

Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
---
 hw/intc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Kconfig +0 -0
index 097de4efc5d..05e697967d0 100644

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

#2 lore raw
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 the Kconfig ARM_GIC symbol only selects GICv3 for TCG, not HVF and WHPX. Fix that.

Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
---
  hw/intc/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Kconfig +0 -0
index 097de4efc5d..05e697967d0 100644
@@ -26,7 +26,7 @@ config APIC
 
Quoted 9 lines

hw/intc/Kconfig config APIC · line 31

Quoted 6 lines
hw/intc/Kconfig +1 -1
  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?

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.

#3 lore raw
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 the Kconfig ARM_GIC symbol only selects GICv3 for TCG, not HVF and WHPX. Fix that.

Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
---
  hw/intc/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Kconfig +0 -0
index 097de4efc5d..05e697967d0 100644
@@ -26,7 +26,7 @@ config APIC
 
Quoted 9 lines

hw/intc/Kconfig config APIC · line 31

Quoted 6 lines
hw/intc/Kconfig +1 -1
  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?

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 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.

I definitely agree that what we have is confusing; I don't understand it either :-)

-- PMM

#4 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 9 lines · Philippe Mathieu-Daudé

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.

Fixes 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")

---

Applied to target-arm.next, thanks.

-- PMM