Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755893AbdLOSbD (ORCPT ); Fri, 15 Dec 2017 13:31:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:59000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755419AbdLOSbA (ORCPT ); Fri, 15 Dec 2017 13:31:00 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9123821877 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=helgaas@kernel.org Date: Fri, 15 Dec 2017 12:30:58 -0600 From: Bjorn Helgaas To: "Rafael J. Wysocki" Cc: Thomas Gleixner , linux-pci@vger.kernel.org, Linus Torvalds , Maarten Lankhorst , Michal Hocko , Andy Lutomirski , Linux Kernel Mailing List , the arch/x86 maintainers , Daniel Vetter , Bjorn Helgaas , "Rafael J. Wysocki" , linux-pm@vger.kernel.org, Chen Yu Subject: Re: [PATCH] PCI / PM: Force devices to D0 in pci_pm_thaw_noirq() Message-ID: <20171215183058.GV30595@bhelgaas-glaptop.roam.corp.google.com> References: <168050887.sZlTFXWCmO@aspire.rjw.lan> <11146834.AWaDHrVcmB@aspire.rjw.lan> <2582328.YfNXS1jHhG@aspire.rjw.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2582328.YfNXS1jHhG@aspire.rjw.lan> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2339 Lines: 57 On Fri, Dec 15, 2017 at 03:07:18AM +0100, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > It is incorrect to call pci_restore_state() for devices in low-power > states (D1-D3), as that involves the restoration of MSI setup which > requires MMIO to be operational and that is only the case in D0. > > However, pci_pm_thaw_noirq() may do that if the driver's "freeze" > callbacks put the device into a low-power state, so fix it by making > it force devices into D0 via pci_set_power_state() instead of trying > to "update" their power state which is pointless. > > Fixes: e60514bd4485 (PCI/PM: Restore the status of PCI devices across hibernation) > Cc: 4.13+ # 4.13+ > Reported-by: Thomas Gleixner > Reported-by: Maarten Lankhorst > Tested-by: Thomas Gleixner > Tested-by: Maarten Lankhorst > Signed-off-by: Rafael J. Wysocki Acked-by: Bjorn Helgaas Let me know if you want me to take this. I don't have anything currently queued up that touches pci-driver.c, so I'm happy if you take it yourself. > --- > > The bug is not as old as I thought, actually. > > Yes, we did the pci_update_current_state() in pci_pm_thaw_noirq() > forever, but it started to be problematic in 4.13, when we started > to call pci_restore_state() in addition to it to fix another issue. > > --- > drivers/pci/pci-driver.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > Index: linux-pm/drivers/pci/pci-driver.c > =================================================================== > --- linux-pm.orig/drivers/pci/pci-driver.c > +++ linux-pm/drivers/pci/pci-driver.c > @@ -1027,7 +1027,12 @@ static int pci_pm_thaw_noirq(struct devi > if (pci_has_legacy_pm_support(pci_dev)) > return pci_legacy_resume_early(dev); > > - pci_update_current_state(pci_dev, PCI_D0); > + /* > + * pci_restore_state() requires the device to be in D0 (because of MSI > + * restoration among other things), so force it into D0 in case the > + * driver's "freeze" callbacks put it into a low-power state directly. > + */ > + pci_set_power_state(pci_dev, PCI_D0); > pci_restore_state(pci_dev); > > if (drv && drv->pm && drv->pm->thaw_noirq) >