Re: [PATCH -v6 0/4] PCIe, PM, Add PCIe runtime D3cold support

[Bjorn Helgaas <bhelgaas@google.com>]

On Mon, Jun 18, 2012 at 11:20 PM, Huang Ying <ying.huang@intel.com> wrote:
> Changelog:
>
> v6:
>
> - Disable device D3cold during system suspend/hibernate with a new method per Rafeal's comments
>
> v5:
>
> - Disable device D3cold during system suspend/hibernate per Rafael's comments
>
> v4:
>
> - Minors fixes based on comments from Rafael
>
> v3:
>
> - Drop device.power.power_must_be_on, use pci_dev.no_d3cold instead
> - Drop device.power.power_off_user, use pci_dev.d3cold_allowed instead
> - Use black list instead of white list in pcie port runtime support per request from Bjorn
> - Various fixes based on comments from Rafael
>
> v2:
>
> - Refreshed based on comments from Rafael
>
> [PATCH -v6 1/4] ACPI, PM, Specify lowest allowed state for device sleep
> [PATCH -v6 2/4] PCIe, PM, Add runtime PM support to PCIe port
> [PATCH -v6 3/4] PCI, PM, Do not call pci_set_power_state with PCI_D3cold
> [PATCH -v6 4/4] PCIe, PM, Add PCIe runtime D3cold support

What kernel is this series based on?  Patch 4/4 doesn't apply to my
tree.  This hunk fails because I don't have the "Some devices mustn't
be in D3 ..." context:

@@ -1754,6 +1841,10 @@ int pci_prepare_to_sleep(struct pci_dev
        if (target_state == PCI_POWER_ERROR)
                return -EIO;

+       /* D3cold during system suspend/hibernate is not supported */
+       if (target_state > PCI_D3hot)
+               target_state = PCI_D3hot;
+
        /* Some devices mustn't be in D3 during system sleep */
        if (target_state == PCI_D3hot &&
                        (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))