[lkml]   [2011]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[RFC][PATCH v3 3/3]: PCI: Disable ASPM when _OSC control is not granted for PCIe services

    v3 -> v2: Added text to describe the problem
    v2 -> v1: Split this patch from v1
    v1 : Part of:

    Disable ASPM when no _OSC control for PCIe services is granted
    by the BIOS. This is to protect systems with a buggy BIOS that
    did not set the ACPI FADT "ASPM Controls" bit even though the
    underlying HW can't do ASPM.

    To turn "on" ASPM the minimum the BIOS needs to do:
    1. Clear the ACPI FADT "ASPM Controls" bit.
    2. Support _OSC appropriately

    There is no _OSC Control bit for ASPM. However, we expect the BIOS to
    support _OSC for a Root Bridge that originates a PCIe hierarchy. If this
    is not the case - we are better off not enabling ASPM on that server.

    Commit 852972acff8f10f3a15679be2059bb94916cba5d (ACPI: Disable ASPM if the
    Platform won't provide _OSC control for PCIe) describes the above scenario.
    To quote verbatim from there:
    [The PCI SIG documentation for the _OSC OS/firmware handshaking interface

    "If the _OSC control method is absent from the scope of a host bridge
    device, then the operating system must not enable or attempt to use any
    features defined in this section for the hierarchy originated by the host

    The obvious interpretation of this is that the OS should not attempt to use
    PCIe hotplug, PME or AER - however, the specification also notes that an
    _OSC method is *required* for PCIe hierarchies, and experimental validation
    with An Alternative OS indicates that it doesn't use any PCIe functionality
    if the _OSC method is missing. That arguably means we shouldn't be using
    MSI or extended config space, but right now our problems seem to be limited
    to vendors being surprised when ASPM gets enabled on machines when other
    OSs refuse to do so. So, for now, let's just disable ASPM if the _OSC
    method doesn't exist or refuses to hand over PCIe capability control.]

    Signed-off-by: Naga Chumbalkar <>
    Cc: Rafael J. Wysocki <>
    Cc: Matthew Garrett <>

    drivers/acpi/pci_root.c | 9 +++++++--
    drivers/pci/pcie/portdrv_core.c | 5 +----
    2 files changed, 8 insertions(+), 6 deletions(-)

    diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
    index 8524939..2b012db 100644
    --- a/drivers/acpi/pci_root.c
    +++ b/drivers/acpi/pci_root.c
    @@ -32,6 +32,7 @@
    #include <linux/pm_runtime.h>
    #include <linux/pci.h>
    #include <linux/pci-acpi.h>
    +#include <linux/pci-aspm.h>
    #include <linux/acpi.h>
    #include <linux/slab.h>
    #include <acpi/acpi_bus.h>
    @@ -591,12 +592,16 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)

    status = acpi_pci_osc_control_set(device->handle, &flags,
    - if (ACPI_SUCCESS(status))
    + if (ACPI_SUCCESS(status)) {
    "ACPI _OSC control (0x%02x) granted\n", flags);
    - else
    + } else {
    "ACPI _OSC request failed (code %d)\n", status);
    + printk(KERN_INFO "Unable to assume _OSC PCIe control. "
    + "Disabling ASPM\n");
    + pcie_no_aspm();
    + }

    pci_acpi_add_bus_pm_notifier(device, root->bus);
    diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
    index 5130d0d..595654a 100644
    --- a/drivers/pci/pcie/portdrv_core.c
    +++ b/drivers/pci/pcie/portdrv_core.c
    @@ -15,7 +15,6 @@
    #include <linux/slab.h>
    #include <linux/pcieport_if.h>
    #include <linux/aer.h>
    -#include <linux/pci-aspm.h>

    #include "../pci.h"
    #include "portdrv.h"
    @@ -356,10 +355,8 @@ int pcie_port_device_register(struct pci_dev *dev)

    /* Get and check PCI Express port services */
    capabilities = get_port_device_capability(dev);
    - if (!capabilities) {
    - pcie_no_aspm();
    + if (!capabilities)
    return 0;
    - }


     \ /
      Last update: 2011-03-21 04:31    [W:0.025 / U:18.416 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site