hw/pcie-pci-bridge: restrict to X86 and ARM

PATCH Superseded Marcel Apfelbaum 2 participants 3 messages Nov 9, 2017

Share & tools

Marcel Apfelbaum

author

2017-11-09 12:43 UTC #0 lore raw

PATCH v2 1/1 hw/pcie-pci-bridge: restrict to X86 and ARM

The PCIE-PCI bridge is specific to "pure" PCIe systems (on QEMU we have X86 and ARM), it does not make sense to have if in other archs.

Reported-by Thomas Huth <[email protected]>

Signed-off-by Marcel Apfelbaum <[email protected]>

---

V1 -> V2:
Addressed Thomas and Cornelia comments:
- Conditioned the pcie-pci-bridge compilation on the PCIe Root CONFIG_PCIE_PORT
- Tweaked subject PCI -> PCIe

Thanks,
Marcel

 hw/pci-bridge/Makefile.objs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

hw/pci-bridge/Makefile.objs +3 -1

index 666db37da2..83539f02e5 100644
@@ -1,8 +1,10 @@
-common-obj-y += pci_bridge_dev.o pcie_pci_bridge.o
+common-obj-y += pci_bridge_dev.o
 common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o gen_pcie_root_port.o
 common-obj-$(CONFIG_PXB) += pci_expander_bridge.o
+common-obj-$(CONFIG_PCIE_PCI_BRIDGE) += pcie_pci_bridge.o
 common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
 common-obj-$(CONFIG_IOH3420) += ioh3420.o
 common-obj-$(CONFIG_I82801B11) += i82801b11.o
 # NewWorld PowerMac
 common-obj-$(CONFIG_DEC_PCI) += dec.o
+CONFIG_PCIE_PCI_BRIDGE=$(CONFIG_PCIE_PORT)

Signature · 1 line

2.13.5

Thomas Huth

2017-11-09 12:46 UTC #1 lore raw

Quoted 26 lines · Marcel Apfelbaum

The PCIE-PCI bridge is specific to "pure" PCIe systems (on QEMU we have X86 and ARM), it does not make sense to have if in other archs.
Reported-by Thomas Huth <[email protected]>
Signed-off-by Marcel Apfelbaum <[email protected]>
---
V1 -> V2:
Addressed Thomas and Cornelia comments:
- Conditioned the pcie-pci-bridge compilation on the PCIe Root CONFIG_PCIE_PORT
- Tweaked subject PCI -> PCIe
Thanks,
Marcel
 hw/pci-bridge/Makefile.objs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/pci-bridge/Makefile.objs +0 -1
index 666db37da2..83539f02e5 100644
@@ -1,8 +1,10 @@
-common-obj-y += pci_bridge_dev.o pcie_pci_bridge.o

hw/pci-bridge/Makefile.objs line 10

Quoted 10 lines

hw/pci-bridge/Makefile.objs +3 -0

+common-obj-y += pci_bridge_dev.o
 common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o gen_pcie_root_port.o
 common-obj-$(CONFIG_PXB) += pci_expander_bridge.o
+common-obj-$(CONFIG_PCIE_PCI_BRIDGE) += pcie_pci_bridge.o
 common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
 common-obj-$(CONFIG_IOH3420) += ioh3420.o
 common-obj-$(CONFIG_I82801B11) += i82801b11.o
 # NewWorld PowerMac
 common-obj-$(CONFIG_DEC_PCI) += dec.o
+CONFIG_PCIE_PCI_BRIDGE=$(CONFIG_PCIE_PORT)

Shouldn't that last line rather go into default-configs/pci.mak instead? AFAIK we normally don't do "^CONFIG_xxx=" in normal Makefiles ... ?

Thomas

Marcel Apfelbaum

author

2017-11-09 12:47 UTC #2 lore raw

Quoted 32 lines · Thomas Huth

Quoted 31 lines · Marcel Apfelbaum
The PCIE-PCI bridge is specific to "pure" PCIe systems (on QEMU we have X86 and ARM), it does not make sense to have if in other archs.
Reported-by Thomas Huth <[email protected]>
Signed-off-by Marcel Apfelbaum <[email protected]>
---
V1 -> V2:
Addressed Thomas and Cornelia comments:
- Conditioned the pcie-pci-bridge compilation on the PCIe Root CONFIG_PCIE_PORT
- Tweaked subject PCI -> PCIe
Thanks,
Marcel
  hw/pci-bridge/Makefile.objs | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
hw/pci-bridge/Makefile.objs +2 -1
index 666db37da2..83539f02e5 100644
@@ -1,8 +1,10 @@
-common-obj-y += pci_bridge_dev.o pcie_pci_bridge.o
+common-obj-y += pci_bridge_dev.o
  common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o gen_pcie_root_port.o
  common-obj-$(CONFIG_PXB) += pci_expander_bridge.o
+common-obj-$(CONFIG_PCIE_PCI_BRIDGE) += pcie_pci_bridge.o
  common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o

Quoted 8 lines

hw/pci-bridge/Makefile.objs line 10
Quoted 5 lines
hw/pci-bridge/Makefile.objs +1 -0
  common-obj-$(CONFIG_IOH3420) += ioh3420.o
  common-obj-$(CONFIG_I82801B11) += i82801b11.o
  # NewWorld PowerMac
  common-obj-$(CONFIG_DEC_PCI) += dec.o
+CONFIG_PCIE_PCI_BRIDGE=$(CONFIG_PCIE_PORT)
Shouldn't that last line rather go into default-configs/pci.mak instead? AFAIK we normally don't do "^CONFIG_xxx=" in normal Makefiles ... ?

I was looking for that file... thanks!
Marcel

Quoted 3 lines

Thomas