| Message ID | 20241227202435.48055-2-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hw/intc: Select generic ARM_GICV3 when KVM is not available | expand |
On Fri, 27 Dec 2024 at 21:24, Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > The TYPE_ARM_GICV3 model doesn't have any particular > dependency on TCG, remove it. Rename the Kconfig selector > ARM_GICV3_TCG -> ARM_GICV3. > > Fixes: a8a5546798c ("hw/intc/arm_gicv3: Introduce CONFIG_ARM_GIC_TCG > Kconfig selector") > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Phil Dennis-Jordan <phil@philjordan.eu> Tested-by: Phil Dennis-Jordan <phil@philjordan.eu> > --- > hw/intc/Kconfig | 6 +++--- > hw/intc/meson.build | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig > index dd405bdb5d2..7547528f2c2 100644 > --- a/hw/intc/Kconfig > +++ b/hw/intc/Kconfig > @@ -23,13 +23,13 @@ config APIC > > config ARM_GIC > bool > - select ARM_GICV3_TCG if TCG > + select ARM_GICV3 if TCG > select ARM_GIC_KVM if KVM > select MSI_NONBROKEN > > -config ARM_GICV3_TCG > +config ARM_GICV3 > bool > - depends on ARM_GIC && TCG > + depends on ARM_GIC > > config ARM_GIC_KVM > bool > diff --git a/hw/intc/meson.build b/hw/intc/meson.build > index 510fdfb6886..602da304b02 100644 > --- a/hw/intc/meson.build > +++ b/hw/intc/meson.build > @@ -6,7 +6,7 @@ system_ss.add(when: 'CONFIG_ARM_GIC', if_true: files( > 'arm_gicv3_common.c', > 'arm_gicv3_its_common.c', > )) > -system_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( > +system_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files( > 'arm_gicv3.c', > 'arm_gicv3_dist.c', > 'arm_gicv3_its.c', > @@ -39,7 +39,7 @@ endif > > specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', > 'apic_common.c')) > specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: > files('arm_gicv3_cpuif_common.c')) > -specific_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: > files('arm_gicv3_cpuif.c')) > +specific_ss.add(when: 'CONFIG_ARM_GICV3', if_true: > files('arm_gicv3_cpuif.c')) > specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: > files('arm_gic_kvm.c')) > specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: > files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) > specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) > -- > 2.47.1 > >
diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index dd405bdb5d2..7547528f2c2 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -23,13 +23,13 @@ config APIC config ARM_GIC bool - select ARM_GICV3_TCG if TCG + select ARM_GICV3 if TCG select ARM_GIC_KVM if KVM select MSI_NONBROKEN -config ARM_GICV3_TCG +config ARM_GICV3 bool - depends on ARM_GIC && TCG + depends on ARM_GIC config ARM_GIC_KVM bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 510fdfb6886..602da304b02 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -6,7 +6,7 @@ system_ss.add(when: 'CONFIG_ARM_GIC', if_true: files( 'arm_gicv3_common.c', 'arm_gicv3_its_common.c', )) -system_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( +system_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files( 'arm_gicv3.c', 'arm_gicv3_dist.c', 'arm_gicv3_its.c', @@ -39,7 +39,7 @@ endif specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c')) specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c')) -specific_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files('arm_gicv3_cpuif.c')) +specific_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c'))
The TYPE_ARM_GICV3 model doesn't have any particular dependency on TCG, remove it. Rename the Kconfig selector ARM_GICV3_TCG -> ARM_GICV3. Fixes: a8a5546798c ("hw/intc/arm_gicv3: Introduce CONFIG_ARM_GIC_TCG Kconfig selector") Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/intc/Kconfig | 6 +++--- hw/intc/meson.build | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)