 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus.h,v 1.55 2009/04/16 16:55:00 macallan Exp $	*/
+/*	$NetBSD: bus.h,v 1.56 2009/05/26 03:30:25 macallan Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -235,29 +235,26 @@ static void	*bus_intr_establish(
 							  see machine/intr.h*/
 				int (*)(void *),	/*handler*/
 				void *);		/*handler arg*/
 static void	*bus_intr_establish2(
 				bus_space_tag_t,
 				int,			/*bus-specific intr*/
 				int,			/*device class level,
 							  see machine/intr.h*/
 				int (*)(void *),	/*handler*/
 				void *,			/*handler arg*/
 				void (*)(void));	/*optional fast vector*/
 int sparc_bus_map_large(bus_space_tag_t, int, bus_size_t, bus_size_t, int,
 		        bus_space_handle_t *);
 static __inline int
 bus_space_map(t, a, s, f, hp)
 	bus_space_tag_t	t;
 	bus_addr_t	a;
 	bus_size_t	s;
 	int		f;
 	bus_space_handle_t *hp;
+{
 	return (*t->sparc_bus_map)(t, a, s, f, (vaddr_t)0, hp);
+}
 static __inline int
 @@ -346,27 +343,27 @@ int	bus_space_alloc(bus_space_tag_t t, b
 void	bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh,
 	    bus_size_t size);
 #endif
 #define	bus_space_vaddr(t, h)	((void)(t), (void *)(h))
 /* flags for bus space map functions */
 #define BUS_SPACE_MAP_CACHEABLE	0x0001
 #define BUS_SPACE_MAP_LINEAR	0x0002
 #define BUS_SPACE_MAP_PREFETCHABLE	0x0004
 #define BUS_SPACE_MAP_BUS1	0x0100	/* placeholders for bus functions... */
 #define BUS_SPACE_MAP_BUS2	0x0200
 #define BUS_SPACE_MAP_BUS3	0x0400
-#define BUS_SPACE_MAP_BUS4	0x0800
+#define BUS_SPACE_MAP_LARGE	0x0800	/* map outside IODEV range */
 /* flags for bus_space_barrier() */
 #define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */
 #define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
 /*
  * Device space probe assistant.
  * The optional callback function's arguments are:
  *	the temporary virtual address
  *	the passed `arg' argument
  */
 int bus_space_probe(

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.293 2009/05/16 17:01:15 cegger Exp $ */
+/*	$NetBSD: machdep.c,v 1.294 2009/05/26 03:30:24 macallan Exp $ */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -61,27 +61,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 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.
+ *
  *	@(#)machdep.c	8.6 (Berkeley) 1/14/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.293 2009/05/16 17:01:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.294 2009/05/26 03:30:24 macallan Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_compat_sunos.h"
 #include "opt_sparc_arch.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/extent.h>
 @@ -1904,28 +1904,28 @@ bus_space_translate_address_generic(stru
 		if (rp->or_child_space != space)
 			continue;
 		/* We've found the connection to the parent bus. */
 		*bap = BUS_ADDR(rp->or_parent_space,
 		    rp->or_parent_base + BUS_ADDR_PADDR(*bap));
 		return (0);
+	}
 	return (EINVAL);
+}
-int
+static int
-sparc_bus_map(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
+sparc_bus_map_iodev(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
 	      vaddr_t va, bus_space_handle_t *hp)
+{
 	vaddr_t v;
 	paddr_t pa;
 	unsigned int pmtype;
 	bus_space_tag_t pt;
 static	vaddr_t iobase;
 	/*
 	 * This base class bus map function knows about address range
 	 * translation so bus drivers that need no other special
 	 * handling can just keep this method in their tags.
+	 *
 @@ -1971,50 +1971,62 @@ static	vaddr_t iobase;
 	pa = trunc_page(pa);
 	do {
 		pmap_kenter_pa(v, pa | pmtype | PMAP_NC,
 		    VM_PROT_READ | VM_PROT_WRITE);
 		v += PAGE_SIZE;
 		pa += PAGE_SIZE;
 	} while ((size -= PAGE_SIZE) > 0);
 	pmap_update(pmap_kernel());
 	return (0);
+}
-int
+static int
-sparc_bus_map_large(bus_space_tag_t t, int slot, bus_size_t offset,
+sparc_bus_map_large(bus_space_tag_t t, bus_addr_t ba,
 		    bus_size_t size, int flags, bus_space_handle_t *hp)
+{
 	bus_addr_t pa = BUS_ADDR(slot,offset);
 	vaddr_t v = 0;
 	if (uvm_map(kernel_map, &v, size, NULL, 0, PAGE_SIZE,
 	    UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW, UVM_INH_SHARE, UVM_ADV_NORMAL,
 )) == 0) {
-		return sparc_bus_map(t, pa, size, flags, v, hp);
+		return sparc_bus_map_iodev(t, ba, size, flags, v, hp);
+	}
 	return -1;
+}
 int
 sparc_bus_map(bus_space_tag_t t, bus_addr_t ba,
 		    bus_size_t size, int flags, vaddr_t va,
 		    bus_space_handle_t *hp)
+{
 	if (flags & BUS_SPACE_MAP_LARGE) {
 		return sparc_bus_map_large(t, ba, size, flags, hp);
 	} else
 		return sparc_bus_map_iodev(t, ba, size, flags, va, hp);
+}
 int
 sparc_bus_unmap(bus_space_tag_t t, bus_space_handle_t bh, bus_size_t size)
+{
 	vaddr_t va = trunc_page((vaddr_t)bh);
 	/*
 	 * XXX
-	 * mappings from sparc_bus_map_large() probably need additional care
+	 * mappings with BUS_SPACE_MAP_LARGE need additional care here
-	 * here
+	 * we can just check if the VA is in the IODEV range
 	 */
 	pmap_kremove(va, round_page(size));
 	pmap_update(pmap_kernel());
 	return (0);
+}
 int
 sparc_bus_subregion(bus_space_tag_t tag, bus_space_handle_t handle,
 		    bus_size_t offset, bus_size_t size,
 		    bus_space_handle_t *nhandlep)
+{