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

Commit fdb2f9c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI changes from Bjorn Helgaas:
 "Host bridge hotplug
    - Protect acpi_pci_drivers and acpi_pci_roots (Taku Izumi)
    - Clear host bridge resource info to avoid issue when releasing
      (Yinghai Lu)
    - Notify acpi_pci_drivers when hot-plugging host bridges (Jiang Liu)
    - Use standard list ops for acpi_pci_drivers (Jiang Liu)

  Device hotplug
    - Use pci_get_domain_bus_and_slot() to close hotplug races (Jiang
      Liu)
    - Remove fakephp driver (Bjorn Helgaas)
    - Fix VGA ref count in hotplug remove path (Yinghai Lu)
    - Allow acpiphp to handle PCIe ports without native hotplug (Jiang
      Liu)
    - Implement resume regardless of pciehp_force param (Oliver Neukum)
    - Make pci_fixup_irqs() work after init (Thierry Reding)

  Miscellaneous
    - Add pci_pcie_type(dev) and remove pci_dev.pcie_type (Yijing Wang)
    - Factor out PCI Express Capability accessors (Jiang Liu)
    - Add pcibios_window_alignment() so powerpc EEH can use generic
      resource assignment (Gavin Shan)
    - Make pci_error_handlers const (Stephen Hemminger)
    - Cleanup drivers/pci/remove.c (Bjorn Helgaas)
    - Improve Vendor-Specific Extended Capability support (Bjorn
      Helgaas)
    - Use standard list ops for bus->devices (Bjorn Helgaas)
    - Avoid kmalloc in pci_get_subsys() and pci_get_class() (Feng Tang)
    - Reassign invalid bus number ranges (Intel DP43BF workaround)
      (Yinghai Lu)"

* tag 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (102 commits)
  PCI: acpiphp: Handle PCIe ports without native hotplug capability
  PCI/ACPI: Use acpi_driver_data() rather than searching acpi_pci_roots
  PCI/ACPI: Protect acpi_pci_roots list with mutex
  PCI/ACPI: Use acpi_pci_root info rather than looking it up again
  PCI/ACPI: Pass acpi_pci_root to acpi_pci_drivers' add/remove interface
  PCI/ACPI: Protect acpi_pci_drivers list with mutex
  PCI/ACPI: Notify acpi_pci_drivers when hot-plugging PCI root bridges
  PCI/ACPI: Use normal list for struct acpi_pci_driver
  PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots
  PCI: Fix default vga ref_count
  ia64/PCI: Clear host bridge aperture struct resource
  x86/PCI: Clear host bridge aperture struct resource
  PCI: Stop all children first, before removing all children
  Revert "PCI: Use hotplug-safe pci_get_domain_bus_and_slot()"
  PCI: Provide a default pcibios_update_irq()
  PCI: Discard __init annotations for pci_fixup_irqs() and related functions
  PCI: Use correct type when freeing bus resource list
  PCI: Check P2P bridge for invalid secondary/subordinate range
  PCI: Convert "new_id"/"remove_id" into generic pci_bus driver attributes
  xen-pcifront: Use hotplug-safe pci_get_domain_bus_and_slot()
  ...
parents 81f56e53 78c8f843

Documentation/feature-removal-schedule.txt

+0 −32
Original line number Diff line number Diff line
@@ -253,38 +253,6 @@ Who: Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com> 


-----------------------------



What:	fakephp and associated sysfs files in /sys/bus/pci/slots/

When:	2011

Why:	In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to

	represent a machine's physical PCI slots. The change in semantics

	had userspace implications, as the hotplug core no longer allowed

	drivers to create multiple sysfs files per physical slot (required

	for multi-function devices, e.g.). fakephp was seen as a developer's

	tool only, and its interface changed. Too late, we learned that

	there were some users of the fakephp interface.



	In 2.6.30, the original fakephp interface was restored. At the same

	time, the PCI core gained the ability that fakephp provided, namely

	function-level hot-remove and hot-add.



	Since the PCI core now provides the same functionality, exposed in:



		/sys/bus/pci/rescan

		/sys/bus/pci/devices/.../remove

		/sys/bus/pci/devices/.../rescan



	there is no functional reason to maintain fakephp as well.



	We will keep the existing module so that 'modprobe fakephp' will

	present the old /sys/bus/pci/slots/... interface for compatibility,

	but users are urged to migrate their applications to the API above.



	After a reasonable transition period, we will remove the legacy

	fakephp interface.

Who:	Alex Chiang <achiang@hp.com>



---------------------------



What:	CONFIG_RFKILL_INPUT

When:	2.6.33

Why:	Should be implemented in userspace, policy daemon.

arch/alpha/kernel/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -256,12 +256,6 @@ pcibios_fixup_bus(struct pci_bus *bus) 
	}

}



void __init

pcibios_update_irq(struct pci_dev *dev, int irq)

{

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

}



int

pcibios_enable_device(struct pci_dev *dev, int mask)

{

arch/arm/kernel/bios32.c

+0 −9
Original line number Diff line number Diff line
@@ -270,15 +270,6 @@ static void __devinit pci_fixup_it8152(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8152, pci_fixup_it8152);







void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)

{

	if (debug_pci)

		printk("PCI: Assigning IRQ %02d to %s\n", irq, pci_name(dev));

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

}



/*

 * If the bus contains any of these devices, then we must not turn on

 * parity checking of any kind.  Currently this is CyberPro 20x0 only.

arch/arm/mach-tegra/pcie.c

+1 −11
Original line number Diff line number Diff line
@@ -367,17 +367,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf1, tegra_pcie_fixup_class); 
/* Tegra PCIE requires relaxed ordering */

static void __devinit tegra_pcie_relax_enable(struct pci_dev *dev)

{

	u16 val16;

	int pos = pci_find_capability(dev, PCI_CAP_ID_EXP);



	if (pos <= 0) {

		dev_err(&dev->dev, "skipping relaxed ordering fixup\n");

		return;

	}



	pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &val16);

	val16 |= PCI_EXP_DEVCTL_RELAX_EN;

	pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, val16);

	pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN);

}

DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_relax_enable);

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

+1 −3
Original line number Diff line number Diff line
@@ -330,10 +330,8 @@ void __init pcibios_fixup_bus(struct pci_bus *bus) 
	pci_read_bridge_bases(bus);



	if (bus->number == 0) {

		struct list_head *ln;

		struct pci_dev *dev;

		for (ln=bus->devices.next; ln != &bus->devices; ln=ln->next) {

			dev = pci_dev_b(ln);

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

			if (dev->devfn == 0) {

				dev->resource[0].start = 0;

				dev->resource[0].end = 0;