Module Name: src
Committed By: thorpej
Date: Fri Dec 8 01:38:20 UTC 2023
Modified Files:
src/sys/arch/mipsco/include: bus.h
src/sys/arch/mipsco/mipsco: bus_space.c
Log Message:
Excise extent(9) from the mipsco bus_space -- it was completely unused,
so let's make the code smaller.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mipsco/include/bus.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mipsco/mipsco/bus_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mipsco/include/bus.h
diff -u src/sys/arch/mipsco/include/bus.h:1.24 src/sys/arch/mipsco/include/bus.h:1.25
--- src/sys/arch/mipsco/include/bus.h:1.24 Sun Oct 8 22:10:49 2023
+++ src/sys/arch/mipsco/include/bus.h Fri Dec 8 01:38:20 2023
@@ -1,4 +1,4 @@
-/* $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.
@@ -115,7 +115,7 @@ typedef struct mipsco_bus_space *bus_spa
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;
@@ -175,19 +175,14 @@ struct mipsco_bus_space {
#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,
Index: src/sys/arch/mipsco/mipsco/bus_space.c
diff -u src/sys/arch/mipsco/mipsco/bus_space.c:1.12 src/sys/arch/mipsco/mipsco/bus_space.c:1.13
--- src/sys/arch/mipsco/mipsco/bus_space.c:1.12 Fri Jan 27 18:52:59 2012
+++ src/sys/arch/mipsco/mipsco/bus_space.c Fri Dec 8 01:38:20 2023
@@ -1,4 +1,4 @@
-/* $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.
@@ -31,12 +31,11 @@
*/
#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>
@@ -46,7 +45,7 @@ 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;
@@ -66,17 +65,6 @@ mipsco_bus_space_init(bus_space_tag_t bs
}
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) */
{
@@ -93,20 +81,6 @@ mipsco_bus_space_set_aligned_stride(bus_
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)
{
@@ -171,38 +145,16 @@ mipsco_bus_space_paddr(bus_space_tag_t b
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);
}
@@ -232,22 +184,6 @@ mipsco_bus_space_mmap(bus_space_tag_t bs
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("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));
+ panic("bus_space_alloc() not implemented");
}
