Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/powerpc/powerpc/bus_space.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/powerpc/powerpc/bus_space.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.10
retrieving revision 1.10.2.2
diff -u -p -r1.10 -r1.10.2.2
--- src/sys/arch/powerpc/powerpc/bus_space.c	2007/03/04 06:00:37	1.10
+++ src/sys/arch/powerpc/powerpc/bus_space.c	2007/10/23 20:14:13	1.10.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.10 2007/03/04 06:00:37 christos Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.10.2.2 2007/10/23 20:14:13 ad Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.10 2007/03/04 06:00:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.10.2.2 2007/10/23 20:14:13 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -499,7 +499,17 @@ bus_space_mallocok(void)
 paddr_t
 memio_mmap(bus_space_tag_t t, bus_addr_t bpa, off_t offset, int prot, int flags)
 {
-	return (trunc_page(bpa + offset));
+	paddr_t ret;
+	/* XXX what about stride? */
+	ret = trunc_page(t->pbs_offset + bpa + offset);
+#ifdef DEBUG
+	if (ret == 0) {
+		printf("%s: [%08x, %08x %08x] mmaps to 0?!\n", __func__,
+		    (uint32_t)t->pbs_offset, (uint32_t)bpa, (uint32_t)offset);
+		return -1;
+	}
+#endif
+	return ret;
 }
 
 int
@@ -510,11 +520,13 @@ memio_map(bus_space_tag_t t, bus_addr_t 
 	paddr_t pa;
 
 	size = _BUS_SPACE_STRIDE(t, size);
+	bpa = _BUS_SPACE_STRIDE(t, bpa);
 
 	if (bpa + size > t->pbs_limit) {
 #ifdef DEBUG
 		printf("bus_space_map(%p[%x:%x], %#x, %#x) failed: EINVAL\n",
 		    t, t->pbs_base, t->pbs_limit, bpa, size);
+		 
 #endif
 		return (EINVAL);
 	}
@@ -523,8 +535,9 @@ memio_map(bus_space_tag_t t, bus_addr_t 
 	 * Can't map I/O space as linear.
 	 */
 	if ((flags & BUS_SPACE_MAP_LINEAR) &&
-	    (t->pbs_flags & _BUS_SPACE_IO_TYPE))
+	    (t->pbs_flags & _BUS_SPACE_IO_TYPE)) {
 		return (EOPNOTSUPP);
+	}
 
 #ifdef PPC_IBM4XX
 	/*
@@ -567,8 +580,8 @@ memio_map(bus_space_tag_t t, bus_addr_t 
 		 * Same as above, but via the MPC601's I/O segments
 		 */
 		register_t sr = iosrtable[pa >> ADDR_SR_SHFT];
-		if (SR601_VALID_P(sr) && SR601_PA_MATCH_P(sr, pa) &&
-		    SR601_PA_MATCH_P(sr, pa + size - 1)) {
+		if (SR601_VALID_P(sr) && ((pa >> ADDR_SR_SHFT) ==
+		    ((pa + size - 1) >> ADDR_SR_SHFT))) {
 			*bshp = pa;
 			return (0);
 		}
@@ -629,8 +642,8 @@ memio_unmap(bus_space_tag_t t, bus_space
 		}
 	} else {
 		register_t sr = iosrtable[va >> ADDR_SR_SHFT];
-		if (SR601_VALID_P(sr) && SR601_PA_MATCH_P(sr, va) &&
-		    SR601_PA_MATCH_P(sr, va + size - 1)) {
+		if (SR601_VALID_P(sr) && ((pa >> ADDR_SR_SHFT) ==
+		    ((pa + size - 1) >> ADDR_SR_SHFT))) {
 			pa = va;
 			va = 0;
 		} else {
@@ -662,6 +675,7 @@ memio_alloc(bus_space_tag_t t, bus_addr_
 	int error;
 
 	size = _BUS_SPACE_STRIDE(t, size);
+	rstart = _BUS_SPACE_STRIDE(t, rstart);
 
 	if (rstart + size > t->pbs_limit)
 		return (EINVAL);