diff options
author | Fabien Thomas <fabient@FreeBSD.org> | 2012-06-20 09:01:44 +0000 |
---|---|---|
committer | Fabien Thomas <fabient@FreeBSD.org> | 2012-06-20 09:01:44 +0000 |
commit | 940853dd8413fb787d3dac21e79821e3067c0fa4 (patch) | |
tree | cbc94c24fe35f12543f3bfae55c12cf2ba5c5d07 /sys/dev/viawd | |
parent | 7ed5b3afa2853017574cbdab811c8210d91aae19 (diff) | |
download | src-940853dd8413fb787d3dac21e79821e3067c0fa4.tar.gz src-940853dd8413fb787d3dac21e79821e3067c0fa4.zip |
Fix viawd(4) that was only working as a module.
Obtained from: jhb
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=237295
Diffstat (limited to 'sys/dev/viawd')
-rw-r--r-- | sys/dev/viawd/viawd.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/viawd/viawd.c b/sys/dev/viawd/viawd.c index d56b6775fe4a..46d7644f77ea 100644 --- a/sys/dev/viawd/viawd.c +++ b/sys/dev/viawd/viawd.c @@ -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); |