Re: [BUGFIX 2/2] PCI/PM: Resume device before shutdown

[Rafael J. Wysocki]

On Wednesday 24 of October 2012 14:54:14 Huang Ying wrote:
> Some actions during shutdown need device to be in D0 state, such as
> MSI shutdown etc, so resume device before shutdown.
> 
> Signed-off-by: Huang Ying <ying.huang@xxxxxxxxx>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

> ---
>  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
> @@ -398,6 +398,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);
> @@ -408,16 +410,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
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/