svn commit: r231026 - head/sys/powerpc/ofw

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Feb  5 16:54:26 2012
New Revision: 231026
URL: http://svn.freebsd.org/changeset/base/231026

Log:
  Make sure to remap adjusted resources.

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

Modified: head/sys/powerpc/ofw/ofw_pci.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_pci.c	Sun Feb  5 16:53:02 2012	(r231025)
+++ head/sys/powerpc/ofw/ofw_pci.c	Sun Feb  5 16:54:26 2012	(r231026)
@@ -431,6 +431,7 @@ ofw_pci_adjust_resource(device_t bus, de
 {
 	struct rman *rm = NULL;
 	struct ofw_pci_softc *sc = device_get_softc(bus);
+	int error;
 
 	switch (type) {
 	case SYS_RES_MEMORY:
@@ -445,7 +446,22 @@ ofw_pci_adjust_resource(device_t bus, de
 
 	if (!rman_is_region_manager(res, rm))
 		return (EINVAL);
-	return (rman_adjust_resource(res, start, end));
+
+	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);
 }