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

Commit 6dd53aa4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI changes from Bjorn Helgaas:
 "Host bridge hotplug:
    - Add MMCONFIG support for hot-added host bridges (Jiang Liu)
  Device hotplug:
    - Move fixups from __init to __devinit (Sebastian Andrzej Siewior)
    - Call FINAL fixups for hot-added devices, too (Myron Stowe)
    - Factor out generic code for P2P bridge hot-add (Yinghai Lu)
    - Remove all functions in a slot, not just those with _EJx (Amos
      Kong)
  Dynamic resource management:
    - Track bus number allocation (struct resource tree per domain)
      (Yinghai Lu)
    - Make P2P bridge 1K I/O windows work with resource reassignment
      (Bjorn Helgaas, Yinghai Lu)
    - Disable decoding while updating 64-bit BARs (Bjorn Helgaas)
  Power management:
    - Add PCIe runtime D3cold support (Huang Ying)
  Virtualization:
    - Add VFIO infrastructure (ACS, DMA source ID quirks) (Alex
      Williamson)
    - Add quirks for devices with broken INTx masking (Jan Kiszka)
  Miscellaneous:
    - Fix some PCI Express capability version issues (Myron Stowe)
    - Factor out some arch code with a weak, generic, pcibios_setup()
      (Myron Stowe)"

* tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (122 commits)
  PCI: hotplug: ensure a consistent return value in error case
  PCI: fix undefined reference to 'pci_fixup_final_inited'
  PCI: build resource code for M68K architecture
  PCI: pciehp: remove unused pciehp_get_max_lnk_width(), pciehp_get_cur_lnk_width()
  PCI: reorder __pci_assign_resource() (no change)
  PCI: fix truncation of resource size to 32 bits
  PCI: acpiphp: merge acpiphp_debug and debug
  PCI: acpiphp: remove unused res_lock
  sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases()
  PCI: call final fixups hot-added devices
  PCI: move final fixups from __init to __devinit
  x86/PCI: move final fixups from __init to __devinit
  MIPS/PCI: move final fixups from __init to __devinit
  PCI: support sizing P2P bridge I/O windows with 1K granularity
  PCI: reimplement P2P bridge 1K I/O windows (Intel P64H2)
  PCI: disable MEM decoding while updating 64-bit MEM BARs
  PCI: leave MEM and IO decoding disabled during 64-bit BAR sizing, too
  PCI: never discard enable/suspend/resume_early/resume fixups
  PCI: release temporary reference in __nv_msi_ht_cap_quirk()
  PCI: restructure 'pci_do_fixups()'
  ...
parents f14121ab 63b96f7b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5210,7 +5210,7 @@ PCI SUBSYSTEM 
M:	Bjorn Helgaas <bhelgaas@google.com>

L:	linux-pci@vger.kernel.org

Q:	http://patchwork.ozlabs.org/project/linux-pci/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git

S:	Supported

F:	Documentation/PCI/

F:	drivers/pci/

arch/alpha/kernel/pci.c

+4 −13
Original line number Diff line number Diff line
@@ -59,15 +59,13 @@ struct pci_controller *pci_isa_hose; 
 * Quirks.

 */



static void __init

quirk_isa_bridge(struct pci_dev *dev)

static void __devinit quirk_isa_bridge(struct pci_dev *dev)

{

	dev->class = PCI_CLASS_BRIDGE_ISA << 8;

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge);



static void __init

quirk_cypress(struct pci_dev *dev)

static void __devinit quirk_cypress(struct pci_dev *dev)

{

	/* The Notorious Cy82C693 chip.  */
@@ -106,8 +104,7 @@ quirk_cypress(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress);



/* Called for each device after PCI setup is done. */

static void __init

pcibios_fixup_final(struct pci_dev *dev)

static void __devinit pcibios_fixup_final(struct pci_dev *dev)

{

	unsigned int class = dev->class >> 8;
@@ -198,12 +195,6 @@ pcibios_init(void) 


subsys_initcall(pcibios_init);



char * __devinit

pcibios_setup(char *str)

{

	return str;

}



#ifdef ALPHA_RESTORE_SRM_SETUP

static struct pdev_srm_saved_conf *srm_saved_configs;
@@ -359,7 +350,7 @@ common_init_pci(void) 
					hose, &resources);

		hose->bus = bus;

		hose->need_domain_info = need_domain_info;

		next_busno = bus->subordinate + 1;

		next_busno = bus->busn_res.end + 1;

		/* Don't allow 8-bit bus number overflow inside the hose -

		   reserve some space for bridges. */ 

		if (next_busno > 224) {

arch/arm/kernel/bios32.c

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static void __devinit pci_fixup_cy82c693(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, pci_fixup_cy82c693);



static void __init pci_fixup_it8152(struct pci_dev *dev)

static void __devinit pci_fixup_it8152(struct pci_dev *dev)

{

	int i;

	/* fixup for ITE 8152 devices */
@@ -461,7 +461,7 @@ static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head) 
			if (!sys->bus)

				panic("PCI: unable to scan bus!");



			busnr = sys->bus->subordinate + 1;

			busnr = sys->bus->busn_res.end + 1;



			list_add(&sys->node, head);

		} else {

arch/cris/arch-v32/drivers/pci/bios.c

+0 −5
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) 
{

}



char * __devinit  pcibios_setup(char *str)

{

	return NULL;

}



void pcibios_set_master(struct pci_dev *dev)

{

	u8 lat;

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

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void __init pci_fixup_umc_ide(struct pci_dev *d) 
		d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO;

}



static void __init pci_fixup_ide_bases(struct pci_dev *d)

static void __devinit pci_fixup_ide_bases(struct pci_dev *d)

{

	int i;
@@ -287,7 +287,7 @@ static void __init pci_fixup_ide_bases(struct pci_dev *d) 
	}

}



static void __init pci_fixup_ide_trash(struct pci_dev *d)

static void __devinit pci_fixup_ide_trash(struct pci_dev *d)

{

	int i;