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

Commit 99759619 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:
  PCI: label: remove #include of ACPI header to avoid warnings
  PCI: label: Fix compilation error when CONFIG_ACPI is unset
  PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.
  PCI: introduce reset_resource()
  PCI: data structure agnostic free list function
  PCI: refactor io size calculation code
  PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH
  PCI hotplug: acpiphp: set current_state to D0 in register_slot
  PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs
  PCI: add more checking to ICH region quirks
  PCI: aer-inject: Override PCIe AER Mask Registers
  PCI: fix tlan build when CONFIG_PCI is not enabled
  PCI: remove quirk for pre-production systems
  PCI: Avoid potential NULL pointer dereference in pci_scan_bridge
  PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
  PCI: sysfs: Fix failure path for addition of "vpd" attribute
parents b061c59c 65d8defe

Documentation/ABI/testing/sysfs-bus-pci

+24 −7
Original line number Diff line number Diff line
@@ -145,9 +145,11 @@ 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.

		given name (SMBIOS type 41 string or ACPI _DSM string) of

		the PCI device.	The attribute will be created only

		if the firmware	has given a name to the PCI device.

		ACPI _DSM string name will be given priority if the

		system firmware provides SMBIOS type 41 string also.

Users:

		Userspace applications interested in knowing the

		firmware assigned name of the PCI device.
@@ -157,12 +159,27 @@ 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.

		given instance (SMBIOS type 41 device type instance) of the

		PCI device. The attribute will be created only if the firmware

		has given an instance number 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.



What:		/sys/bus/pci/devices/.../acpi_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 (ACPI _DSM instance number) of the PCI device.

		The attribute will be created only if the firmware has given

		an instance number to the PCI device. ACPI _DSM instance number

		will be given priority if the system firmware provides SMBIOS

		type 41 device type instance also.

Users:

		Userspace applications interested in knowing the

		firmware assigned instance number of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.

arch/x86/pci/irq.c

+6 −9
Original line number Diff line number Diff line
@@ -597,21 +597,18 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route 
		return 1;

	}



	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 

		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {

	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN && 

	     device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX) 

	||  (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && 

	     device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)

	||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&

	     device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {

		r->name = "PIIX/ICH";

		r->get = pirq_piix_get;

		r->set = pirq_piix_set;

		return 1;

	}



	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 

		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {

		r->name = "PIIX/ICH";

		r->get = pirq_piix_get;

		r->set = pirq_piix_set;

		return 1;

	}

	return 0;

}

drivers/pci/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -87,3 +87,5 @@ config PCI_IOAPIC 
	depends on ACPI

	depends on HOTPLUG

	default y



select NLS if (DMI || ACPI)

drivers/pci/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -54,8 +54,9 @@ obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o 


#

# ACPI Related PCI FW Functions

# ACPI _DSM provided firmware instance and string name

#

obj-$(CONFIG_ACPI)    += pci-acpi.o

obj-$(CONFIG_ACPI)    += pci-acpi.o pci-label.o



# SMBIOS provided firmware instance and labels

obj-$(CONFIG_DMI)    += pci-label.o

drivers/pci/hotplug/acpiphp_glue.c

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 


	pdev = pci_get_slot(pbus, PCI_DEVFN(device, function));

	if (pdev) {

		pdev->current_state = PCI_D0;

		slot->flags |= (SLOT_ENABLED | SLOT_POWEREDON);

		pci_dev_put(pdev);

	}