lkml.org 
[lkml]   [2012]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 08/83] PCI/PM: Resume device before shutdown
    Date
    3.6-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Huang Ying <ying.huang@intel.com>

    commit 3ff2de9ba1a2e22e548979dbcd46e999b22c93d8 upstream.

    Some actions during shutdown need device to be in D0 state, such as
    MSI shutdown etc, so resume device before shutdown.

    Without this patch, a device may not be enumerated after a kexec
    because the corresponding bridge is not in D0, so that
    configuration space of the device is not accessible.

    Signed-off-by: Huang Ying <ying.huang@intel.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/pci/pci-driver.c | 12 ++----------
    1 file changed, 2 insertions(+), 10 deletions(-)

    --- a/drivers/pci/pci-driver.c
    +++ b/drivers/pci/pci-driver.c
    @@ -421,6 +421,8 @@ static void pci_device_shutdown(struct d
    struct pci_dev *pci_dev = to_pci_dev(dev);
    struct pci_driver *drv = pci_dev->driver;

    + pm_runtime_resume(dev);
    +
    if (drv && drv->shutdown)
    drv->shutdown(pci_dev);
    pci_msi_shutdown(pci_dev);
    @@ -431,16 +433,6 @@ static void pci_device_shutdown(struct d
    * continue to do DMA
    */
    pci_disable_device(pci_dev);
    -
    - /*
    - * Devices may be enabled to wake up by runtime PM, but they need not
    - * be supposed to wake up the system from its "power off" state (e.g.
    - * ACPI S5). Therefore disable wakeup for all devices that aren't
    - * supposed to wake up the system at this point. The state argument
    - * will be ignored by pci_enable_wake().
    - */
    - if (!device_may_wakeup(dev))
    - pci_enable_wake(pci_dev, PCI_UNKNOWN, false);
    }

    #ifdef CONFIG_PM



    \
     
     \ /
      Last update: 2012-11-23 00:41    [W:4.130 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site