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

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

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

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (88 commits)
  PCI: fix HT MSI mapping fix
  PCI: don't enable too much HT MSI mapping
  x86/PCI: make pci=lastbus=255 work when acpi is on
  PCI: save and restore PCIe 2.0 registers
  PCI: update fakephp for bus_id removal
  PCI: fix kernel oops on bridge removal
  PCI: fix conflict between SR-IOV and config space sizing
  powerpc/PCI: include pci.h in powerpc MSI implementation
  PCI Hotplug: schedule fakephp for feature removal
  PCI Hotplug: rename legacy_fakephp to fakephp
  PCI Hotplug: restore fakephp interface with complete reimplementation
  PCI: Introduce /sys/bus/pci/devices/.../rescan
  PCI: Introduce /sys/bus/pci/devices/.../remove
  PCI: Introduce /sys/bus/pci/rescan
  PCI: Introduce pci_rescan_bus()
  PCI: do not enable bridges more than once
  PCI: do not initialize bridges more than once
  PCI: always scan child buses
  PCI: pci_scan_slot() returns newly found devices
  PCI: don't scan existing devices
  ...

Fix trivial append-only conflict in Documentation/feature-removal-schedule.txt
parents 32527bc0 eeafda70

Documentation/ABI/testing/sysfs-bus-pci

+70 −0
Original line number Diff line number Diff line
@@ -41,6 +41,49 @@ Description: 
		for the device and attempt to bind to it.  For example:

		# echo "8086 10f5" > /sys/bus/pci/drivers/foo/new_id



What:		/sys/bus/pci/drivers/.../remove_id

Date:		February 2009

Contact:	Chris Wright <chrisw@sous-sol.org>

Description:

		Writing a device ID to this file will remove an ID

		that was dynamically added via the new_id sysfs entry.

		The format for the device ID is:

		VVVV DDDD SVVV SDDD CCCC MMMM.	That is Vendor ID, Device

		ID, Subsystem Vendor ID, Subsystem Device ID, Class,

		and Class Mask.  The Vendor ID and Device ID fields are

		required, the rest are optional.  After successfully

		removing an ID, the driver will no longer support the

		device.  This is useful to ensure auto probing won't

		match the driver to the device.  For example:

		# echo "8086 10f5" > /sys/bus/pci/drivers/foo/remove_id



What:		/sys/bus/pci/rescan

Date:		January 2009

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Description:

		Writing a non-zero value to this attribute will

		force a rescan of all PCI buses in the system, and

		re-discover previously removed devices.

		Depends on CONFIG_HOTPLUG.



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

Date:		January 2009

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Description:

		Writing a non-zero value to this attribute will

		hot-remove the PCI device and any of its children.

		Depends on CONFIG_HOTPLUG.



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

Date:		January 2009

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Description:

		Writing a non-zero value to this attribute will

		force a rescan of the device's parent bus and all

		child buses, and re-discover devices removed earlier

		from this part of the device tree.

		Depends on CONFIG_HOTPLUG.



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

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>
@@ -52,3 +95,30 @@ Description: 
		that some devices may have malformatted data.  If the

		underlying VPD has a writable section then the

		corresponding section of this file will be writable.



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

Date:		March 2009

Contact:	Yu Zhao <yu.zhao@intel.com>

Description:

		This symbolic link appears when hardware supports the SR-IOV

		capability and the Physical Function driver has enabled it.

		The symbolic link points to the PCI device sysfs entry of the

		Virtual Function whose index is N (0...MaxVFs-1).



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

Date:		March 2009

Contact:	Yu Zhao <yu.zhao@intel.com>

Description:

		This symbolic link appears when hardware supports the SR-IOV

		capability and the Physical Function driver has enabled it,

		and this device has vendor specific dependencies with others.

		The symbolic link points to the PCI device sysfs entry of

		Physical Function this device depends on.



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

Date:		March 2009

Contact:	Yu Zhao <yu.zhao@intel.com>

Description:

		This symbolic link appears when a device is a Virtual Function.

		The symbolic link points to the PCI device sysfs entry of the

		Physical Function this device associates with.

Documentation/DocBook/kernel-api.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ X!Edrivers/pci/hotplug.c 
-->

!Edrivers/pci/probe.c

!Edrivers/pci/rom.c

!Edrivers/pci/iov.c

     </sect1>

     <sect1><title>PCI Hotplug Support Library</title>

!Edrivers/pci/hotplug/pci_hotplug_core.c