From owner-svn-src-all@FreeBSD.ORG  Mon Jun 25 07:36:01 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 50270106567C;
	Mon, 25 Jun 2012 07:36:01 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3ACF38FC15;
	Mon, 25 Jun 2012 07:36:01 +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 q5P7a1CI058160;
	Mon, 25 Jun 2012 07:36:01 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5P7a1Tw058158;
	Mon, 25 Jun 2012 07:36:01 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201206250736.q5P7a1Tw058158@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Mon, 25 Jun 2012 07:36:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237555 - stable/8/sys/dev/viawd
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: Mon, 25 Jun 2012 07:36:01 -0000

Author: fabient
Date: Mon Jun 25 07:36:00 2012
New Revision: 237555
URL: http://svn.freebsd.org/changeset/base/237555

Log:
  MFC r237295:
  Fix viawd(4) that was only working as a module.

Modified:
  stable/8/sys/dev/viawd/viawd.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/dev/viawd/viawd.c
==============================================================================
--- stable/8/sys/dev/viawd/viawd.c	Mon Jun 25 07:33:54 2012	(r237554)
+++ stable/8/sys/dev/viawd/viawd.c	Mon Jun 25 07:36:00 2012	(r237555)
@@ -168,14 +168,18 @@ viawd_attach(device_t dev)
 	}
 
 	/* Allocate I/O register space. */
-	sc->wd_rid = 0;
-	sc->wd_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->wd_rid,
-	    pmbase, pmbase + VIAWD_MEM_LEN - 1, VIAWD_MEM_LEN,
+	sc->wd_rid = VIAWD_CONFIG_BASE;
+	sc->wd_res = bus_alloc_resource_any(sb_dev, SYS_RES_MEMORY, &sc->wd_rid,
 	    RF_ACTIVE | RF_SHAREABLE);
 	if (sc->wd_res == NULL) {
 		device_printf(dev, "Unable to map watchdog memory\n");
 		goto fail;
 	}
+	if (rman_get_size(sc->wd_res) < VIAWD_MEM_LEN) {
+		device_printf(dev, "Bad size for watchdog memory: %#x\n",
+		    (unsigned)rman_get_size(sc->wd_res));
+		goto fail;
+	}
 
 	/* Check if watchdog fired last boot. */
 	reg = viawd_read_4(sc, VIAWD_MEM_CTRL);
@@ -192,7 +196,7 @@ viawd_attach(device_t dev)
 	return (0);
 fail:
 	if (sc->wd_res != NULL)
-		bus_release_resource(dev, SYS_RES_MEMORY,
+		bus_release_resource(sb_dev, SYS_RES_MEMORY,
 		    sc->wd_rid, sc->wd_res);
 	return (ENXIO);
 }
@@ -224,7 +228,7 @@ viawd_detach(device_t dev)
 	}
 
 	if (sc->wd_res != NULL)
-		bus_release_resource(sc->dev, SYS_RES_MEMORY,
+		bus_release_resource(sc->sb_dev, SYS_RES_MEMORY,
 		    sc->wd_rid, sc->wd_res);
 
 	return (0);