Download raw body.
{arm64,octeon}_bus_space.c -> bus_space.c
> Date: Tue, 12 Nov 2024 00:43:03 +1100
> From: Jonathan Gray <jsg@jsg.id.au>
>
> arm64/dev/arm64_bus_space.c -> arm64/arm64/bus_space.c
> octeon/dev/octeon_bus_space.c -> octeon/octeon/bus_space.c
>
> matches other archs
I really wish we'd do these things in a mor consistent manner, but I'm
not sure renaming files is worth the pain while we're still using cvs.
> diff --git sys/arch/arm64/arm64/bus_space.c sys/arch/arm64/arm64/bus_space.c
> new file mode 100644
> index 00000000000..f78905fb47c
> --- /dev/null
> +++ sys/arch/arm64/arm64/bus_space.c
> @@ -0,0 +1,252 @@
> +/* $OpenBSD: arm64_bus_space.c,v 1.9 2024/07/03 21:04:04 kettenis Exp $ */
> +
> +/*
> + * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
> + *
> + * 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
> + * notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
> + *
> + */
> +
> +/*
> + * Simple generic bus access primitives.
> + */
> +
> +#include <sys/param.h>
> +#include <sys/systm.h>
> +
> +#include <machine/bus.h>
> +#include <uvm/uvm_extern.h>
> +
> +bus_space_t arm64_bs_tag = {
> + .bus_base = 0ULL, // XXX
> + .bus_private = NULL,
> + ._space_read_1 = generic_space_read_1,
> + ._space_write_1 = generic_space_write_1,
> + ._space_read_2 = generic_space_read_2,
> + ._space_write_2 = generic_space_write_2,
> + ._space_read_4 = generic_space_read_4,
> + ._space_write_4 = generic_space_write_4,
> + ._space_read_8 = generic_space_read_8,
> + ._space_write_8 = generic_space_write_8,
> + ._space_read_raw_2 = generic_space_read_raw_2,
> + ._space_write_raw_2 = generic_space_write_raw_2,
> + ._space_read_raw_4 = generic_space_read_raw_4,
> + ._space_write_raw_4 = generic_space_write_raw_4,
> + ._space_read_raw_8 = generic_space_read_raw_8,
> + ._space_write_raw_8 = generic_space_write_raw_8,
> + ._space_map = generic_space_map,
> + ._space_unmap = generic_space_unmap,
> + ._space_subregion = generic_space_region,
> + ._space_vaddr = generic_space_vaddr,
> + ._space_mmap = generic_space_mmap
> +};
> +bus_space_t *fdt_cons_bs_tag = &arm64_bs_tag;
> +
> +uint8_t
> +generic_space_read_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> +{
> + return *(volatile uint8_t *)(h + o);
> +}
> +
> +uint16_t
> +generic_space_read_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> +{
> + return *(volatile uint16_t *)(h + o);
> +}
> +
> +uint32_t
> +generic_space_read_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> +{
> + return *(volatile uint32_t *)(h + o);
> +}
> +
> +uint64_t
> +generic_space_read_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> +{
> + return *(volatile uint64_t *)(h + o);
> +}
> +
> +void
> +generic_space_write_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> + uint8_t v)
> +{
> + *(volatile uint8_t *)(h + o) = v;
> +}
> +
> +void
> +generic_space_write_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> + uint16_t v)
> +{
> + *(volatile uint16_t *)(h + o) = v;
> +}
> +
> +void
> +generic_space_write_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> + uint32_t v)
> +{
> + *(volatile uint32_t *)(h + o) = v;
> +}
> +
> +void
> +generic_space_write_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> + uint64_t v)
> +{
> + *(volatile uint64_t *)(h + o) = v;
> +}
> +
> +void
> +generic_space_read_raw_2(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + uint8_t *buf, bus_size_t len)
> +{
> + volatile uint16_t *addr = (volatile uint16_t *)(h + o);
> + len >>= 1;
> + while (len-- != 0) {
> + *(uint16_t *)buf = *addr;
> + buf += 2;
> + }
> +}
> +
> +void
> +generic_space_write_raw_2(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + const uint8_t *buf, bus_size_t len)
> +{
> + volatile uint16_t *addr = (volatile uint16_t *)(h + o);
> + len >>= 1;
> + while (len-- != 0) {
> + *addr = *(uint16_t *)buf;
> + buf += 2;
> + }
> +}
> +
> +void
> +generic_space_read_raw_4(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + uint8_t *buf, bus_size_t len)
> +{
> + volatile uint32_t *addr = (volatile uint32_t *)(h + o);
> + len >>= 2;
> + while (len-- != 0) {
> + *(uint32_t *)buf = *addr;
> + buf += 4;
> + }
> +}
> +
> +void
> +generic_space_write_raw_4(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + const uint8_t *buf, bus_size_t len)
> +{
> + volatile uint32_t *addr = (volatile uint32_t *)(h + o);
> + len >>= 2;
> + while (len-- != 0) {
> + *addr = *(uint32_t *)buf;
> + buf += 4;
> + }
> +}
> +
> +void
> +generic_space_read_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + uint8_t *buf, bus_size_t len)
> +{
> + volatile uint64_t *addr = (volatile uint64_t *)(h + o);
> + len >>= 3;
> + while (len-- != 0) {
> + *(uint64_t *)buf = *addr;
> + buf += 8;
> + }
> +}
> +
> +void
> +generic_space_write_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + const uint8_t *buf, bus_size_t len)
> +{
> + volatile uint64_t *addr = (volatile uint64_t *)(h + o);
> + len >>= 3;
> + while (len-- != 0) {
> + *addr = *(uint64_t *)buf;
> + buf += 8;
> + }
> +}
> +
> +int
> +generic_space_map(bus_space_tag_t t, bus_addr_t offs, bus_size_t size,
> + int flags, bus_space_handle_t *bshp)
> +{
> + u_long startpa, endpa, pa;
> + vaddr_t va;
> + int cache = PMAP_CACHE_DEV_NGNRNE;
> +
> + if (flags & BUS_SPACE_MAP_CACHEABLE)
> + cache = PMAP_CACHE_WB;
> + if (flags & BUS_SPACE_MAP_PREFETCHABLE)
> + cache = PMAP_CACHE_CI;
> + if (flags & BUS_SPACE_MAP_POSTED)
> + cache = PMAP_CACHE_DEV_NGNRE;
> +
> + startpa = trunc_page(offs);
> + endpa = round_page(offs + size);
> +
> + va = (vaddr_t)km_alloc(endpa - startpa, &kv_any, &kp_none, &kd_nowait);
> + if (! va)
> + return(ENOMEM);
> +
> + *bshp = (bus_space_handle_t)(va + (offs - startpa));
> +
> + for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
> + pmap_kenter_cache(va, pa, PROT_READ | PROT_WRITE, cache);
> + }
> + pmap_update(pmap_kernel());
> +
> + return(0);
> +}
> +
> +void
> +generic_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
> +{
> + vaddr_t va, endva;
> +
> + va = trunc_page((vaddr_t)bsh);
> + endva = round_page((vaddr_t)bsh + size);
> +
> + pmap_kremove(va, endva - va);
> + pmap_update(pmap_kernel());
> + km_free((void *)va, endva - va, &kv_any, &kp_none);
> +}
> +
> +int
> +generic_space_region(bus_space_tag_t t, bus_space_handle_t bsh,
> + bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)
> +{
> + *nbshp = bsh + offset;
> + return 0;
> +}
> +
> +void *
> +generic_space_vaddr(bus_space_tag_t t, bus_space_handle_t h)
> +{
> + return (void *)h;
> +}
> +
> +paddr_t
> +generic_space_mmap(bus_space_tag_t t, bus_addr_t addr, off_t off,
> + int prot, int flags)
> +{
> + return (addr + off);
> +}
> diff --git sys/arch/arm64/conf/files.arm64 sys/arch/arm64/conf/files.arm64
> index 8e66b684544..91bff097706 100644
> --- sys/arch/arm64/conf/files.arm64
> +++ sys/arch/arm64/conf/files.arm64
> @@ -37,8 +37,8 @@ file arch/arm64/arm64/cpufunc_asm.S
> file arch/arm64/arm64/lse.S
> file arch/arm64/arm64/support.S
> file arch/arm64/arm64/bus_dma.c
> +file arch/arm64/arm64/bus_space.c
>
> -file arch/arm64/dev/arm64_bus_space.c
> file arch/arm64/dev/pci_machdep.c
>
> file arch/arm64/arm64/cryptox.c crypto
> diff --git sys/arch/arm64/dev/arm64_bus_space.c sys/arch/arm64/dev/arm64_bus_space.c
> deleted file mode 100644
> index f78905fb47c..00000000000
> --- sys/arch/arm64/dev/arm64_bus_space.c
> +++ /dev/null
> @@ -1,252 +0,0 @@
> -/* $OpenBSD: arm64_bus_space.c,v 1.9 2024/07/03 21:04:04 kettenis Exp $ */
> -
> -/*
> - * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
> - *
> - * 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
> - * notice, this list of conditions and the following disclaimer.
> - * 2. Redistributions in binary form must reproduce the above copyright
> - * notice, this list of conditions and the following disclaimer in the
> - * documentation and/or other materials provided with the distribution.
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
> - *
> - */
> -
> -/*
> - * Simple generic bus access primitives.
> - */
> -
> -#include <sys/param.h>
> -#include <sys/systm.h>
> -
> -#include <machine/bus.h>
> -#include <uvm/uvm_extern.h>
> -
> -bus_space_t arm64_bs_tag = {
> - .bus_base = 0ULL, // XXX
> - .bus_private = NULL,
> - ._space_read_1 = generic_space_read_1,
> - ._space_write_1 = generic_space_write_1,
> - ._space_read_2 = generic_space_read_2,
> - ._space_write_2 = generic_space_write_2,
> - ._space_read_4 = generic_space_read_4,
> - ._space_write_4 = generic_space_write_4,
> - ._space_read_8 = generic_space_read_8,
> - ._space_write_8 = generic_space_write_8,
> - ._space_read_raw_2 = generic_space_read_raw_2,
> - ._space_write_raw_2 = generic_space_write_raw_2,
> - ._space_read_raw_4 = generic_space_read_raw_4,
> - ._space_write_raw_4 = generic_space_write_raw_4,
> - ._space_read_raw_8 = generic_space_read_raw_8,
> - ._space_write_raw_8 = generic_space_write_raw_8,
> - ._space_map = generic_space_map,
> - ._space_unmap = generic_space_unmap,
> - ._space_subregion = generic_space_region,
> - ._space_vaddr = generic_space_vaddr,
> - ._space_mmap = generic_space_mmap
> -};
> -bus_space_t *fdt_cons_bs_tag = &arm64_bs_tag;
> -
> -uint8_t
> -generic_space_read_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> -{
> - return *(volatile uint8_t *)(h + o);
> -}
> -
> -uint16_t
> -generic_space_read_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> -{
> - return *(volatile uint16_t *)(h + o);
> -}
> -
> -uint32_t
> -generic_space_read_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> -{
> - return *(volatile uint32_t *)(h + o);
> -}
> -
> -uint64_t
> -generic_space_read_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> -{
> - return *(volatile uint64_t *)(h + o);
> -}
> -
> -void
> -generic_space_write_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> - uint8_t v)
> -{
> - *(volatile uint8_t *)(h + o) = v;
> -}
> -
> -void
> -generic_space_write_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> - uint16_t v)
> -{
> - *(volatile uint16_t *)(h + o) = v;
> -}
> -
> -void
> -generic_space_write_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> - uint32_t v)
> -{
> - *(volatile uint32_t *)(h + o) = v;
> -}
> -
> -void
> -generic_space_write_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> - uint64_t v)
> -{
> - *(volatile uint64_t *)(h + o) = v;
> -}
> -
> -void
> -generic_space_read_raw_2(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - uint8_t *buf, bus_size_t len)
> -{
> - volatile uint16_t *addr = (volatile uint16_t *)(h + o);
> - len >>= 1;
> - while (len-- != 0) {
> - *(uint16_t *)buf = *addr;
> - buf += 2;
> - }
> -}
> -
> -void
> -generic_space_write_raw_2(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - const uint8_t *buf, bus_size_t len)
> -{
> - volatile uint16_t *addr = (volatile uint16_t *)(h + o);
> - len >>= 1;
> - while (len-- != 0) {
> - *addr = *(uint16_t *)buf;
> - buf += 2;
> - }
> -}
> -
> -void
> -generic_space_read_raw_4(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - uint8_t *buf, bus_size_t len)
> -{
> - volatile uint32_t *addr = (volatile uint32_t *)(h + o);
> - len >>= 2;
> - while (len-- != 0) {
> - *(uint32_t *)buf = *addr;
> - buf += 4;
> - }
> -}
> -
> -void
> -generic_space_write_raw_4(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - const uint8_t *buf, bus_size_t len)
> -{
> - volatile uint32_t *addr = (volatile uint32_t *)(h + o);
> - len >>= 2;
> - while (len-- != 0) {
> - *addr = *(uint32_t *)buf;
> - buf += 4;
> - }
> -}
> -
> -void
> -generic_space_read_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - uint8_t *buf, bus_size_t len)
> -{
> - volatile uint64_t *addr = (volatile uint64_t *)(h + o);
> - len >>= 3;
> - while (len-- != 0) {
> - *(uint64_t *)buf = *addr;
> - buf += 8;
> - }
> -}
> -
> -void
> -generic_space_write_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - const uint8_t *buf, bus_size_t len)
> -{
> - volatile uint64_t *addr = (volatile uint64_t *)(h + o);
> - len >>= 3;
> - while (len-- != 0) {
> - *addr = *(uint64_t *)buf;
> - buf += 8;
> - }
> -}
> -
> -int
> -generic_space_map(bus_space_tag_t t, bus_addr_t offs, bus_size_t size,
> - int flags, bus_space_handle_t *bshp)
> -{
> - u_long startpa, endpa, pa;
> - vaddr_t va;
> - int cache = PMAP_CACHE_DEV_NGNRNE;
> -
> - if (flags & BUS_SPACE_MAP_CACHEABLE)
> - cache = PMAP_CACHE_WB;
> - if (flags & BUS_SPACE_MAP_PREFETCHABLE)
> - cache = PMAP_CACHE_CI;
> - if (flags & BUS_SPACE_MAP_POSTED)
> - cache = PMAP_CACHE_DEV_NGNRE;
> -
> - startpa = trunc_page(offs);
> - endpa = round_page(offs + size);
> -
> - va = (vaddr_t)km_alloc(endpa - startpa, &kv_any, &kp_none, &kd_nowait);
> - if (! va)
> - return(ENOMEM);
> -
> - *bshp = (bus_space_handle_t)(va + (offs - startpa));
> -
> - for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
> - pmap_kenter_cache(va, pa, PROT_READ | PROT_WRITE, cache);
> - }
> - pmap_update(pmap_kernel());
> -
> - return(0);
> -}
> -
> -void
> -generic_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
> -{
> - vaddr_t va, endva;
> -
> - va = trunc_page((vaddr_t)bsh);
> - endva = round_page((vaddr_t)bsh + size);
> -
> - pmap_kremove(va, endva - va);
> - pmap_update(pmap_kernel());
> - km_free((void *)va, endva - va, &kv_any, &kp_none);
> -}
> -
> -int
> -generic_space_region(bus_space_tag_t t, bus_space_handle_t bsh,
> - bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)
> -{
> - *nbshp = bsh + offset;
> - return 0;
> -}
> -
> -void *
> -generic_space_vaddr(bus_space_tag_t t, bus_space_handle_t h)
> -{
> - return (void *)h;
> -}
> -
> -paddr_t
> -generic_space_mmap(bus_space_tag_t t, bus_addr_t addr, off_t off,
> - int prot, int flags)
> -{
> - return (addr + off);
> -}
> diff --git sys/arch/octeon/conf/files.octeon sys/arch/octeon/conf/files.octeon
> index e11ae434ede..a534f1a67ad 100644
> --- sys/arch/octeon/conf/files.octeon
> +++ sys/arch/octeon/conf/files.octeon
> @@ -15,6 +15,7 @@ major { amdcf = 19 }
> file dev/cninit.c
> file arch/octeon/octeon/autoconf.c
> file arch/octeon/octeon/bus_dma.c
> +file arch/octeon/octeon/bus_space.c
> file arch/octeon/octeon/conf.c
> file arch/octeon/octeon/disksubr.c disk
> file arch/octeon/octeon/machdep.c
> @@ -128,7 +129,6 @@ file arch/octeon/dev/cn30xxuart.c octuart
> device pcibus
> attach pcibus at iobus
> file arch/octeon/dev/octeon_pcibus.c pcibus
> -file arch/octeon/dev/octeon_bus_space.c
>
> device octpcie: pcibus
> attach octpcie at iobus
> diff --git sys/arch/octeon/dev/octeon_bus_space.c sys/arch/octeon/dev/octeon_bus_space.c
> deleted file mode 100644
> index 7fb70165326..00000000000
> --- sys/arch/octeon/dev/octeon_bus_space.c
> +++ /dev/null
> @@ -1,187 +0,0 @@
> -/* $OpenBSD: octeon_bus_space.c,v 1.1 2010/10/28 22:52:10 syuu Exp $ */
> -
> -/*
> - * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
> - *
> - * 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
> - * notice, this list of conditions and the following disclaimer.
> - * 2. Redistributions in binary form must reproduce the above copyright
> - * notice, this list of conditions and the following disclaimer in the
> - * documentation and/or other materials provided with the distribution.
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
> - *
> - */
> -
> -/*
> - * Simple generic bus access primitives.
> - */
> -
> -#include <sys/param.h>
> -#include <sys/systm.h>
> -
> -#include <machine/bus.h>
> -
> -uint8_t
> -generic_space_read_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> -{
> - return *(volatile uint8_t *)(h + o);
> -}
> -
> -uint16_t
> -generic_space_read_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> -{
> - return *(volatile uint16_t *)(h + o);
> -}
> -
> -uint32_t
> -generic_space_read_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> -{
> - return *(volatile uint32_t *)(h + o);
> -}
> -
> -uint64_t
> -generic_space_read_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> -{
> - return *(volatile uint64_t *)(h + o);
> -}
> -
> -void
> -generic_space_write_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> - uint8_t v)
> -{
> - *(volatile uint8_t *)(h + o) = v;
> -}
> -
> -void
> -generic_space_write_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> - uint16_t v)
> -{
> - *(volatile uint16_t *)(h + o) = v;
> -}
> -
> -void
> -generic_space_write_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> - uint32_t v)
> -{
> - *(volatile uint32_t *)(h + o) = v;
> -}
> -
> -void
> -generic_space_write_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> - uint64_t v)
> -{
> - *(volatile uint64_t *)(h + o) = v;
> -}
> -
> -void
> -generic_space_read_raw_2(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - uint8_t *buf, bus_size_t len)
> -{
> - volatile uint16_t *addr = (volatile uint16_t *)(h + o);
> - len >>= 1;
> - while (len-- != 0) {
> - *(uint16_t *)buf = *addr;
> - buf += 2;
> - }
> -}
> -
> -void
> -generic_space_write_raw_2(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - const uint8_t *buf, bus_size_t len)
> -{
> - volatile uint16_t *addr = (volatile uint16_t *)(h + o);
> - len >>= 1;
> - while (len-- != 0) {
> - *addr = *(uint16_t *)buf;
> - buf += 2;
> - }
> -}
> -
> -void
> -generic_space_read_raw_4(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - uint8_t *buf, bus_size_t len)
> -{
> - volatile uint32_t *addr = (volatile uint32_t *)(h + o);
> - len >>= 2;
> - while (len-- != 0) {
> - *(uint32_t *)buf = *addr;
> - buf += 4;
> - }
> -}
> -
> -void
> -generic_space_write_raw_4(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - const uint8_t *buf, bus_size_t len)
> -{
> - volatile uint32_t *addr = (volatile uint32_t *)(h + o);
> - len >>= 2;
> - while (len-- != 0) {
> - *addr = *(uint32_t *)buf;
> - buf += 4;
> - }
> -}
> -
> -void
> -generic_space_read_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - uint8_t *buf, bus_size_t len)
> -{
> - volatile uint64_t *addr = (volatile uint64_t *)(h + o);
> - len >>= 3;
> - while (len-- != 0) {
> - *(uint64_t *)buf = *addr;
> - buf += 8;
> - }
> -}
> -
> -void
> -generic_space_write_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> - const uint8_t *buf, bus_size_t len)
> -{
> - volatile uint64_t *addr = (volatile uint64_t *)(h + o);
> - len >>= 3;
> - while (len-- != 0) {
> - *addr = *(uint64_t *)buf;
> - buf += 8;
> - }
> -}
> -
> -int
> -generic_space_map(bus_space_tag_t t, bus_addr_t offs, bus_size_t size,
> - int flags, bus_space_handle_t *bshp)
> -{
> - *bshp = t->bus_base + offs;
> - return 0;
> -}
> -
> -void
> -generic_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
> -{
> -}
> -
> -int
> -generic_space_region(bus_space_tag_t t, bus_space_handle_t bsh,
> - bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)
> -{
> - *nbshp = bsh + offset;
> - return 0;
> -}
> -
> -void *
> -generic_space_vaddr(bus_space_tag_t t, bus_space_handle_t h)
> -{
> - return (void *)h;
> -}
> diff --git sys/arch/octeon/octeon/bus_space.c sys/arch/octeon/octeon/bus_space.c
> new file mode 100644
> index 00000000000..7fb70165326
> --- /dev/null
> +++ sys/arch/octeon/octeon/bus_space.c
> @@ -0,0 +1,187 @@
> +/* $OpenBSD: octeon_bus_space.c,v 1.1 2010/10/28 22:52:10 syuu Exp $ */
> +
> +/*
> + * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
> + *
> + * 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
> + * notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
> + *
> + */
> +
> +/*
> + * Simple generic bus access primitives.
> + */
> +
> +#include <sys/param.h>
> +#include <sys/systm.h>
> +
> +#include <machine/bus.h>
> +
> +uint8_t
> +generic_space_read_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> +{
> + return *(volatile uint8_t *)(h + o);
> +}
> +
> +uint16_t
> +generic_space_read_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> +{
> + return *(volatile uint16_t *)(h + o);
> +}
> +
> +uint32_t
> +generic_space_read_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> +{
> + return *(volatile uint32_t *)(h + o);
> +}
> +
> +uint64_t
> +generic_space_read_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
> +{
> + return *(volatile uint64_t *)(h + o);
> +}
> +
> +void
> +generic_space_write_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> + uint8_t v)
> +{
> + *(volatile uint8_t *)(h + o) = v;
> +}
> +
> +void
> +generic_space_write_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> + uint16_t v)
> +{
> + *(volatile uint16_t *)(h + o) = v;
> +}
> +
> +void
> +generic_space_write_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> + uint32_t v)
> +{
> + *(volatile uint32_t *)(h + o) = v;
> +}
> +
> +void
> +generic_space_write_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
> + uint64_t v)
> +{
> + *(volatile uint64_t *)(h + o) = v;
> +}
> +
> +void
> +generic_space_read_raw_2(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + uint8_t *buf, bus_size_t len)
> +{
> + volatile uint16_t *addr = (volatile uint16_t *)(h + o);
> + len >>= 1;
> + while (len-- != 0) {
> + *(uint16_t *)buf = *addr;
> + buf += 2;
> + }
> +}
> +
> +void
> +generic_space_write_raw_2(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + const uint8_t *buf, bus_size_t len)
> +{
> + volatile uint16_t *addr = (volatile uint16_t *)(h + o);
> + len >>= 1;
> + while (len-- != 0) {
> + *addr = *(uint16_t *)buf;
> + buf += 2;
> + }
> +}
> +
> +void
> +generic_space_read_raw_4(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + uint8_t *buf, bus_size_t len)
> +{
> + volatile uint32_t *addr = (volatile uint32_t *)(h + o);
> + len >>= 2;
> + while (len-- != 0) {
> + *(uint32_t *)buf = *addr;
> + buf += 4;
> + }
> +}
> +
> +void
> +generic_space_write_raw_4(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + const uint8_t *buf, bus_size_t len)
> +{
> + volatile uint32_t *addr = (volatile uint32_t *)(h + o);
> + len >>= 2;
> + while (len-- != 0) {
> + *addr = *(uint32_t *)buf;
> + buf += 4;
> + }
> +}
> +
> +void
> +generic_space_read_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + uint8_t *buf, bus_size_t len)
> +{
> + volatile uint64_t *addr = (volatile uint64_t *)(h + o);
> + len >>= 3;
> + while (len-- != 0) {
> + *(uint64_t *)buf = *addr;
> + buf += 8;
> + }
> +}
> +
> +void
> +generic_space_write_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o,
> + const uint8_t *buf, bus_size_t len)
> +{
> + volatile uint64_t *addr = (volatile uint64_t *)(h + o);
> + len >>= 3;
> + while (len-- != 0) {
> + *addr = *(uint64_t *)buf;
> + buf += 8;
> + }
> +}
> +
> +int
> +generic_space_map(bus_space_tag_t t, bus_addr_t offs, bus_size_t size,
> + int flags, bus_space_handle_t *bshp)
> +{
> + *bshp = t->bus_base + offs;
> + return 0;
> +}
> +
> +void
> +generic_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
> +{
> +}
> +
> +int
> +generic_space_region(bus_space_tag_t t, bus_space_handle_t bsh,
> + bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)
> +{
> + *nbshp = bsh + offset;
> + return 0;
> +}
> +
> +void *
> +generic_space_vaddr(bus_space_tag_t t, bus_space_handle_t h)
> +{
> + return (void *)h;
> +}
>
>
{arm64,octeon}_bus_space.c -> bus_space.c