Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 (55ab9756) · Commits · e / devices / android_kernel_xiaomi_sm6125

Documentation/power/pci.txt

+7 −10

Original line number	Original line	Diff line number	Diff line
	@@ -102,31 +102,28 @@ pci_save_state
	--------------		--------------

	Usage:		Usage:
	pci_save_state(dev, buffer);		pci_save_state(struct pci_dev *dev);

	Description:		Description:
	Save first 64 bytes of PCI config space. Buffer must be allocated by		Save first 64 bytes of PCI config space, along with any additional
	caller.		PCI-Express or PCI-X information.


	pci_restore_state		pci_restore_state
	-----------------		-----------------

	Usage:		Usage:
	pci_restore_state(dev, buffer);		pci_restore_state(struct pci_dev *dev);

	Description:		Description:
	Restore previously saved config space. (First 64 bytes only);		Restore previously saved config space.

	If buffer is NULL, then restore what information we know about the
	device from bootup: BARs and interrupt line.


	pci_set_power_state		pci_set_power_state
	-------------------		-------------------

	Usage:		Usage:
	pci_set_power_state(dev, state);		pci_set_power_state(struct pci_dev *dev, pci_power_t state);

	Description:		Description:
	Transition device to low power state using PCI PM Capabilities		Transition device to low power state using PCI PM Capabilities
	@@ -142,7 +139,7 @@ pci_enable_wake
	---------------		---------------

	Usage:		Usage:
	pci_enable_wake(dev, state, enable);		pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);

	Description:		Description:
	Enable device to generate PME# during low power state using PCI PM		Enable device to generate PME# during low power state using PCI PM

arch/i386/pci/common.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -191,6 +191,14 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
	DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2950"),		DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2950"),
	},		},
	},		},
			{
			.callback = set_bf_sort,
			.ident = "Dell PowerEdge R900",
			.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R900"),
			},
			},
	{		{
	.callback = set_bf_sort,		.callback = set_bf_sort,
	.ident = "HP ProLiant BL20p G3",		.ident = "HP ProLiant BL20p G3",

drivers/pci/pcie/portdrv_pci.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,7 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev,
	if (!dev->irq && dev->pin) {		if (!dev->irq && dev->pin) {
	printk(KERN_WARNING		printk(KERN_WARNING
	"%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n",		"%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n",
	__FUNCTION__, dev->device, dev->vendor);		__FUNCTION__, dev->vendor, dev->device);
	}		}
	if (pcie_port_device_register(dev)) {		if (pcie_port_device_register(dev)) {
	pci_disable_device(dev);		pci_disable_device(dev);

drivers/pci/quirks.c

+7 −11

Original line number	Original line	Diff line number	Diff line
	@@ -963,6 +963,13 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_ho
	* bridge. Unfortunately, this device has no subvendor/subdevice ID. So it		* bridge. Unfortunately, this device has no subvendor/subdevice ID. So it
	* becomes necessary to do this tweak in two steps -- I've chosen the Host		* becomes necessary to do this tweak in two steps -- I've chosen the Host
	* bridge as trigger.		* bridge as trigger.
			*
			* Note that we used to unhide the SMBus that way on Toshiba laptops
			* (Satellite A40 and Tecra M2) but then found that the thermal management
			* was done by SMM code, which could cause unsynchronized concurrent
			* accesses to the SMBus registers, with potentially bad effects. Thus you
			* should be very careful when adding new entries: if SMM is accessing the
			* Intel SMBus, this is a very good reason to leave it hidden.
	*/		*/
	static int asus_hides_smbus;		static int asus_hides_smbus;

	@@ -1040,17 +1047,6 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
	case 0x099c: /* HP Compaq nx6110 */		case 0x099c: /* HP Compaq nx6110 */
	asus_hides_smbus = 1;		asus_hides_smbus = 1;
	}		}
	} else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_TOSHIBA)) {
	if (dev->device == PCI_DEVICE_ID_INTEL_82855GM_HB)
	switch(dev->subsystem_device) {
	case 0x0001: /* Toshiba Satellite A40 */
	asus_hides_smbus = 1;
	}
	else if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB)
	switch(dev->subsystem_device) {
	case 0x0001: /* Toshiba Tecra M2 */
	asus_hides_smbus = 1;
	}
	} else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) {		} else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) {
	if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB)		if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB)
	switch(dev->subsystem_device) {		switch(dev->subsystem_device) {