 @@ -1,14 +1,14 @@
-/*	$NetBSD: xmd.c,v 1.1.2.4 2010/08/28 16:27:02 uebayasi Exp $	*/
+/*	$NetBSD: xmd.c,v 1.1.2.5 2010/10/30 08:51:10 uebayasi Exp $	*/
 /*-
  * Copyright (c) 2010 Tsubai Masanari.  All rights reserved.
  * Copyright (c) 2010 Masao Uebayashi.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,52 +18,48 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmd.c,v 1.1.2.4 2010/08/28 16:27:02 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmd.c,v 1.1.2.5 2010/10/30 08:51:10 uebayasi Exp $");
 #include "opt_xip.h"
 #include "opt_xmd.h"
 #ifndef XIP
 #error xmd(4) needs options XIP
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/kmem.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/kmem.h>
 #include <machine/vmparam.h>
-#include <dev/xmdvar.h>
+#include <uvm/uvm_extern.h>
 struct xmd_softc {
 	vaddr_t sc_addr;
 	size_t sc_size;
 	void *sc_phys;
 	struct disk sc_dkdev;
 	struct bufq_state *sc_buflist;
 };
 void xmdattach(int);
 static void xmd_attach(device_t, device_t, void *);
 @@ -117,29 +113,27 @@ xmdattach(int n)
 		cf->cf_fstate = FSTATE_NOTFOUND;
 		(void)config_attach_pseudo(cf);
+	}
+}
 static void
 xmd_attach(device_t parent, device_t self, void *aux)
+{
 	struct xmd_softc *sc = device_private(self);
 	sc->sc_addr = (vaddr_t)md_root_image;
 	sc->sc_size = (size_t)md_root_size;
-#ifdef XIP
+	sc->sc_phys = pmap_physload_device(sc->sc_addr, sc->sc_size, PROT_READ, 0);
 	sc->sc_phys = xmd_machdep_physload(sc->sc_addr, sc->sc_size);
 #endif
 	disk_init(&sc->sc_dkdev, device_xname(self), NULL);
 	disk_attach(&sc->sc_dkdev);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 static int
 xmd_detach(device_t self, int flags)
+{
 	struct xmd_softc *sc = device_private(self);
 	int rc;
 @@ -149,29 +143,27 @@ xmd_detach(device_t self, int flags)
 	if (sc->sc_dkdev.dk_openmask == 0)
 		;	/* nothing to do */
 	else if ((flags & DETACH_FORCE) == 0)
 		rc = EBUSY;
 	mutex_exit(&sc->sc_dkdev.dk_openlock);
 	if (rc != 0)
 		return rc;
 	pmf_device_deregister(self);
 	disk_detach(&sc->sc_dkdev);
 	disk_destroy(&sc->sc_dkdev);
-#ifdef XIP
+	pmap_physunload_device(sc->sc_phys);
 	xmd_machdep_physunload(sc->sc_phys);
 #endif
 	return 0;
+}
 static int
 xmd_open(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	struct xmd_softc *sc = device_lookup_private(&xmd_cd, DISKUNIT(dev));
 	struct disk *dk = &sc->sc_dkdev;
 	const int part = DISKUNIT(dev);
 	const int pmask = 1 << part;
 	if (sc == NULL)
 @@ -200,34 +192,32 @@ xmd_close(dev_t dev, int flags, int fmt,
+}
 int
 xmd_ioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
+{
 	struct xmd_softc *sc = device_lookup_private(&xmd_cd, DISKUNIT(dev));
 	const int part = DISKUNIT(dev);
 	int error = 0;
 	if (sc == NULL)
 		return -1;
 	switch (cmd) {
 #ifdef XIP
 	case DIOCGPHYSSEG:
 		if (sc->sc_phys == NULL)
 			error = EINVAL;
 		else
 			*(void **)data = sc->sc_phys;
 		break;
 #endif
 	case DIOCGDINFO:
 		*(struct disklabel *)data = *sc->sc_dkdev.dk_label;
 		break;
 	case DIOCGPART:
 		((struct partinfo *)data)->disklab = sc->sc_dkdev.dk_label;
 		((struct partinfo *)data)->part =
 		    &sc->sc_dkdev.dk_label->d_partitions[part];
 		break;
 	default:
 		error = EINVAL;
 @@ -251,27 +241,27 @@ xmd_read(dev_t dev, struct uio *uio, int
+}
 paddr_t
 xmd_mmap(dev_t dev, off_t off, int prot)
+{
 	struct xmd_softc *sc = device_lookup_private(&xmd_cd, DISKUNIT(dev));
 	if (sc == NULL)
 		return -1;
 	if ((u_int64_t)off >= sc->sc_size)
 		return -1;
-	return xmd_machdep_mmap(sc->sc_addr, off, prot);
+	return pmap_mmap(sc->sc_addr, off);
+}
 static void
 xmd_strategy(struct buf *bp)
+{
 	struct xmd_softc *sc;
 	void *addr;
 	size_t off, count;
 	sc = device_lookup_private(&xmd_cd, DISKUNIT(bp->b_dev));
 	off = bp->b_blkno << DEV_BSHIFT;