[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/22] pnv: Fix reverse dependency on PCI express root ports
From: |
David Gibson |
Subject: |
[PULL 17/22] pnv: Fix reverse dependency on PCI express root ports |
Date: |
Wed, 6 Jan 2021 14:38:11 +1100 |
From: Greg Kurz <groug@kaod.org>
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>
---
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 036a61877a..eb03f0489d 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 e6d1b89684..da9d1a9964 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 a213994ebf..d11dc30509 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
--
2.29.2
- [PULL 06/22] spapr/xive: Make spapr_xive_pic_print_info() static, (continued)
- [PULL 06/22] spapr/xive: Make spapr_xive_pic_print_info() static, David Gibson, 2021/01/05
- [PULL 12/22] spapr: Introduce spapr_drc_reset_all(), David Gibson, 2021/01/05
- [PULL 11/22] spapr: Fix reset of transient DR connectors, David Gibson, 2021/01/05
- [PULL 10/22] spapr: Call spapr_drc_reset() for all DRCs at CAS, David Gibson, 2021/01/05
- [PULL 05/22] spapr: DRC lookup cannot fail, David Gibson, 2021/01/05
- [PULL 09/22] spapr: Fix buffer overflow in spapr_numa_associativity_init(), David Gibson, 2021/01/05
- [PULL 07/22] spapr: Fix DR properties of the root node, David Gibson, 2021/01/05
- [PULL 08/22] spapr: Allow memory unplug to always succeed, David Gibson, 2021/01/05
- [PULL 13/22] spapr: Use spapr_drc_reset_all() at machine reset, David Gibson, 2021/01/05
- [PULL 15/22] ppc: Fix build with --without-default-devices, David Gibson, 2021/01/05
- [PULL 17/22] pnv: Fix reverse dependency on PCI express root ports,
David Gibson <=
- [PULL 21/22] ppc440_pcix: Fix register write trace event, David Gibson, 2021/01/05
- [PULL 16/22] ppc: Simplify reverse dependencies of POWERNV and PSERIES on XICS and XIVE, David Gibson, 2021/01/05
- [PULL 14/22] spapr: Add drc_ prefix to the DRC realize and unrealize functions, David Gibson, 2021/01/05
- [PULL 19/22] sam460ex: Remove FDT_PPC dependency from KConfig, David Gibson, 2021/01/05
- [PULL 20/22] ppc440_pcix: Improve comment for IRQ mapping, David Gibson, 2021/01/05
- [PULL 18/22] ppc4xx: Move common dependency on serial to common option, David Gibson, 2021/01/05
- [PULL 22/22] ppc440_pcix: Fix up pci config access, David Gibson, 2021/01/05
- Re: [PULL 00/22] ppc-for-6.0 queue 20210106, BALATON Zoltan, 2021/01/06
- Re: [PULL 00/22] ppc-for-6.0 queue 20210106, Peter Maydell, 2021/01/06