Commit ccfc1d55 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Fix compile testing of al driver without CONFIG_PCI_ECAM (Arnd Bergmann)

- Fix compile testing of thunder drivers (Arnd Bergmann)

- Fix "no symbols" warnings when compile testing al, thunder driver with
  CONFIG_TRIM_UNUSED_KSYMS (Arnd Bergmann)

- Remove unused MicroGate SyncLink device IDs (Jiri Slaby)

- Remove unused alloc_pci_root_info() return value (Krzysztof Wilczyński)

* pci/misc:
  x86/PCI: Remove unused alloc_pci_root_info() return value
  PCI: Remove MicroGate SyncLink device IDs
  PCI: Avoid building empty drivers
  PCI: thunder: Fix compile testing
  PCI: al: Select CONFIG_PCI_ECAM
parents 22d10673 ccd61f07

arch/x86/pci/amd_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int __init early_root_info_init(void) 
		node = (reg >> 4) & 0x07;

		link = (reg >> 8) & 0x03;



		info = alloc_pci_root_info(min_bus, max_bus, node, link);

		alloc_pci_root_info(min_bus, max_bus, node, link);

	}



	/*

drivers/pci/controller/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -11,10 +11,13 @@ obj-$(CONFIG_PCIE_RCAR_HOST) += pcie-rcar.o pcie-rcar-host.o 
obj-$(CONFIG_PCIE_RCAR_EP) += pcie-rcar.o pcie-rcar-ep.o

obj-$(CONFIG_PCI_HOST_COMMON) += pci-host-common.o

obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o

obj-$(CONFIG_PCI_HOST_THUNDER_ECAM) += pci-thunder-ecam.o

obj-$(CONFIG_PCI_HOST_THUNDER_PEM) += pci-thunder-pem.o

obj-$(CONFIG_PCIE_XILINX) += pcie-xilinx.o

obj-$(CONFIG_PCIE_XILINX_NWL) += pcie-xilinx-nwl.o

obj-$(CONFIG_PCIE_XILINX_CPM) += pcie-xilinx-cpm.o

obj-$(CONFIG_PCI_V3_SEMI) += pci-v3-semi.o

obj-$(CONFIG_PCI_XGENE) += pci-xgene.o

obj-$(CONFIG_PCI_XGENE_MSI) += pci-xgene-msi.o

obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o

obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
@@ -47,8 +50,10 @@ obj-y += mobiveil/ 
# ARM64 and use internal ifdefs to only build the pieces we need

# depending on whether ACPI, the DT driver, or both are enabled.



ifdef CONFIG_PCI

ifdef CONFIG_ACPI

ifdef CONFIG_PCI_QUIRKS

obj-$(CONFIG_ARM64) += pci-thunder-ecam.o

obj-$(CONFIG_ARM64) += pci-thunder-pem.o

obj-$(CONFIG_ARM64) += pci-xgene.o

endif

endif

drivers/pci/controller/dwc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ config PCIE_AL 
	depends on OF && (ARM64 || COMPILE_TEST)

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIE_DW_HOST

	select PCI_ECAM

	help

	  Say Y here to enable support of the Amazon's Annapurna Labs PCIe

	  controller IP on Amazon SoCs. The PCIe controller uses the DesignWare

drivers/pci/controller/dwc/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -31,7 +31,12 @@ obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.o 
# ARM64 and use internal ifdefs to only build the pieces we need

# depending on whether ACPI, the DT driver, or both are enabled.



ifdef CONFIG_PCI

obj-$(CONFIG_PCIE_AL) += pcie-al.o

obj-$(CONFIG_PCI_HISI) += pcie-hisi.o



ifdef CONFIG_ACPI

ifdef CONFIG_PCI_QUIRKS

obj-$(CONFIG_ARM64) += pcie-al.o

obj-$(CONFIG_ARM64) += pcie-hisi.o

endif

endif

drivers/pci/controller/pci-thunder-ecam.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int thunder_ecam_p2_config_read(struct pci_bus *bus, unsigned int devfn, 
	 * the config space access window.  Since we are working with

	 * the high-order 32 bits, shift everything down by 32 bits.

	 */

	node_bits = (cfg->res.start >> 32) & (1 << 12);

	node_bits = upper_32_bits(cfg->res.start) & (1 << 12);



	v |= node_bits;

	set_val(v, where, size, val);