From owner-svn-src-all@FreeBSD.ORG  Tue Oct 19 17:15:22 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 624E61065693;
	Tue, 19 Oct 2010 17:15:22 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 511178FC28;
	Tue, 19 Oct 2010 17:15:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9JHFMi8021420;
	Tue, 19 Oct 2010 17:15:22 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9JHFMYV021418;
	Tue, 19 Oct 2010 17:15:22 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201010191715.o9JHFMYV021418@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 19 Oct 2010 17:15:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214065 - head/sys/dev/pci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Oct 2010 17:15:22 -0000

Author: jkim
Date: Tue Oct 19 17:15:22 2010
New Revision: 214065
URL: http://svn.freebsd.org/changeset/base/214065

Log:
  Remove PCI header type 0 restriction from power state changes.  PCI config.
  registers for bridges are saved and restored since r200341.
  
  OK'ed by:	imp, jhb

Modified:
  head/sys/dev/pci/pci.c

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Tue Oct 19 17:05:51 2010	(r214064)
+++ head/sys/dev/pci/pci.c	Tue Oct 19 17:15:22 2010	(r214065)
@@ -2916,7 +2916,7 @@ pci_set_power_children(device_t dev, dev
 	 * a different power state, use it instead.  If power management
 	 * is not present, the firmware is responsible for managing
 	 * device power.  Skip children who aren't attached since they
-	 * are handled separately.  Only manage type 0 devices for now.
+	 * are handled separately.
 	 */
 	pcib = device_get_parent(dev);
 	for (i = 0; i < numdevs; i++) {
@@ -2924,8 +2924,6 @@ pci_set_power_children(device_t dev, dev
 		dinfo = device_get_ivars(child);
 		dstate = state;
 		if (device_is_attached(child) &&
-		    (dinfo->cfg.hdrtype & PCIM_HDRTYPE) ==
-		    PCIM_HDRTYPE_NORMAL &&
 		    PCIB_POWER_FOR_SLEEP(pcib, dev, &dstate) == 0)
 			pci_set_powerstate(child, dstate);
 	}