testing/next: cirrus, docker, docs, ci, configs, gitlab

[PATCH 08/22] hw/arm: Select GICV3_TCG for sbsa-ref machine

Posted by Alex Bennée 2 years, 7 months ago

From: Fabiano Rosas <farosas@suse.de>

This machine hardcodes the creation of the interrupt controller, so
make sure the dependency is explicitly described in the Kconfig.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230208192654.8854-9-farosas@suse.de>
---
 hw/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index cec7898bb7..0cce0b8d5b 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -252,6 +252,7 @@ config SBSA_REF
     select PL061 # GPIO
     select USB_EHCI_SYSBUS
     select WDT_SBSA
+    select ARM_GICV3_TCG
 
 config SABRELITE
     bool
-- 
2.39.2

Re: [PATCH 08/22] hw/arm: Select GICV3_TCG for sbsa-ref machine

Posted by Paolo Bonzini 2 years, 7 months ago

On 5/3/23 11:12, Alex Bennée wrote:
> From: Fabiano Rosas<farosas@suse.de>
> 
> This machine hardcodes the creation of the interrupt controller, so
> make sure the dependency is explicitly described in the Kconfig.

gicv3_init_cpuif is used unconditionally by arm_gic_realize in 
hw/intc/arm_gicv3.c, so right now the separation between GICV3 and 
GICV3_TCG is useless.

That said, using "default y" is wrong.  The correct definition in 
hw/intc/Kconfig for these should be:

config ARM_GIC
     bool
     select MSI_NONBROKEN
     select ARM_GICV3_TCG # if TCG
     select ARM_GIC_KVM if KVM

config ARM_GICV3_TCG
     bool

config ARM_GIC_KVM
     bool

(where the "if TCG" is incorrect right now as explained above).

Paolo

> Signed-off-by: Fabiano Rosas<farosas@suse.de>
> Reviewed-by: Peter Maydell<peter.maydell@linaro.org>
> Signed-off-by: Alex Bennée<alex.bennee@linaro.org>
> Message-Id:<20230208192654.8854-9-farosas@suse.de>
> ---
>   hw/arm/Kconfig | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index cec7898bb7..0cce0b8d5b 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -252,6 +252,7 @@ config SBSA_REF
>       select PL061 # GPIO
>       select USB_EHCI_SYSBUS
>       select WDT_SBSA
> +    select ARM_GICV3_TCG
>

Re: [PATCH 08/22] hw/arm: Select GICV3_TCG for sbsa-ref machine

Posted by Richard Henderson 2 years, 7 months ago

On 5/3/23 10:12, Alex Bennée wrote:
> From: Fabiano Rosas<farosas@suse.de>
> 
> This machine hardcodes the creation of the interrupt controller, so
> make sure the dependency is explicitly described in the Kconfig.
> 
> Signed-off-by: Fabiano Rosas<farosas@suse.de>
> Reviewed-by: Peter Maydell<peter.maydell@linaro.org>
> Signed-off-by: Alex Bennée<alex.bennee@linaro.org>
> Message-Id:<20230208192654.8854-9-farosas@suse.de>
> ---
>   hw/arm/Kconfig | 1 +
>   1 file changed, 1 insertion(+)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~