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

Commit 556f12f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI changes from Bjorn Helgaas:
 "Host bridge hotplug
    - Major overhaul of ACPI host bridge add/start (Rafael Wysocki, Yinghai Lu)
    - Major overhaul of PCI/ACPI binding (Rafael Wysocki, Yinghai Lu)
    - Split out ACPI host bridge and ACPI PCI device hotplug (Yinghai Lu)
    - Stop caching _PRT and make independent of bus numbers (Yinghai Lu)

  PCI device hotplug
    - Clean up cpqphp dead code (Sasha Levin)
    - Disable ARI unless device and upstream bridge support it (Yijing Wang)
    - Initialize all hot-added devices (not functions 0-7) (Yijing Wang)

  Power management
    - Don't touch ASPM if disabled (Joe Lawrence)
    - Fix ASPM link state management (Myron Stowe)

  Miscellaneous
    - Fix PCI_EXP_FLAGS accessor (Alex Williamson)
    - Disable Bus Master in pci_device_shutdown (Konstantin Khlebnikov)
    - Document hotplug resource and MPS parameters (Yijing Wang)
    - Add accessor for PCIe capabilities (Myron Stowe)
    - Drop pciehp suspend/resume messages (Paul Bolle)
    - Make pci_slot built-in only (not a module) (Jiang Liu)
    - Remove unused PCI/ACPI bind ops (Jiang Liu)
    - Removed used pci_root_bus (Bjorn Helgaas)"

* tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (51 commits)
  PCI/ACPI: Don't cache _PRT, and don't associate them with bus numbers
  PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
  ACPI / PCI: Make pci_slot built-in only, not a module
  PCI/PM: Clear state_saved during suspend
  PCI: Use atomic_inc_return() rather than atomic_add_return()
  PCI: Catch attempts to disable already-disabled devices
  PCI: Disable Bus Master unconditionally in pci_device_shutdown()
  PCI: acpiphp: Remove dead code for PCI host bridge hotplug
  PCI: acpiphp: Create companion ACPI devices before creating PCI devices
  PCI: Remove unused "rc" in virtfn_add_bus()
  PCI: pciehp: Drop suspend/resume ENTRY messages
  PCI/ASPM: Don't touch ASPM if forcibly disabled
  PCI/ASPM: Deallocate upstream link state even if device is not PCIe
  PCI: Document MPS parameters pci=pcie_bus_safe, pci=pcie_bus_perf, etc
  PCI: Document hpiosize= and hpmemsize= resource reservation parameters
  PCI: Use PCI Express Capability accessor
  PCI: Introduce accessor to retrieve PCIe Capabilities Register
  PCI: Put pci_dev in device tree as early as possible
  PCI: Skip attaching driver in device_add()
  PCI: acpiphp: Keep driver loaded even if no slots found
  ...
parents fffddfd6 018ba0a6

Documentation/kernel-parameters.txt

+21 −0
Original line number Diff line number Diff line
@@ -2262,6 +2262,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
				This sorting is done to get a device

				order compatible with older (<= 2.4) kernels.

		nobfsort	Don't sort PCI devices into breadth-first order.

		pcie_bus_tune_off	Disable PCIe MPS (Max Payload Size)

				tuning and use the BIOS-configured MPS defaults.

		pcie_bus_safe	Set every device's MPS to the largest value

				supported by all devices below the root complex.

		pcie_bus_perf	Set device MPS to the largest allowable MPS

				based on its parent bus. Also set MRRS (Max

				Read Request Size) to the largest supported

				value (no larger than the MPS that the device

				or bus can support) for best performance.

		pcie_bus_peer2peer	Set every device's MPS to 128B, which

				every device is guaranteed to support. This

				configuration allows peer-to-peer DMA between

				any pair of devices, possibly at the cost of

				reduced performance.  This also guarantees

				that hot-added devices will work.

		cbiosize=nn[KMG]	The fixed amount of bus space which is

				reserved for the CardBus bridge's IO window.

				The default value is 256 bytes.
@@ -2283,6 +2298,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
				the default.

				off: Turn ECRC off

				on: Turn ECRC on.

		hpiosize=nn[KMG]	The fixed amount of bus space which is

				reserved for hotplug bridge's IO window.

				Default size is 256 bytes.

		hpmemsize=nn[KMG]	The fixed amount of bus space which is

				reserved for hotplug bridge's memory window.

				Default size is 2 megabytes.

		realloc=	Enable/disable reallocating PCI bridge resources

				if allocations done by BIOS are too small to

				accommodate resources required by all child

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

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ void pcibios_resource_survey(void); 
/* pci-vdk.c */



extern int __nongpreldata pcibios_last_bus;

extern struct pci_bus *__nongpreldata pci_root_bus;

extern struct pci_ops *__nongpreldata pci_root_ops;



/* pci-irq.c */

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

+1 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
unsigned int __nongpreldata pci_probe = 1;



int  __nongpreldata pcibios_last_bus = -1;

struct pci_bus *__nongpreldata pci_root_bus;

struct pci_ops *__nongpreldata pci_root_ops;



/*
@@ -416,8 +415,7 @@ int __init pcibios_init(void) 
	printk("PCI: Probing PCI hardware\n");

	pci_add_resource(&resources, &pci_ioport_resource);

	pci_add_resource(&resources, &pci_iomem_resource);

	pci_root_bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL,

					 &resources);

	pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources);



	pcibios_irq_init();

	pcibios_fixup_peer_bridges();

arch/ia64/pci/pci.c

+8 −0
Original line number Diff line number Diff line
@@ -393,6 +393,14 @@ out1: 
	return NULL;

}



int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)

{

	struct pci_controller *controller = bridge->bus->sysdata;



	ACPI_HANDLE_SET(&bridge->dev, controller->acpi_handle);

	return 0;

}



static int is_valid_resource(struct pci_dev *dev, int idx)

{

	unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;

arch/mn10300/unit-asb2305/pci-asb2305.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ extern void pcibios_resource_survey(void); 
/* pci.c */



extern int pcibios_last_bus;

extern struct pci_bus *pci_root_bus;

extern struct pci_ops *pci_root_ops;



extern struct irq_routing_table *pcibios_get_irq_routing_table(void);