From patchwork Sat Mar 5 20:48:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 612961 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p25KmkXV024000 for ; Sat, 5 Mar 2011 20:48:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752669Ab1CEUsp (ORCPT ); Sat, 5 Mar 2011 15:48:45 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:54876 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752659Ab1CEUso (ORCPT ); Sat, 5 Mar 2011 15:48:44 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id EF6621A74EB; Sat, 5 Mar 2011 21:38:32 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14586-09; Sat, 5 Mar 2011 21:38:14 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id E77141A708D; Sat, 5 Mar 2011 21:38:14 +0100 (CET) From: "Rafael J. Wysocki" To: Jesse Barnes Subject: [PATCH v2] PCI / PM: Add kerneldoc description of pci_pm_reset() Date: Sat, 5 Mar 2011 21:48:44 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.38-rc7+; KDE/4.4.4; x86_64; ; ) Cc: Len Brown , Linux PM mailing list , LKML , linux-pci@vger.kernel.org References: <201103051324.27461.rjw@sisk.pl> In-Reply-To: <201103051324.27461.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201103052148.44413.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 05 Mar 2011 20:48:46 +0000 (UTC) Index: linux-2.6/drivers/pci/pci.c =================================================================== --- linux-2.6.orig/drivers/pci/pci.c +++ linux-2.6/drivers/pci/pci.c @@ -2473,6 +2473,21 @@ clear: return 0; } +/** + * pci_pm_reset - Put device into PCI_D3 and back into PCI_D0. + * @dev: Device to reset. + * @probe: If set, only check if the device can be reset this way. + * + * If @dev supports native PCI PM and its PCI_PM_CTRL_NO_SOFT_RESET flag is + * unset, it will be reinitialized internally when going from PCI_D3hot to + * PCI_D0. If that's the case and the device is not in a low-power state + * already, force it into PCI_D3hot and back to PCI_D0, causing it to be reset. + * + * NOTE: This causes the caller to sleep for twice the device power transition + * cooldown period, which for the D0->D3hot and D3hot->D0 transitions is 10 ms + * by devault (i.e. unless the @dev's d3_delay field has a different value). + * Moreover, only devices in D0 can be reset by this function. + */ static int pci_pm_reset(struct pci_dev *dev, int probe) { u16 csr;