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

Commit 1cfd2bda 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: (30 commits)
  PCI: update for owner removal from struct device_attribute
  PCI: Fix warnings when CONFIG_DMI unset
  PCI: Do not run NVidia quirks related to MSI with MSI disabled
  x86/PCI: use for_each_pci_dev()
  PCI: use for_each_pci_dev()
  PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()
  PCI: export SMBIOS provided firmware instance and label to sysfs
  PCI: Allow read/write access to sysfs I/O port resources
  x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN
  PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}
  PCI: disable mmio during bar sizing
  PCI: MSI: Remove unsafe and unnecessary hardware access
  PCI: Default PCIe ASPM control to on and require !EMBEDDED to disable
  PCI: kernel oops on access to pci proc file while hot-removal
  PCI: pci-sysfs: remove casts from void*
  ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
  PCI hotplug: make sure child bridges are enabled at hotplug time
  PCI hotplug: shpchp: Removed check for hotplug of display devices
  PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_device
  PCI: Don't enable aspm before drivers have had a chance to veto it
  ...
parents b57bdda5 763e9db9

Documentation/ABI/testing/sysfs-bus-pci

+27 −0
Original line number Diff line number Diff line
@@ -139,3 +139,30 @@ Contact: linux-pci@vger.kernel.org 
Description:

		This symbolic link points to the PCI hotplug controller driver

		module that manages the hotplug slot.



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

Date:		July 2010

Contact:	Narendra K <narendra_k@dell.com>, linux-bugs@dell.com

Description:

		Reading this attribute will provide the firmware

		given name(SMBIOS type 41 string) of the PCI device.

		The attribute will be created only if the firmware

		has given a name to the PCI device.

Users:

		Userspace applications interested in knowing the

		firmware assigned name of the PCI device.



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

Date:		July 2010

Contact:	Narendra K <narendra_k@dell.com>, linux-bugs@dell.com

Description:

		Reading this attribute will provide the firmware

		given instance(SMBIOS type 41 device type instance)

		of the PCI device. The attribute will be created

		only if the firmware has given a device type instance

		to the PCI device.

Users:

		Userspace applications interested in knowing the

		firmware assigned device type instance of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.

Documentation/filesystems/sysfs-pci.txt

+5 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ files, each with their own function. 
       local_cpus	   nearby CPU mask (cpumask, ro)

       remove		   remove device from kernel's list (ascii, wo)

       resource		   PCI resource host addresses (ascii, ro)

       resource0..N	   PCI resource N, if present (binary, mmap)

       resource0..N	   PCI resource N, if present (binary, mmap, rw[1])

       resource0_wc..N_wc  PCI WC map resource N, if prefetchable (binary, mmap)

       rom		   PCI ROM resource, if present (binary, ro)

       subsystem_device	   PCI subsystem device (ascii, ro)
@@ -54,13 +54,16 @@ files, each with their own function. 
  binary - file contains binary data

  cpumask - file contains a cpumask type



[1] rw for RESOURCE_IO (I/O port) regions only



The read only files are informational, writes to them will be ignored, with

the exception of the 'rom' file.  Writable files can be used to perform

actions on the device (e.g. changing config space, detaching a device).

mmapable files are available via an mmap of the file at offset 0 and can be

used to do actual device programming from userspace.  Note that some platforms

don't support mmapping of certain resources, so be sure to check the return

value from any attempted mmap.

value from any attempted mmap.  The most notable of these are I/O port

resources, which also provide read/write access.



The 'enable' file provides a counter that indicates how many times the device 

has been enabled.  If the 'enable' file currently returns '4', and a '1' is

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -1976,6 +1976,8 @@ and is between 256 and 4096 characters. It is defined in the file 
		norom		[X86] Do not assign address space to

				expansion ROMs that do not already have

				BIOS assigned address ranges.

		nobar		[X86] Do not assign address space to the

				BARs that weren't assigned by the BIOS.

		irqmask=0xMMMM	[X86] Set a bit mask of IRQs allowed to be

				assigned automatically to PCI devices. You can

				make the kernel exclude IRQs of your ISA cards

arch/ia64/kernel/msi_ia64.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int ia64_set_msi_irq_affinity(unsigned int irq, 
	if (irq_prepare_move(irq, cpu))

		return -1;



	read_msi_msg(irq, &msg);

	get_cached_msi_msg(irq, &msg);



	addr = msg.address_lo;

	addr &= MSI_ADDR_DEST_ID_MASK;

arch/ia64/sn/kernel/msi_sn.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static int sn_set_msi_irq_affinity(unsigned int irq, 
	 * Release XIO resources for the old MSI PCI address

	 */



	read_msi_msg(irq, &msg);

	get_cached_msi_msg(irq, &msg);

        sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo;

	pdev = sn_pdev->pdi_linux_pcidev;

	provider = SN_PCIDEV_BUSPROVIDER(pdev);