OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pnv: Fix reverse dependency on PCI express root ports

Browse Source 
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 <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <160883058299.253005.342913177952681375.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2020-12-24 18:23:03 +01:00 committed by David Gibson
parent 27d5caec4f
commit 995d955647
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/pci-host/Kconfig
View File

@ -60,3 +60,8 @@ config PCI_BONITO
select PCI select PCI
select UNIMP select UNIMP
bool bool
config PCI_POWERNV
select PCI_EXPRESS
select MSI_NONBROKEN
select PCIE_PORT

2
hw/pci-host/meson.build
View File

@ -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) 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.c',
'pnv_phb3_msi.c', 'pnv_phb3_msi.c',
'pnv_phb3_pbcq.c', 'pnv_phb3_pbcq.c',

3
hw/ppc/Kconfig
View File

@ -29,8 +29,7 @@ config POWERNV
select XICS select XICS
select XIVE select XIVE
select FDT_PPC select FDT_PPC
select PCI_EXPRESS select PCI_POWERNV
select MSI_NONBROKEN
config PPC405 config PPC405
bool bool