Commit 7db78a9c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI/ACPI: Notify PCI devices when their power resource is turned on
  PCI: Add GPL license for drivers/pci/ioapic module
  PCI: Fix bit definitions of PCI_EXP_LNKCAP2 register
parents f9c15b42 71fbad6c

drivers/acpi/pci_bind.c

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static int acpi_pci_unbind(struct acpi_device *device) 


	device_set_run_wake(&dev->dev, false);

	pci_acpi_remove_pm_notifier(device);

	acpi_power_resource_unregister_device(&dev->dev, device->handle);



	if (!dev->subordinate)

		goto out;
@@ -71,6 +72,7 @@ static int acpi_pci_bind(struct acpi_device *device) 
		return 0;



	pci_acpi_add_pm_notifier(device, dev);

	acpi_power_resource_register_device(&dev->dev, device->handle);

	if (device->wakeup.flags.run_wake)

		device_set_run_wake(&dev->dev, true);

drivers/pci/ioapic.c

+2 −0
Original line number Diff line number Diff line
@@ -125,3 +125,5 @@ static void __exit ioapic_exit(void) 


module_init(ioapic_init);

module_exit(ioapic_exit);



MODULE_LICENSE("GPL");

include/uapi/linux/pci_regs.h

+3 −3
Original line number Diff line number Diff line
@@ -544,9 +544,9 @@ 
#define  PCI_EXP_OBFF_WAKE_EN	0x6000	/* OBFF using WAKE# signaling */

#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2	44	/* v2 endpoints end here */

#define PCI_EXP_LNKCAP2		44	/* Link Capability 2 */

#define  PCI_EXP_LNKCAP2_SLS_2_5GB 0x01	/* Current Link Speed 2.5GT/s */

#define  PCI_EXP_LNKCAP2_SLS_5_0GB 0x02	/* Current Link Speed 5.0GT/s */

#define  PCI_EXP_LNKCAP2_SLS_8_0GB 0x04	/* Current Link Speed 8.0GT/s */

#define  PCI_EXP_LNKCAP2_SLS_2_5GB 0x02	/* Supported Link Speed 2.5GT/s */

#define  PCI_EXP_LNKCAP2_SLS_5_0GB 0x04	/* Supported Link Speed 5.0GT/s */

#define  PCI_EXP_LNKCAP2_SLS_8_0GB 0x08	/* Supported Link Speed 8.0GT/s */

#define  PCI_EXP_LNKCAP2_CROSSLINK 0x100 /* Crosslink supported */

#define PCI_EXP_LNKCTL2		48	/* Link Control 2 */

#define PCI_EXP_LNKSTA2		50	/* Link Status 2 */