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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: clear bridge resource range if BIOS assigned bad one
  PCI: hotplug/cpqphp, fix NULL dereference
  Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"
  PCI: change resource collision messages from KERN_ERR to KERN_INFO
parents 891a9894 837c4ef1

Documentation/ABI/testing/sysfs-bus-pci

+0 −40
Original line number Diff line number Diff line
@@ -133,46 +133,6 @@ Description: 
		The symbolic link points to the PCI device sysfs entry of the

		Physical Function this device associates with.





What:		/sys/bus/pci/slots/...

Date:		April 2005 (possibly older)

KernelVersion:	2.6.12 (possibly older)

Contact:	linux-pci@vger.kernel.org

Description:

		When the appropriate driver is loaded, it will create a

		directory per claimed physical PCI slot in

		/sys/bus/pci/slots/.  The names of these directories are

		specific to the driver, which in turn, are specific to the

		platform, but in general, should match the label on the

		machine's physical chassis.



		The drivers that can create slot directories include the

		PCI hotplug drivers, and as of 2.6.27, the pci_slot driver.



		The slot directories contain, at a minimum, a file named

		'address' which contains the PCI bus:device:function tuple.

		Other files may appear as well, but are specific to the

		driver.



What:		/sys/bus/pci/slots/.../function[0-7]

Date:		March 2010

KernelVersion:	2.6.35

Contact:	linux-pci@vger.kernel.org

Description:

		If PCI slot directories (as described above) are created,

		and the physical slot is actually populated with a device,

		symbolic links in the slot directory pointing to the

		device's PCI functions are created as well.



What:		/sys/bus/pci/devices/.../slot

Date:		March 2010

KernelVersion:	2.6.35

Contact:	linux-pci@vger.kernel.org

Description:

		If PCI slot directories (as described above) are created,

		a symbolic link pointing to the slot directory will be

		created as well.



What:		/sys/bus/pci/slots/.../module

Date:		June 2009

Contact:	linux-pci@vger.kernel.org

arch/microblaze/pci/pci-common.c

+1 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,7 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus) 
		printk(KERN_WARNING "PCI: Cannot allocate resource region "

		       "%d of PCI bridge %d, will remap\n", i, bus->number);

clear_resource:

		res->start = res->end = 0;

		res->flags = 0;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 
					 * Invalidate the resource to prevent

					 * child resource allocations in this

					 * range. */

					r->start = r->end = 0;

					r->flags = 0;

				}

			}

arch/powerpc/kernel/pci-common.c

+1 −0
Original line number Diff line number Diff line
@@ -1309,6 +1309,7 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus) 
		printk(KERN_WARNING "PCI: Cannot allocate resource region "

		       "%d of PCI bridge %d, will remap\n", i, bus->number);

clear_resource:

		res->start = res->end = 0;

		res->flags = 0;

	}

arch/x86/pci/i386.c

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ EXPORT_SYMBOL(pcibios_align_resource); 
 *	  the fact the PCI specs explicitly allow address decoders to be

 *	  shared between expansion ROMs and other resource regions, it's

 *	  at least dangerous)

 *	- bad resource sizes or overlaps with other regions

 *

 *  Our solution:

 *	(1) Allocate resources for all buses behind PCI-to-PCI bridges.
@@ -136,6 +137,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 
					 * child resource allocations in this

					 * range.

					 */

					r->start = r->end = 0;

					r->flags = 0;

				}

			}