[PATCH v1] hw/pci-host/aspeed_pcie: Fix global MSI setting during class initialization

[PATCH v1] hw/pci-host/aspeed_pcie: Fix global MSI setting during class initialization

[Jamin Lin]

Setting msi_nonbroken in class_init() affects all machine types,
even when the ASPEED PCIe controller is not used.

Move msi_nonbroken to realize() to ensure it is only set when
the ASPEED PCIe controller is realized.

Reported-by: Marcelo Manzo <marcelomanzo@gmail.com>
Fixes: f002aa35f3205d55bbe4a68670ba19a6dcf1d6a8 ("hw/pci-host/aspeed: Add AST2600 PCIe config space and host bridge")
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 hw/pci-host/aspeed_pcie.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c
index b46eb74234..ceb010f213 100644
--- a/hw/pci-host/aspeed_pcie.c
+++ b/hw/pci-host/aspeed_pcie.c
@@ -181,6 +181,8 @@ static void aspeed_pcie_rc_realize(DeviceState *dev, Error **errp)
     g_autofree char *dram_alias_name = NULL;
     g_autofree char *root_bus_name = NULL;
 
+    msi_nonbroken = true;
+
     /* PCI configuration space */
     pcie_host_mmcfg_init(pex, PCIE_MMCFG_SIZE_MAX);
     sysbus_init_mmio(sbd, &pex->mmio);
@@ -294,8 +296,6 @@ static void aspeed_pcie_rc_class_init(ObjectClass *klass, const void *data)
 
     hc->root_bus_path = aspeed_pcie_rc_root_bus_path;
     device_class_set_props(dc, aspeed_pcie_rc_props);
-
-    msi_nonbroken = true;
 }
 
 /*
-- 
2.43.0

Re: [PATCH v1] hw/pci-host/aspeed_pcie: Fix global MSI setting during class initialization

[Peter Maydell]

On Mon, 19 Oct 2026 at 03:44, Jamin Lin <jamin_lin@aspeedtech.com> wrote:
>
> Setting msi_nonbroken in class_init() affects all machine types,
> even when the ASPEED PCIe controller is not used.
>
> Move msi_nonbroken to realize() to ensure it is only set when
> the ASPEED PCIe controller is realized.
>
> Reported-by: Marcelo Manzo <marcelomanzo@gmail.com>
> Fixes: f002aa35f3205d55bbe4a68670ba19a6dcf1d6a8 ("hw/pci-host/aspeed: Add AST2600 PCIe config space and host bridge")
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>

This should also be

Cc: qemu-stable@nongnu.org

> ---
>  hw/pci-host/aspeed_pcie.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c
> index b46eb74234..ceb010f213 100644
> --- a/hw/pci-host/aspeed_pcie.c
> +++ b/hw/pci-host/aspeed_pcie.c
> @@ -181,6 +181,8 @@ static void aspeed_pcie_rc_realize(DeviceState *dev, Error **errp)
>      g_autofree char *dram_alias_name = NULL;
>      g_autofree char *root_bus_name = NULL;
>
> +    msi_nonbroken = true;
> +
>      /* PCI configuration space */
>      pcie_host_mmcfg_init(pex, PCIE_MMCFG_SIZE_MAX);
>      sysbus_init_mmio(sbd, &pex->mmio);
> @@ -294,8 +296,6 @@ static void aspeed_pcie_rc_class_init(ObjectClass *klass, const void *data)
>
>      hc->root_bus_path = aspeed_pcie_rc_root_bus_path;
>      device_class_set_props(dc, aspeed_pcie_rc_props);
> -
> -    msi_nonbroken = true;
>  }

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH v1] hw/pci-host/aspeed_pcie: Fix global MSI setting during class initialization

[Philippe Mathieu-Daudé]

On 2026-10-19 4:44, Jamin Lin wrote:
> Setting msi_nonbroken in class_init() affects all machine types,
> even when the ASPEED PCIe controller is not used.
> 
> Move msi_nonbroken to realize() to ensure it is only set when
> the ASPEED PCIe controller is realized.
> 
> Reported-by: Marcelo Manzo <marcelomanzo@gmail.com>
> Fixes: f002aa35f3205d55bbe4a68670ba19a6dcf1d6a8 ("hw/pci-host/aspeed: Add AST2600 PCIe config space and host bridge")

This commit mentions AST2600 but also enable that for AST2400/2500
and AST2700.

AST2700 wires it in commit ba6fb09048198a2952d731cd063f4307b137e7ec.

AST2400/2500 share hw/arm/aspeed_ast2400.c which has no PCIe host
bridge. Previous commits could have been better, but too late, OK.

Suggestion:

   The ASPEED PCIe class may be registered for machines that do not
   instantiate a PCIe root complex. Updating the global msi_nonbroken
   flag from class_init() therefore affects unrelated machines.

   Defer the update to the per-device realize handler, so the flag
   changes only when an ASPEED PCIe root complex is actually
   instantiated.

Fixes: f002aa35f3 ("hw/pci-host/aspeed: Add AST2600 PCIe host bridge")
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   hw/pci-host/aspeed_pcie.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)