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

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

Posted by Philippe Mathieu-Daudé 1 week, 6 days ago

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.

Cc: qemu-stable@nongnu.org
Fixes: 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
---
 hw/intc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
index 097de4efc5d..05e697967d0 100644
--- a/hw/intc/Kconfig
+++ b/hw/intc/Kconfig
@@ -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
 
-- 
2.53.0

Re: [PATCH] hw/intc/arm_gicv3: Have GIC kconfig select GICv3 for HVF and WHPX

Posted by Peter Maydell 1 week, 1 day ago

On Wed, 12 Aug 2026 at 23:08, Philippe Mathieu-Daudé
<philmd@oss.qualcomm.com> wrote:
>
> 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.
>
> Cc: qemu-stable@nongnu.org
> Fixes: 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
> ---



Applied to target-arm.next, thanks.

-- PMM

Re: [PATCH] hw/intc/arm_gicv3: Have GIC kconfig select GICv3 for HVF and WHPX

Posted by Peter Maydell 1 week, 3 days ago

On Wed, 12 Aug 2026 at 23:08, Philippe Mathieu-Daudé
<philmd@oss.qualcomm.com> wrote:
>
> 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.
>
> Cc: qemu-stable@nongnu.org
> Fixes: 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
> ---
>  hw/intc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
> index 097de4efc5d..05e697967d0 100644
> --- a/hw/intc/Kconfig
> +++ b/hw/intc/Kconfig
> @@ -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

Re: [PATCH] hw/intc/arm_gicv3: Have GIC kconfig select GICv3 for HVF and WHPX

Posted by Philippe Mathieu-Daudé 1 week, 2 days ago

On 15/8/26 16:53, Peter Maydell wrote:
> On Wed, 12 Aug 2026 at 23:08, Philippe Mathieu-Daudé
> <philmd@oss.qualcomm.com> wrote:
>>
>> 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.
>>
>> Cc: qemu-stable@nongnu.org
>> Fixes: 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
>> ---
>>   hw/intc/Kconfig | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
>> index 097de4efc5d..05e697967d0 100644
>> --- a/hw/intc/Kconfig
>> +++ b/hw/intc/Kconfig
>> @@ -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?

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.

Re: [PATCH] hw/intc/arm_gicv3: Have GIC kconfig select GICv3 for HVF and WHPX

Posted by Peter Maydell 1 week, 2 days ago

On Sun, 16 Aug 2026 at 09:52, Philippe Mathieu-Daudé
<philmd@oss.qualcomm.com> wrote:
>
> On 15/8/26 16:53, Peter Maydell wrote:
> > On Wed, 12 Aug 2026 at 23:08, Philippe Mathieu-Daudé
> > <philmd@oss.qualcomm.com> wrote:
> >>
> >> 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.
> >>
> >> Cc: qemu-stable@nongnu.org
> >> Fixes: 39a8c3941eb ("hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX")
> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
> >> ---
> >>   hw/intc/Kconfig | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
> >> index 097de4efc5d..05e697967d0 100644
> >> --- a/hw/intc/Kconfig
> >> +++ b/hw/intc/Kconfig
> >> @@ -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?
>
> Richard's patch only touch KVM, so we surely need both.

Thanks for clarifying.

> 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