Commit 5a4f3cf0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/irq', 'pci/misc', 'pci/resource' and 'pci/virtualization' into next 

* pci/irq:
  PCI/MSI: Free legacy IRQ when enabling MSI/MSI-X
  PCI: Add helpers to manage pci_dev->irq and pci_dev->irq_managed
  PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()
  PCI: Add pcibios_alloc_irq() and pcibios_free_irq()

* pci/misc:
  PCI: Remove unused "pci_probe" flags
  PCI: Add VPD function 0 quirk for Intel Ethernet devices
  PCI: Add dev_flags bit to access VPD through function 0
  PCI / ACPI: Fix pci_acpi_optimize_delay() comment
  PCI: Remove a broken link in quirks.c
  PCI: Remove useless redundant code
  PCI: Simplify pci_find_(ext_)capability() return value checks
  PCI: Move PCI_FIND_CAP_TTL to pci.h and use it in quirks
  PCI: Add pcie_downstream_port() (true for Root and Switch Downstream Ports)
  PCI: Fix pcie_port_device_resume() comment
  PCI: Shift PCI_CLASS_NOT_DEFINED consistently with other classes
  PCI: Revert aeb30016 ("PCI: add Intel USB specific reset method")
  PCI: Fix TI816X class code quirk
  PCI: Fix generic NCR 53c810 class code quirk
  PCI: Use PCI_CLASS_SERIAL_USB instead of bare number
  PCI: Add quirk for Intersil/Techwell TW686[4589] AV capture cards
  PCI: Remove Intel Cherrytrail D3 delays

* pci/resource:
  PCI: Call pci_read_bridge_bases() from core instead of arch code

* pci/virtualization:
  PCI: Restore ACS configuration as part of pci_restore_state()
parents cd66d5c3 5f226991 24b390aa dff22d20 ccbc175a

arch/alpha/kernel/pci.c

+1 −6
Original line number Diff line number Diff line
@@ -242,12 +242,7 @@ pci_restore_srm_config(void) 


void pcibios_fixup_bus(struct pci_bus *bus)

{

	struct pci_dev *dev = bus->self;



	if (pci_has_flag(PCI_PROBE_ONLY) && dev &&

 		   (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {

 		pci_read_bridge_bases(bus);

	} 

	struct pci_dev *dev;



	list_for_each_entry(dev, &bus->devices, bus_list) {

		pdev_save_srm_config(dev);

arch/frv/mb93090-mb00/pci-frv.c

+0 −8
Original line number Diff line number Diff line
@@ -175,14 +175,6 @@ static void __init pcibios_assign_resources(void) 
			if (!r->start && r->end)

				pci_assign_resource(dev, idx);

		}



		if (pci_probe & PCI_ASSIGN_ROMS) {

			r = &dev->resource[PCI_ROM_RESOURCE];

			r->end -= r->start;

			r->start = 0;

			if (r->end)

				pci_assign_resource(dev, PCI_ROM_RESOURCE);

		}

	}

}

arch/frv/mb93090-mb00/pci-frv.h

+0 −8
Original line number Diff line number Diff line
@@ -14,14 +14,6 @@ 
#define DBG(x...)

#endif



#define PCI_PROBE_BIOS		0x0001

#define PCI_PROBE_CONF1		0x0002

#define PCI_PROBE_CONF2		0x0004

#define PCI_NO_CHECKS		0x0400

#define PCI_ASSIGN_ROMS		0x1000

#define PCI_BIOS_IRQ_SCAN	0x2000

#define PCI_ASSIGN_ALL_BUSSES	0x4000



extern unsigned int __nongpreldata pci_probe;



/* pci-frv.c */

arch/frv/mb93090-mb00/pci-vdk.c

+0 −2
Original line number Diff line number Diff line
@@ -294,8 +294,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) 
	printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);

#endif



	pci_read_bridge_bases(bus);



	if (bus->number == 0) {

		struct pci_dev *dev;

		list_for_each_entry(dev, &bus->devices, bus_list) {

arch/ia64/pci/pci.c

+2 −3
Original line number Diff line number Diff line
@@ -533,10 +533,9 @@ void pcibios_fixup_bus(struct pci_bus *b) 
{

	struct pci_dev *dev;



	if (b->self) {

		pci_read_bridge_bases(b);

	if (b->self)

		pcibios_fixup_bridge_resources(b->self);

	}



	list_for_each_entry(dev, &b->devices, bus_list)

		pcibios_fixup_device_resources(dev);

	platform_pci_fixup_bus(b);

CRA Git | Maintained and supported by SUSTech CRA and CCSE