Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757321AbZLDVOm (ORCPT ); Fri, 4 Dec 2009 16:14:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757292AbZLDVOk (ORCPT ); Fri, 4 Dec 2009 16:14:40 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:33708 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757140AbZLDVOj (ORCPT ); Fri, 4 Dec 2009 16:14:39 -0500 From: "Rafael J. Wysocki" To: Matthew Garrett Subject: Re: [RFC][PATCH 10/12] PCI / ACPI PM: Platform support for PCI PME wake-up (rev. 4) Date: Fri, 4 Dec 2009 22:15:03 +0100 User-Agent: KMail/1.12.3 (Linux/2.6.32-rjw; KDE/4.3.3; x86_64; ; ) Cc: pm list , LKML , Linux PCI , ACPI Devel Maling List , Alan Stern , Jesse Barnes , Oliver Neukum , Shaohua Li , Bjorn Helgaas , Francois Romieu , Len Brown References: <200911160047.46299.rjw@sisk.pl> <200911291642.20172.rjw@sisk.pl> <20091204162107.GA13371@srcf.ucam.org> In-Reply-To: <20091204162107.GA13371@srcf.ucam.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200912042215.03776.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1484 Lines: 40 On Friday 04 December 2009, Matthew Garrett wrote: > On Sun, Nov 29, 2009 at 04:42:20PM +0100, Rafael J. Wysocki wrote: > > > + if (event == ACPI_NOTIFY_DEVICE_WAKE) { > > + if (nb->dev->wakeup.run_wake_count > 0) { > > + if (nb->pci_bus) > > + pci_pme_wakeup_bus(nb->pci_bus); > > + if (nb->pci_dev) > > + pci_pme_wakeup(nb->pci_dev); > > We may receive wakeup events on devices that aren't PME capable, which > is the case for uhci on my test box. In that case we probably want to > wake them up unconditionally. > > + if (nb->pci_dev) { > + if (nb->pci_dev->pm_cap) > + pci_pme_wakeup(nb->pci_dev); > + else > + pm_request_resume(&nb->pci_dev->dev); > > seems to work, though possibly we should assume that the firmware knows > best and always schedule a wake in respose to a resume request? I think we can simply do: + if (nb->pci_dev) { + pci_pme_wakeup(nb->pci_dev); + pm_request_resume(&nb->pci_dev->dev); + } If the pci_pme_wakeup() spawns a resume request, the other call will just return. Thanks, 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/