From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754111AbZBJAWU (ORCPT ); Mon, 9 Feb 2009 19:22:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752075AbZBJAWI (ORCPT ); Mon, 9 Feb 2009 19:22:08 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:46012 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751128AbZBJAWG (ORCPT ); Mon, 9 Feb 2009 19:22:06 -0500 From: "Rafael J. Wysocki" To: Pavel Machek Subject: Re: [PATCH 1/3] PCI PM: Do not disable and enable bridges during suspend-resume Date: Tue, 10 Feb 2009 01:21:22 +0100 User-Agent: KMail/1.11.0 (Linux/2.6.29-rc2-tst; KDE/4.2.0; x86_64; ; ) Cc: Jesse Barnes , Linus Torvalds , Linux PCI , pm list , LKML References: <200902012229.27517.rjw@sisk.pl> <200902081423.08991.rjw@sisk.pl> <20090209093926.GA4358@atrey.karlin.mff.cuni.cz> In-Reply-To: <20090209093926.GA4358@atrey.karlin.mff.cuni.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200902100121.23552.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 09 February 2009, Pavel Machek wrote: > > On Sunday 08 February 2009, Pavel Machek wrote: > > > Hi! > > > > > > > > > their standard config spaces are restored. Fix this by not attempting > > > > > > to disable bridges during suspend and enable them during resume. > > > > > ... > > > > > > @@ -428,16 +428,18 @@ static int pci_pm_default_resume(struct > > > > > > { > > > > > > pci_fixup_device(pci_fixup_resume, pci_dev); > > > > > > > > > > > > - if (!pci_is_bridge(pci_dev)) > > > > > > - pci_enable_wake(pci_dev, PCI_D0, false); > > > > > > + if (pci_is_bridge(pci_dev)) > > > > > > + return 0; > > > > > > > > > > > > + pci_enable_wake(pci_dev, PCI_D0, false); > > > > > > return pci_pm_reenable_device(pci_dev); > > > > > > } > > > > > > > > > > Are you sure? This goes from doing reenable_device to not doing it for > > > > > bridges, seemingly contradicting changelog? > > > > > > > > Can you explain what you mean, please? > > > > > > It looks to me like the patch does not match the changelog. > > > > > > Changelog says "enable bridge during resume", but code does return 0 > > > if it seems bridge. > > > > Ah, I see. The changelog was supposed to mean that the bridges would not > > be disabled during suspend and also would not be enabled during resume > > (which shouldn't be necessary, since they would be automatically enabled > > as a result of restoring their configuration registers). > > You can add my acked-by: when you resubmit with fixed > changelog... :-). It's merged, so that wouldn't be of any use. Thanks, Rafael