On Thu, Dec 24, 2020 at 06:23:03PM +0100, Greg Kurz wrote: > qemu-system-ppc64 built with --without-default-devices crashes: > > Type 'pnv-phb4-root-port' is missing its parent 'pcie-root-port-base' > Aborted (core dumped) > > Have POWERNV to select PCIE_PORT. This is done through a > new PCI_POWERNV config in hw/pci-host/Kconfig since POWERNV > doesn't have a direct dependency on PCI. For this reason, > PCI_EXPRESS and MSI_NONBROKEN are also moved under > PCI_POWERNV. > > Signed-off-by: Greg Kurz <[email protected]> > Reviewed-by: Cédric Le Goater <[email protected]>
Applied, thanks.
> ---
> hw/pci-host/Kconfig | 5 +++++
> hw/pci-host/meson.build | 2 +-
> hw/ppc/Kconfig | 3 +--
> 3 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
> index 036a61877a73..eb03f0489d08 100644
> --- a/hw/pci-host/Kconfig
> +++ b/hw/pci-host/Kconfig
> @@ -60,3 +60,8 @@ config PCI_BONITO
> select PCI
> select UNIMP
> bool
> +
> +config PCI_POWERNV
> + select PCI_EXPRESS
> + select MSI_NONBROKEN
> + select PCIE_PORT
> diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
> index e6d1b896848c..da9d1a9964a8 100644
> --- a/hw/pci-host/meson.build
> +++ b/hw/pci-host/meson.build
> @@ -23,7 +23,7 @@ pci_ss.add(when: 'CONFIG_VERSATILE_PCI', if_true:
> files('versatile.c'))
>
> softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
>
> -specific_ss.add(when: 'CONFIG_POWERNV', if_true: files(
> +specific_ss.add(when: 'CONFIG_PCI_POWERNV', if_true: files(
> 'pnv_phb3.c',
> 'pnv_phb3_msi.c',
> 'pnv_phb3_pbcq.c',
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index a213994ebf5d..d11dc30509df 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -29,8 +29,7 @@ config POWERNV
> select XICS
> select XIVE
> select FDT_PPC
> - select PCI_EXPRESS
> - select MSI_NONBROKEN
> + select PCI_POWERNV
>
> config PPC405
> bool
>
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
