 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus.h,v 1.24 2023/10/08 22:10:49 andvar Exp $	*/
+/*	$NetBSD: bus.h,v 1.25 2023/12/08 01:38:20 thorpej 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
 @@ -105,27 +105,27 @@ typedef u_long bus_size_t;
 #define PRIuBUSSIZE	"lu"
 /*
  * Access methods for bus resources and address space.
  */
 typedef u_int32_t bus_space_handle_t;
 #define PRIxBSH		"lx"
 typedef struct mipsco_bus_space *bus_space_tag_t;
 struct mipsco_bus_space {
 	const char	*bs_name;
-	struct extent	*bs_extent;
+	void		*bs_spare;	/* (was previously unused extent map) */
 	bus_addr_t	bs_start;
 	bus_size_t	bs_size;
 	paddr_t		bs_pbase;
 	vaddr_t		bs_vbase;
 	u_int8_t	bs_stride;	/* log2(stride) */
 	u_int8_t	bs_bswap;	/* byte swap in stream methods */
 	u_int8_t	bs_offset_1;
 	u_int8_t	bs_offset_2;
 	u_int8_t	bs_offset_4;
 	u_int8_t	bs_offset_8;
 @@ -165,39 +165,34 @@ struct mipsco_bus_space {
 				int,			/*bus-specific intr*/
 				int,			/*priority/class*/
 				int,			/*flags*/
 				int (*)(void *),	/*handler*/
 				void *);		/*handler arg*/
 	void	*bs_aux;
 };
 /* vaddr_t argument of mipsco_bus_space_init() */
 #define MIPSCO_BUS_SPACE_UNMAPPED	((vaddr_t)0)
 /* machine dependent utility function for bus_space users */
 void	mipsco_bus_space_malloc_set_safe(void);
 void	mipsco_bus_space_init(bus_space_tag_t, const char *,
 	    paddr_t, vaddr_t, bus_addr_t, bus_size_t);
 void	mipsco_bus_space_init_extent(bus_space_tag_t, void *, size_t);
 void	mipsco_bus_space_set_aligned_stride(bus_space_tag_t, unsigned int);
 void	mipsco_sparse_bus_space_init(bus_space_tag_t, const char *,
 	    paddr_t, bus_addr_t, bus_size_t);
 void	mipsco_large_bus_space_init(bus_space_tag_t, const char *,
 	    paddr_t, bus_addr_t, bus_size_t);
 /* machine dependent utility function for bus_space implementations */
 int	mipsco_bus_space_extent_malloc_flag(void);
 /* these are provided for subclasses which override base bus_space. */
 int	mipsco_bus_space_compose_handle(bus_space_tag_t,
 	    bus_addr_t, bus_size_t, int, bus_space_handle_t *);
 int	mipsco_bus_space_dispose_handle(bus_space_tag_t,
 	    bus_space_handle_t, bus_size_t);
 int	mipsco_bus_space_paddr(bus_space_tag_t,
 	    bus_space_handle_t, paddr_t *);
 int	mipsco_sparse_bus_space_compose_handle(bus_space_tag_t,
 	    bus_addr_t, bus_size_t, int, bus_space_handle_t *);
 int	mipsco_sparse_bus_space_dispose_handle(bus_space_tag_t,
 	    bus_space_handle_t, bus_size_t);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.12 2012/01/27 18:52:59 para Exp $ 	*/
+/*	$NetBSD: bus_space.c,v 1.13 2023/12/08 01:38:20 thorpej 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 Charles M. Hannum and 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,102 +21,76 @@
  * ``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.12 2012/01/27 18:52:59 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.13 2023/12/08 01:38:20 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 void
 mipsco_bus_space_init(bus_space_tag_t bst, const char *name, paddr_t paddr, vaddr_t vaddr, bus_addr_t start, bus_size_t size)
+{
 	bst->bs_name = name;
-	bst->bs_extent = NULL;
+	bst->bs_spare = NULL;
 	bst->bs_start = start;
 	bst->bs_size = size;
 	bst->bs_pbase = paddr;
 	bst->bs_vbase = vaddr;
 	bst->bs_compose_handle = mipsco_bus_space_compose_handle;
 	bst->bs_dispose_handle = mipsco_bus_space_dispose_handle;
 	bst->bs_paddr = mipsco_bus_space_paddr;
 	bst->bs_map = mipsco_bus_space_map;
 	bst->bs_unmap = mipsco_bus_space_unmap;
 	bst->bs_subregion = mipsco_bus_space_subregion;
 	bst->bs_mmap = mipsco_bus_space_mmap;
 	bst->bs_alloc = mipsco_bus_space_alloc;
 	bst->bs_free = mipsco_bus_space_free;
 	bst->bs_aux = NULL;
 	bst->bs_bswap = 0; /* No byte swap for stream methods */
 	mipsco_bus_space_set_aligned_stride(bst, 0);
+}
 void
 mipsco_bus_space_init_extent(bus_space_tag_t bst, void *storage, size_t storagesize)
 	bst->bs_extent = extent_create(bst->bs_name,
 	    bst->bs_start, bst->bs_start + bst->bs_size,
 	    storage, storagesize, EX_NOWAIT);
 	if (bst->bs_extent == NULL)
 	    panic("mipsco_bus_space_init_extent: cannot create extent map %s",
 		  bst->bs_name);
 void
 mipsco_bus_space_set_aligned_stride(bus_space_tag_t bst, unsigned int shift)
 	/* shift:		 log2(alignment) */
+{
 	bst->bs_stride = shift;
 	if (shift == 2) {		/* XXX Assumes Big Endian & 4B */
 	    bst->bs_offset_1 = 3;
 	    bst->bs_offset_2 = 2;
 	} else {
 	    bst->bs_offset_1 = 0;
 	    bst->bs_offset_2 = 0;
+	}
 	bst->bs_offset_4 = 0;
 	bst->bs_offset_8 = 0;
+}
 static int malloc_safe = 0;
 void
 mipsco_bus_space_malloc_set_safe(void)
 	malloc_safe = EX_MALLOCOK;
 int
 mipsco_bus_space_extent_malloc_flag(void)
 	return (malloc_safe);
 int
 mipsco_bus_space_compose_handle(bus_space_tag_t bst, bus_addr_t addr, bus_size_t size, int flags, bus_space_handle_t *bshp)
+{
 	bus_space_handle_t bsh = bst->bs_vbase +
 	    ((addr - bst->bs_start) << bst->bs_stride);
 	/*
 	 * Since all buses can be linearly mappable, we don't have to check
 	 * BUS_SPACE_MAP_LINEAR and BUS_SPACE_MAP_PREFETCHABLE.
 	 */
 	if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) {
 		*bshp = bsh;
 		return (0);
 @@ -161,58 +135,36 @@ mipsco_bus_space_paddr(bus_space_tag_t b
 	else { /* KSEG2 */
 		/*
 		 * Since this region may be mapped by wired TLB,
 		 * kvtophys() is not always available.
 		 */
 		*pap = bst->bs_pbase + (bsh - bst->bs_vbase);
+	}
 	return (0);
+}
 int
 mipsco_bus_space_map(bus_space_tag_t bst, bus_addr_t addr, bus_size_t size, int flags, bus_space_handle_t *bshp)
+{
 	int err;
 	if (addr < bst->bs_start || addr + size > bst->bs_start + bst->bs_size)
 		return (EINVAL);
 	if (bst->bs_extent != NULL) {
 		err = extent_alloc_region(bst->bs_extent, addr, size,
 		    EX_NOWAIT | malloc_safe);
 		if (err)
 			return (err);
 	return (bus_space_compose_handle(bst, addr, size, flags, bshp));
+}
 void
 mipsco_bus_space_unmap(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t size)
+{
 	if (bst->bs_extent != NULL) {
 		paddr_t pa;
 		bus_addr_t addr;
 		int err;
 		/* bus_space_paddr() becomes unavailable after unmapping */
 		err = bus_space_paddr(bst, bsh, &pa);
 		if (err)
 			panic("mipsco_bus_space_unmap: %s va %p: error %d",
 			    bst->bs_name, (void *)bsh, err);
 		addr = (bus_size_t)(pa - bst->bs_pbase) + bst->bs_start;
 		extent_free(bst->bs_extent, addr, size,
 		    EX_NOWAIT | malloc_safe);
 	bus_space_dispose_handle(bst, bsh, size);
+}
 int
 mipsco_bus_space_subregion(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)
+{
 	*nbshp = bsh + (offset << bst->bs_stride);
 	return (0);
+}
 paddr_t
 mipsco_bus_space_mmap(bus_space_tag_t bst, bus_addr_t addr, off_t off, int prot, int flags)
+{
 @@ -222,32 +174,16 @@ mipsco_bus_space_mmap(bus_space_tag_t bs
 	 * XXX which we should be doing.
 	 */
 	if (addr < bst->bs_start ||
 	    (addr + off) >= (bst->bs_start + bst->bs_size))
 		return (-1);
 	return (mips_btop(bst->bs_pbase + (addr - bst->bs_start) + off));
+}
 int
 mipsco_bus_space_alloc(bus_space_tag_t bst, bus_addr_t start, bus_addr_t end, bus_size_t size, bus_size_t align, bus_size_t boundary, int flags, bus_addr_t *addrp, bus_space_handle_t *bshp)
+{
 	u_long addr;
 	int err;
-	if (bst->bs_extent == NULL)
+	panic("bus_space_alloc() not implemented");
 		panic("mipsco_bus_space_alloc: extent map %s not available",
 		    bst->bs_name);
 	if (start < bst->bs_start ||
 	    start + size > bst->bs_start + bst->bs_size)
 		return (EINVAL);
 	err = extent_alloc_subregion(bst->bs_extent, start, end, size,
 	    align, boundary, EX_FAST | EX_NOWAIT | malloc_safe, &addr);
 	if (err)
 		return (err);
 	*addrp = addr;
 	return (bus_space_compose_handle(bst, addr, size, flags, bshp));
+}