Commit 8b8bae90 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jesse Barnes
Browse files

PCI/ACPI: Report ASPM support to BIOS if not disabled from command line 

We need to distinguish the situation in which ASPM support is
disabled from the command line or through .config from the situation
in which it is disabled, because the hardware or BIOS can't handle
it.  In the former case we should not report ASPM support to the BIOS
through ACPI _OSC, but in the latter case we should do that.

Introduce pcie_aspm_support_enabled() that can be used by
acpi_pci_root_add() to determine whether or not it should report ASPM
support to the BIOS through _OSC.

Cc: stable@kernel.org
References: https://bugzilla.kernel.org/show_bug.cgi?id=29722
References: https://bugzilla.kernel.org/show_bug.cgi?id=20232


Reported-and-tested-by: default avatarOrtwin Glück <odi@odi.ch>
Reviewed-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Tested-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent a44f99c7

drivers/acpi/pci_root.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) 
	/* Indicate support for various _OSC capabilities. */

	if (pci_ext_cfg_avail(root->bus->self))

		flags |= OSC_EXT_PCI_CONFIG_SUPPORT;

	if (pcie_aspm_enabled())

	if (pcie_aspm_support_enabled())

		flags |= OSC_ACTIVE_STATE_PWR_SUPPORT |

			OSC_CLOCK_PWR_CAPABILITY_SUPPORT;

	if (pci_msi_enabled())

drivers/pci/pcie/aspm.c

+7 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct pcie_link_state { 
};



static int aspm_disabled, aspm_force, aspm_clear_state;

static bool aspm_support_enabled = true;

static DEFINE_MUTEX(aspm_lock);

static LIST_HEAD(link_list);
@@ -896,6 +897,7 @@ static int __init pcie_aspm_disable(char *str) 
{

	if (!strcmp(str, "off")) {

		aspm_disabled = 1;

		aspm_support_enabled = false;

		printk(KERN_INFO "PCIe ASPM is disabled\n");

	} else if (!strcmp(str, "force")) {

		aspm_force = 1;
@@ -930,3 +932,8 @@ int pcie_aspm_enabled(void) 
}

EXPORT_SYMBOL(pcie_aspm_enabled);



bool pcie_aspm_support_enabled(void)

{

	return aspm_support_enabled;

}

EXPORT_SYMBOL(pcie_aspm_support_enabled);

include/linux/pci.h

+3 −4
Original line number Diff line number Diff line
@@ -1002,12 +1002,11 @@ extern bool pcie_ports_auto; 
#endif



#ifndef CONFIG_PCIEASPM

static inline int pcie_aspm_enabled(void)

{

	return 0;

}

static inline int pcie_aspm_enabled(void) { return 0; }

static inline bool pcie_aspm_support_enabled(void) { return false; }

#else

extern int pcie_aspm_enabled(void);

extern bool pcie_aspm_support_enabled(void);

#endif



#ifdef CONFIG_PCIEAER

CRA Git | Maintained and supported by SUSTech CRA and CCSE