From owner-svn-src-all@FreeBSD.ORG  Tue Feb  7 19:14:14 2012
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 25DA71065686;
	Tue,  7 Feb 2012 19:14:14 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 145F68FC08;
	Tue,  7 Feb 2012 19:14:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q17JEDNC003451;
	Tue, 7 Feb 2012 19:14:13 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q17JEDBK003449;
	Tue, 7 Feb 2012 19:14:13 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201202071914.q17JEDBK003449@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 7 Feb 2012 19:14:13 +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: r231149 - head/sys/powerpc/ofw
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, 07 Feb 2012 19:14:14 -0000

Author: nwhitehorn
Date: Tue Feb  7 19:14:13 2012
New Revision: 231149
URL: http://svn.freebsd.org/changeset/base/231149

Log:
  The bus resource adjustment API is not meant to work on active resources.
  Return an error if a driver attempts this, and, if INVARIANTS is on,
  panic.
  
  Reviewed by:	jhb

Modified:
  head/sys/powerpc/ofw/ofw_pci.c

Modified: head/sys/powerpc/ofw/ofw_pci.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_pci.c	Tue Feb  7 19:13:47 2012	(r231148)
+++ head/sys/powerpc/ofw/ofw_pci.c	Tue Feb  7 19:14:13 2012	(r231149)
@@ -431,7 +431,11 @@ ofw_pci_adjust_resource(device_t bus, de
 {
 	struct rman *rm = NULL;
 	struct ofw_pci_softc *sc = device_get_softc(bus);
-	int error;
+
+	KASSERT(!(rman_get_flags(res) & RF_ACTIVE),
+	    ("active resources cannot be adjusted"));
+	if (rman_get_flags(res) & RF_ACTIVE)
+		return (EINVAL);
 
 	switch (type) {
 	case SYS_RES_MEMORY:
@@ -447,21 +451,7 @@ ofw_pci_adjust_resource(device_t bus, de
 	if (!rman_is_region_manager(res, rm))
 		return (EINVAL);
 
-	error = rman_adjust_resource(res, start, end);
-	if (error)
-		return (error);
-
-	if (rman_get_flags(res) & RF_ACTIVE) {
-		/* Remap memory resources */
-		error = ofw_pci_deactivate_resource(bus, child, type,
-		    rman_get_rid(res), res);
-		if (error)
-			return (error);
-		error = ofw_pci_activate_resource(bus, child, type,
-		    rman_get_rid(res), res);
-	}
-
-	return (error);
+	return (rman_adjust_resource(res, start, end));
 }