Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <11844217.O9o76ZdvQC@kreacher>
In-Reply-To: <11844217.O9o76ZdvQC@kreacher>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Wed, 20 Oct 2021 16:24:06 +0200
Message-ID: <CAJZ5v0hC9pKrPgHNasN7YMmJysJymOM++h2ZT-_PQ=4ZFq7Kqw@mail.gmail.com>
Subject: Re: [PATCH] PCI: PM: Fix ordering of operations in pci_back_from_sleep()
To:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc:     Linux PCI <linux-pci@vger.kernel.org>,
        Linux PM <linux-pm@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Bjorn Helgaas <helgaas@kernel.org>,
        Mika Westerberg <mika.westerberg@linux.intel.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Fri, Oct 15, 2021 at 6:46 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> The ordering of operations in pci_back_from_sleep() is incorrect,
> because the device may be in D3cold when it runs and pci_enable_wake()
> needs to access the device's configuration space which cannot be
> done in D3cold.
>
> Fix this by calling pci_set_power_state() to put the device into D0
> before calling pci_enable_wake() for it.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

If there are no concerns about this one, I will queue it up for 5.16.

> ---
>  drivers/pci/pci.c |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> Index: linux-pm/drivers/pci/pci.c
> ===================================================================
> --- linux-pm.orig/drivers/pci/pci.c
> +++ linux-pm/drivers/pci/pci.c
> @@ -2638,8 +2638,13 @@ EXPORT_SYMBOL(pci_prepare_to_sleep);
>   */
>  int pci_back_from_sleep(struct pci_dev *dev)
>  {
> +       int ret = pci_set_power_state(dev, PCI_D0);
> +
> +       if (ret)
> +               return ret;
> +
>         pci_enable_wake(dev, PCI_D0, false);
> -       return pci_set_power_state(dev, PCI_D0);
> +       return 0;
>  }
>  EXPORT_SYMBOL(pci_back_from_sleep);
>
>
>
>