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

Commit 862f0012 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI changes from Bjorn Helgaas:
 "PCI device hotplug
    - Add pci_alloc_dev() interface (Gu Zheng)
    - Add pci_bus_get()/put() for reference counting (Jiang Liu)
    - Fix SR-IOV reference count issues (Jiang Liu)
    - Remove unused acpi_pci_roots list (Jiang Liu)

  MSI
    - Conserve interrupt resources on x86 (Alexander Gordeev)

  AER
    - Force fatal severity when component has been reset (Betty Dall)
    - Reset link below Root Port as well as Downstream Port (Betty Dall)
    - Fix "Firmware first" flag setting (Bjorn Helgaas)
    - Don't parse HEST for non-PCIe devices (Bjorn Helgaas)

  ASPM
    - Warn when we can't disable ASPM as driver requests (Bjorn Helgaas)

  Miscellaneous
    - Add CircuitCo PCI IDs (Darren Hart)
    - Add AMD CZ SATA and SMBus PCI IDs (Shane Huang)
    - Work around Ivytown NTB BAR size issue (Jon Mason)
    - Detect invalid initial BAR values (Kevin Hao)
    - Add pcibios_release_device() (Sebastian Ott)
    - Fix powerpc & sparc PCI_UNKNOWN power state usage (Bjorn Helgaas)"

* tag 'pci-v3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (51 commits)
  MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci
  PCI: Add CircuitCo vendor ID and subsystem ID
  PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
  PCI: Return early on allocation failures to unindent mainline code
  PCI: Simplify IOV implementation and fix reference count races
  PCI: Drop redundant setting of bus->is_added in virtfn_add_bus()
  unicore32/PCI: Remove redundant call of pci_bus_add_devices()
  m68k/PCI: Remove redundant call of pci_bus_add_devices()
  PCI / ACPI / PM: Use correct power state strings in messages
  PCI: Fix comment typo for pcie_pme_remove()
  PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev()
  PCI: Fix refcount issue in pci_create_root_bus() error recovery path
  ia64/PCI: Clean up pci_scan_root_bus() usage
  PCI/AER: Reset link for devices below Root Port or Downstream Port
  ACPI / APEI: Force fatal AER severity when component has been reset
  PCI/AER: Remove "extern" from function declarations
  PCI/AER: Move AER severity defines to aer.h
  PCI/AER: Set dev->__aer_firmware_first only for matching devices
  PCI/AER: Factor out HEST device type matching
  PCI/AER: Don't parse HEST table for non-PCIe devices
  ...
parents f991fae5 a0f75f9d

Documentation/i2c/busses/i2c-piix4

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Supported adapters: 
  * AMD SP5100 (SB700 derivative found on some server mainboards)

    Datasheet: Publicly available at the AMD website

    http://support.amd.com/us/Embedded_TechDocs/44413.pdf

  * AMD Hudson-2

  * AMD Hudson-2, CZ

    Datasheet: Not publicly available

  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge

    Datasheet: Publicly available at the SMSC website http://www.smsc.com

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ F: include/linux/acpi.h 
F:	include/acpi/

F:	Documentation/acpi

F:	Documentation/ABI/testing/sysfs-bus-acpi

F:	drivers/pci/*acpi*

F:	drivers/pci/*/*acpi*

F:	drivers/pci/*/*/*acpi*



ACPI FAN DRIVER

M:	Zhang Rui <rui.zhang@intel.com>

arch/ia64/sn/kernel/io_init.c

+4 −11
Original line number Diff line number Diff line
@@ -268,17 +268,10 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) 


	bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller,

				&resources);

 	if (bus == NULL)

 		goto error_return; /* error, or bus already scanned */



	bus->sysdata = controller;



	return;



error_return:

 	if (bus == NULL) {

		kfree(res);

		kfree(controller);

	return;

	}

}



/*

arch/m68k/platform/coldfire/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ static int __init mcf_pci_init(void) 
	pci_bus_size_bridges(rootbus);

	pci_bus_assign_resources(rootbus);

	pci_enable_bridges(rootbus);

	pci_bus_add_devices(rootbus);

	return 0;

}

arch/powerpc/kernel/pci_of_scan.c

+2 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 
	const char *type;

	struct pci_slot *slot;



	dev = alloc_pci_dev();

	dev = pci_alloc_dev(bus);

	if (!dev)

		return NULL;

	type = of_get_property(node, "device_type", NULL);
@@ -137,7 +137,6 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 


	pr_debug("    create device, devfn: %x, type: %s\n", devfn, type);



	dev->bus = bus;

	dev->dev.of_node = of_node_get(node);

	dev->dev.parent = bus->bridge;

	dev->dev.bus = &pci_bus_type;
@@ -165,7 +164,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 
	pr_debug("    class: 0x%x\n", dev->class);

	pr_debug("    revision: 0x%x\n", dev->revision);



	dev->current_state = 4;		/* unknown power state */

	dev->current_state = PCI_UNKNOWN;	/* unknown power state */

	dev->error_state = pci_channel_io_normal;

	dev->dma_mask = 0xffffffff;