Sat Dec 17 19:34:07 2011 UTC ()

Allow defining a bus space with pbs_limit=0, which will have the effect to
create a space which ends with 0xffffffff.
This is needed, because pbs_limit=0xffffffff ends the space with 0xfffffffe.


(phx)

diff -r1.28 -r1.29 src/sys/arch/powerpc/powerpc/bus_space.c

--- src/sys/arch/powerpc/powerpc/bus_space.c 2011/06/30 00:53:00	1.28
+++ src/sys/arch/powerpc/powerpc/bus_space.c 2011/12/17 19:34:07	1.29

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.28 2011/06/30 00:53:00 matt Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.29 2011/12/17 19:34:07 phx 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
 @@ -21,27 +21,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.28 2011/06/30 00:53:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.29 2011/12/17 19:34:07 phx Exp $");
 #define _POWERPC_BUS_SPACE_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <uvm/uvm.h>
 @@ -516,27 +516,27 @@ memio_mmap(bus_space_tag_t t, bus_addr_t
 	return ret;
+}
 int
 memio_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags,
 	bus_space_handle_t *bshp)
+{
 	int error;
 	paddr_t pa;
 	size = _BUS_SPACE_STRIDE(t, size);
 	bpa = _BUS_SPACE_STRIDE(t, bpa);
-	if (bpa + size > t->pbs_limit) {
+	if (t->pbs_limit != 0 && 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);
+	}
 	/*
 	 * Can't map I/O space as linear.
 	 */
 	if ((flags & BUS_SPACE_MAP_LINEAR) &&
 	    (t->pbs_flags & _BUS_SPACE_IO_TYPE)) {
 		return (EOPNOTSUPP);
 @@ -692,27 +692,27 @@ memio_alloc(bus_space_tag_t t, bus_addr_
 	bus_size_t size, bus_size_t alignment, bus_size_t boundary,
 	int flags, bus_addr_t *bpap, bus_space_handle_t *bshp)
+{
 	u_long bpa;
 	paddr_t pa;
 	int error;
 	size = _BUS_SPACE_STRIDE(t, size);
 	rstart = _BUS_SPACE_STRIDE(t, rstart);
 	if (t->pbs_extent == NULL)
 		return ENOMEM;
-	if (rstart + size > t->pbs_limit) {
+	if (t->pbs_limit != 0 && rstart + size > t->pbs_limit) {
 #ifdef DEBUG
 		printf("%s(%p[%x:%x], %#x, %#x) failed: EINVAL\n",
 		   __func__, t, t->pbs_base, t->pbs_limit, rstart, size);
 #endif
 		return (EINVAL);
+	}
 	/*
 	 * Can't map I/O space as linear.
 	 */
 	if ((flags & BUS_SPACE_MAP_LINEAR) &&
 	    (t->pbs_flags & _BUS_SPACE_IO_TYPE))
 		return (EOPNOTSUPP);