Attachment 481721 Details for Bug 714455

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

PCI-ACPI-Report-ASPM-support-to-BIOS-if-not-disabled-from-command-line.patch (text/plain), 3.43 KB, created by Rafael Wysocki on 2012-03-15 22:49:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafael Wysocki

Created: 2012-03-15 22:49:29 UTC

Size: 3.43 KB

patch

obsolete

>commit 8b8bae901ce23addbdcdb54fa1696fb2d049feb5
>Author: Rafael J. Wysocki <rjw@sisk.pl>
>Date:   Sat Mar 5 13:21:51 2011 +0100
>
>    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: Ortwin GlÃ¼ck <odi@odi.ch>
>    Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
>    Tested-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
>    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
>    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
>---
> drivers/acpi/pci_root.c |    2 +-
> drivers/pci/pcie/aspm.c |    7 +++++++
> include/linux/pci.h     |    7 +++----
> 3 files changed, 11 insertions(+), 5 deletions(-)
>
>Index: linux-2.6.37-openSUSE-11.4/drivers/acpi/pci_root.c
>===================================================================
>--- linux-2.6.37-openSUSE-11.4.orig/drivers/acpi/pci_root.c
>+++ linux-2.6.37-openSUSE-11.4/drivers/acpi/pci_root.c
>@@ -593,7 +593,7 @@ static int __devinit acpi_pci_root_add(s
> 	/* 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())
>Index: linux-2.6.37-openSUSE-11.4/drivers/pci/pcie/aspm.c
>===================================================================
>--- linux-2.6.37-openSUSE-11.4.orig/drivers/pci/pcie/aspm.c
>+++ linux-2.6.37-openSUSE-11.4/drivers/pci/pcie/aspm.c
>@@ -69,6 +69,7 @@ struct pcie_link_state {
> };
> 
> static int aspm_disabled, aspm_force;
>+static bool aspm_support_enabled = true;
> static DEFINE_MUTEX(aspm_lock);
> static LIST_HEAD(link_list);
> 
>@@ -889,6 +890,7 @@ static int __init pcie_aspm_disable(char
> {
> 	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;
>@@ -917,3 +919,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);
>Index: linux-2.6.37-openSUSE-11.4/include/linux/pci.h
>===================================================================
>--- linux-2.6.37-openSUSE-11.4.orig/include/linux/pci.h
>+++ linux-2.6.37-openSUSE-11.4/include/linux/pci.h
>@@ -1007,12 +1007,11 @@ extern int unregister_msi_get_owner(int
> #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
> 
> #ifndef CONFIG_PCIE_ECRC

Actions: View | Diff

Attachments on bug 714455: 481721