Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756727AbZAaAIX (ORCPT ); Fri, 30 Jan 2009 19:08:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752625AbZAaAIM (ORCPT ); Fri, 30 Jan 2009 19:08:12 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:50946 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752230AbZAaAIL (ORCPT ); Fri, 30 Jan 2009 19:08:11 -0500 From: "Rafael J. Wysocki" To: Linus Torvalds Subject: Re: 2.6.29-rc3: tg3 dead after resume Date: Sat, 31 Jan 2009 01:07:47 +0100 User-Agent: KMail/1.10.3 (Linux/2.6.29-rc2-tst; KDE/4.1.3; x86_64; ; ) Cc: Parag Warudkar , Matt Carlson , "netdev@vger.kernel.org" , Linux Kernel Mailing List , "David S. Miller" , Andrew Morton References: <200901310031.37660.rjw@sisk.pl> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901310107.48623.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1943 Lines: 57 On Saturday 31 January 2009, Linus Torvalds wrote: > > On Sat, 31 Jan 2009, Rafael J. Wysocki wrote: > > > > I wonder if this change makes any difference: > > > > --- linux-2.6.orig/drivers/pci/pci-driver.c > > +++ linux-2.6/drivers/pci/pci-driver.c > > @@ -501,6 +501,9 @@ static int pci_pm_suspend(struct device > > if (pci_has_legacy_pm_support(pci_dev)) > > return pci_legacy_suspend(dev, PMSG_SUSPEND); > > > > + if (!drv || !drv->pm) > > + return 0; > > + > > if (drv && drv->pm && drv->pm->suspend) { > > error = drv->pm->suspend(dev); > > suspend_report_result(drv->pm->suspend, error); > > I don't think that's right. Now you don't end up calling > pci_pm_default_suspend_generic() at all, and this no pci_save_state(). > > But I think it could easily be the call to pci_disable_enabled_device(). > It does that > > if (atomic_read(&dev->enable_cnt)) > do_pci_disable_device(dev); > > and that ends up disabling PCI_COMMAND_MASTER and then calling > pcibios_disable_device(). > > Any device we have ever done pci_enable_device() on would trigger this, > which includes PCIE bridges, for example. And while the pcie driver does > that > > pcie_portdrv_restore_config -> > pci_enable_device(dev); > > thing to re-enable it, that's a no-op since the enable_count is already > non-zero. > > And we do try to restore it (pci_restore_standard_config() will call > pci_restore_state()), but since we've done the > pci_disable_enabled_device() _before_ we did the pci_save_state(), we now > restore a non-working setup. > > I think. The rules are too damn subtle there. Rafael, can you look around > a bit? Sure, I'm looking at it right now. Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/