From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com ([134.134.136.20]:46774 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965AbdFMMlZ (ORCPT ); Tue, 13 Jun 2017 08:41:25 -0400 Date: Tue, 13 Jun 2017 15:41:23 +0300 From: Imre Deak To: Bjorn Helgaas Cc: stable@vger.kernel.org, Greg Kroah-Hartman , "Rafael J. Wysocki" , Ben Hutchings , Jani Nikula Subject: Re: [PATCH 1/2] PCI/PM: Add needs_resume flag to avoid suspend complete optimization Message-ID: <20170613124123.GA4399@ideak-desk.fi.intel.com> Reply-To: imre.deak@intel.com References: <1497350337-19192-1-git-send-email-imre.deak@intel.com> <20170613115744.GA30979@bhelgaas-glaptop.roam.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170613115744.GA30979@bhelgaas-glaptop.roam.corp.google.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Jun 13, 2017 at 06:57:44AM -0500, Bjorn Helgaas wrote: > On Tue, Jun 13, 2017 at 01:38:56PM +0300, Imre Deak wrote: > > commit 4d071c3238987325b9e50e33051a40d1cce311cc upstream. > > > > Some drivers - like i915 - may not support the system suspend direct > > complete optimization due to differences in their runtime and system > > suspend sequence. Add a flag that when set resumes the device before > > calling the driver's system suspend handlers which effectively disables > > the optimization. > > > > Needed by a future patch fixing suspend/resume on i915. > > > > Suggested by Rafael. > > > > Signed-off-by: Bjorn Helgaas > > Acked-by: Rafael J. Wysocki > > Cc: # v4.8 > > (rebased on v4.8, added kernel version to commit message stable tag) > > Signed-off-by: Imre Deak > > The signoff chain above is incorrect. It suggests that I wrote this > patch, but I did not. > > The chain on 4d071c323898 ("PCI/PM: Add needs_resume flag to avoid > suspend complete optimization") is: > > Signed-off-by: Imre Deak > Signed-off-by: Bjorn Helgaas > Acked-by: Rafael J. Wysocki > Cc: stable@vger.kernel.org > > which indicates that Imre wrote the patch, and I received it from him > and merged it into the PCI tree. Yes, I moved my signoff to the end, since I rebased the original patch and updated the stable tag line to Cc: # v4.8 tag. What's the proper way of signing off these changes, have two signed-off lines, keeping the original and add a new one at the end? --Imre > > > --- > > drivers/pci/pci.c | 3 ++- > > include/linux/pci.h | 5 +++++ > > 2 files changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > > index aab9d51..970ee70 100644 > > --- a/drivers/pci/pci.c > > +++ b/drivers/pci/pci.c > > @@ -2099,7 +2099,8 @@ bool pci_dev_keep_suspended(struct pci_dev *pci_dev) > > > > if (!pm_runtime_suspended(dev) > > || pci_target_state(pci_dev) != pci_dev->current_state > > - || platform_pci_need_resume(pci_dev)) > > + || platform_pci_need_resume(pci_dev) > > + || (pci_dev->dev_flags & PCI_DEV_FLAGS_NEEDS_RESUME)) > > return false; > > > > /* > > diff --git a/include/linux/pci.h b/include/linux/pci.h > > index 0ab8359..ebeec21 100644 > > --- a/include/linux/pci.h > > +++ b/include/linux/pci.h > > @@ -178,6 +178,11 @@ enum pci_dev_flags { > > PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7), > > /* Get VPD from function 0 VPD */ > > PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8), > > + /* > > + * Resume before calling the driver's system suspend hooks, disabling > > + * the direct_complete optimization. > > + */ > > + PCI_DEV_FLAGS_NEEDS_RESUME = (__force pci_dev_flags_t) (1 << 11), > > }; > > > > enum pci_irq_reroute_variant { > > -- > > 2.7.4 > >