Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43b90eae authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

  - use PCI_EXP_DEVCTL2_COMP_TIMEOUT in rapidio/tsi721 (Bjorn Helgaas)

  - remove possible NULL pointer dereference in of_pci_bus_find_domain_nr()
    (Shawn Lin)

  - report quirk timings with dev_info (Bjorn Helgaas)

  - report quirks that take longer than 10ms (Bjorn Helgaas)

  - add and use Altera Vendor ID (Johannes Thumshirn)

  - tidy Makefiles and comments (Bjorn Helgaas)

* pci/misc:
  PCI: Always define the of_node helpers
  PCI: Tidy comments
  PCI: Tidy Makefiles
  mcb: Add Altera PCI ID to mcb-pci
  PCI: Add Altera vendor ID
  PCI: Report quirks that take more than 10ms
  PCI: Report quirk timings with pci_info() instead of pr_debug()
  PCI: Fix NULL pointer dereference in of_pci_bus_find_domain_nr()
  rapidio/tsi721: use PCI_EXP_DEVCTL2_COMP_TIMEOUT macro
parents 3da1b617 ad32eb2d

drivers/char/xillybus/xillybus_pcie.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ MODULE_LICENSE("GPL v2"); 




#define PCI_DEVICE_ID_XILLYBUS		0xebeb

#define PCI_DEVICE_ID_XILLYBUS		0xebeb





#define PCI_VENDOR_ID_ALTERA		0x1172

#define PCI_VENDOR_ID_ACTEL		0x11aa

#define PCI_VENDOR_ID_ACTEL		0x11aa

#define PCI_VENDOR_ID_LATTICE		0x1204

#define PCI_VENDOR_ID_LATTICE		0x1204

drivers/fpga/altera-cvp.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -384,8 +384,6 @@ static int altera_cvp_probe(struct pci_dev *pdev, 
			    const struct pci_device_id *dev_id);

			    const struct pci_device_id *dev_id);

static void altera_cvp_remove(struct pci_dev *pdev);

static void altera_cvp_remove(struct pci_dev *pdev);





#define PCI_VENDOR_ID_ALTERA	0x1172



static struct pci_device_id altera_cvp_id_tbl[] = {

static struct pci_device_id altera_cvp_id_tbl[] = {

	{ PCI_VDEVICE(ALTERA, PCI_ANY_ID) },

	{ PCI_VDEVICE(ALTERA, PCI_ANY_ID) },

	{ }

	{ }

drivers/mcb/mcb-pci.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,7 @@ static void mcb_pci_remove(struct pci_dev *pdev) 




static const struct pci_device_id mcb_pci_tbl[] = {

static const struct pci_device_id mcb_pci_tbl[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_MEN, PCI_DEVICE_ID_MEN_CHAMELEON) },

	{ PCI_DEVICE(PCI_VENDOR_ID_MEN, PCI_DEVICE_ID_MEN_CHAMELEON) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ALTERA, PCI_DEVICE_ID_MEN_CHAMELEON) },

	{ 0 },

	{ 0 },

};

};

MODULE_DEVICE_TABLE(pci, mcb_pci_tbl);

MODULE_DEVICE_TABLE(pci, mcb_pci_tbl);

drivers/pci/Makefile

+24 −45
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: GPL-2.0

#

#

# Makefile for the PCI bus specific drivers.

# Makefile for the PCI bus specific drivers.

#





obj-$(CONFIG_PCI)	+= access.o bus.o probe.o host-bridge.o remove.o pci.o \

obj-$(CONFIG_PCI)		+= access.o bus.o probe.o host-bridge.o \

			pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \

				   remove.o pci.o pci-driver.o search.o \

			irq.o vpd.o setup-bus.o vc.o mmap.o setup-irq.o

				   pci-sysfs.o rom.o setup-res.o irq.o vpd.o \

				   setup-bus.o vc.o mmap.o setup-irq.o





ifdef CONFIG_PCI

ifdef CONFIG_PCI

obj-$(CONFIG_PROC_FS)		+= proc.o

obj-$(CONFIG_PROC_FS)		+= proc.o
@@ -14,48 +14,27 @@ obj-$(CONFIG_OF) += of.o 
endif

endif





obj-$(CONFIG_PCI_QUIRKS)	+= quirks.o

obj-$(CONFIG_PCI_QUIRKS)	+= quirks.o



# Build PCI Express stuff if needed

obj-$(CONFIG_PCIEPORTBUS)	+= pcie/

obj-$(CONFIG_PCIEPORTBUS)	+= pcie/



# Build the PCI Hotplug drivers if we were asked to

obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/

obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/



# Build the PCI MSI interrupt support

obj-$(CONFIG_PCI_MSI)		+= msi.o

obj-$(CONFIG_PCI_MSI)		+= msi.o



obj-$(CONFIG_PCI_ATS)		+= ats.o

obj-$(CONFIG_PCI_ATS)		+= ats.o

obj-$(CONFIG_PCI_IOV)		+= iov.o

obj-$(CONFIG_PCI_IOV)		+= iov.o



#

# ACPI Related PCI FW Functions

# ACPI _DSM provided firmware instance and string name

#

obj-$(CONFIG_ACPI)		+= pci-acpi.o

obj-$(CONFIG_ACPI)		+= pci-acpi.o



# SMBIOS provided firmware instance and labels

obj-$(CONFIG_PCI_LABEL)		+= pci-label.o

obj-$(CONFIG_PCI_LABEL)		+= pci-label.o



# Intel MID platform PM support

obj-$(CONFIG_X86_INTEL_MID)	+= pci-mid.o

obj-$(CONFIG_X86_INTEL_MID)	+= pci-mid.o



obj-$(CONFIG_PCI_SYSCALL)	+= syscall.o

obj-$(CONFIG_PCI_SYSCALL)	+= syscall.o



obj-$(CONFIG_PCI_STUB)		+= pci-stub.o

obj-$(CONFIG_PCI_STUB)		+= pci-stub.o



obj-$(CONFIG_PCI_ECAM)		+= ecam.o

obj-$(CONFIG_PCI_ECAM)		+= ecam.o



obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o

obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o





ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG



# PCI host controller drivers

obj-y				+= host/

obj-y				+= host/

obj-y				+= switch/

obj-y				+= switch/





# Endpoint library must be initialized before its users

obj-$(CONFIG_PCI_ENDPOINT)	+= endpoint/

obj-$(CONFIG_PCI_ENDPOINT)	+= endpoint/





# Endpoint library must be initialized before its users

obj-$(CONFIG_PCIE_CADENCE)	+= cadence/

obj-$(CONFIG_PCIE_CADENCE)	+= cadence/

# pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW

# pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW

obj-y				+= dwc/

obj-y				+= dwc/



ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG

drivers/pci/access.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -686,8 +686,10 @@ void pci_cfg_access_unlock(struct pci_dev *dev) 




	raw_spin_lock_irqsave(&pci_lock, flags);

	raw_spin_lock_irqsave(&pci_lock, flags);





	/* This indicates a problem in the caller, but we don't need

	/*

	 * to kill them, unlike a double-block above. */

	 * This indicates a problem in the caller, but we don't need

	 * to kill them, unlike a double-block above.

	 */

	WARN_ON(!dev->block_cfg_access);

	WARN_ON(!dev->block_cfg_access);





	dev->block_cfg_access = 0;

	dev->block_cfg_access = 0;