diff options
| -rw-r--r-- | sys/amd64/amd64/legacy.c | 20 | ||||
| -rw-r--r-- | sys/amd64/amd64/nexus.c | 20 | ||||
| -rw-r--r-- | sys/amd64/include/bus.h | 1280 | ||||
| -rw-r--r-- | sys/amd64/include/bus_amd64.h | 6 | ||||
| -rw-r--r-- | sys/amd64/include/bus_at386.h | 6 | ||||
| -rw-r--r-- | sys/amd64/include/bus_dma.h | 6 | ||||
| -rw-r--r-- | sys/amd64/isa/isa.c | 102 | ||||
| -rw-r--r-- | sys/i386/i386/legacy.c | 20 | ||||
| -rw-r--r-- | sys/i386/i386/nexus.c | 20 | ||||
| -rw-r--r-- | sys/i386/include/bus.h | 1280 | ||||
| -rw-r--r-- | sys/i386/include/bus_at386.h | 6 | ||||
| -rw-r--r-- | sys/i386/include/bus_dma.h | 6 | ||||
| -rw-r--r-- | sys/i386/include/bus_pc98.h | 636 | ||||
| -rw-r--r-- | sys/i386/include/bus_pio_ind.h | 31 | ||||
| -rw-r--r-- | sys/i386/isa/isa.c | 102 | ||||
| -rw-r--r-- | sys/sys/bus_dma.h | 6 |
16 files changed, 857 insertions, 2690 deletions
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c index f5554f8..5fdda2b 100644 --- a/sys/amd64/amd64/legacy.c +++ b/sys/amd64/amd64/legacy.c @@ -289,7 +289,17 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_set_bustag(rv, I386_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { rman_set_bustag(rv, I386_BUS_SPACE_IO); +#ifdef PC98 + /* PC-98: the type of bus_space_handle_t is the structure. */ + rv->r_bushandle.bsh_base = rv->r_start; + rv->r_bushandle.bsh_iat = NULL; + rv->r_bushandle.bsh_iatsz = 0; + rv->r_bushandle.bsh_res = NULL; + rv->r_bushandle.bsh_ressz = 0; +#else + /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(rv, rv->r_start); +#endif } if (needactivate) { @@ -329,7 +339,17 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid, vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; } rman_set_virtual(r, vaddr); +#ifdef PC98 + /* PC-98: the type of bus_space_handle_t is the structure. */ + r->r_bushandle.bsh_base = (bus_addr_t) vaddr; + r->r_bushandle.bsh_iat = NULL; + r->r_bushandle.bsh_iatsz = 0; + r->r_bushandle.bsh_res = NULL; + r->r_bushandle.bsh_ressz = 0; +#else + /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(r, (bus_space_handle_t) vaddr); +#endif } return (rman_activate_resource(r)); } diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c index f5554f8..5fdda2b 100644 --- a/sys/amd64/amd64/nexus.c +++ b/sys/amd64/amd64/nexus.c @@ -289,7 +289,17 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_set_bustag(rv, I386_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { rman_set_bustag(rv, I386_BUS_SPACE_IO); +#ifdef PC98 + /* PC-98: the type of bus_space_handle_t is the structure. */ + rv->r_bushandle.bsh_base = rv->r_start; + rv->r_bushandle.bsh_iat = NULL; + rv->r_bushandle.bsh_iatsz = 0; + rv->r_bushandle.bsh_res = NULL; + rv->r_bushandle.bsh_ressz = 0; +#else + /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(rv, rv->r_start); +#endif } if (needactivate) { @@ -329,7 +339,17 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid, vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; } rman_set_virtual(r, vaddr); +#ifdef PC98 + /* PC-98: the type of bus_space_handle_t is the structure. */ + r->r_bushandle.bsh_base = (bus_addr_t) vaddr; + r->r_bushandle.bsh_iat = NULL; + r->r_bushandle.bsh_iatsz = 0; + r->r_bushandle.bsh_res = NULL; + r->r_bushandle.bsh_ressz = 0; +#else + /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(r, (bus_space_handle_t) vaddr); +#endif } return (rman_activate_resource(r)); } diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h index 6617612..04814ea 100644 --- a/sys/amd64/include/bus.h +++ b/sys/amd64/include/bus.h @@ -1,61 +1,22 @@ -/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ - /*- - * Copyright (c) 1996, 1997 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 - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * Copyright (c) KATO Takenori, 1999. * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``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. - */ - -/* - * Copyright (c) 1996 Charles M. Hannum. All rights reserved. - * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. + * All rights reserved. Unpublished rights reserved under the copyright + * laws of Japan. * * 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. + * notice, this list of conditions and the following disclaimer as + * the first lines of this file unmodified. * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christopher G. Demetriou - * for the NetBSD Project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * * 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. @@ -66,1226 +27,19 @@ * 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. + * + * $FreeBSD$ */ -/* $FreeBSD$ */ #ifndef _I386_BUS_H_ #define _I386_BUS_H_ -#include <machine/cpufunc.h> - -/* - * To remain compatible with NetBSD's interface, default to both memio and - * pio when neither of them is defined. - */ -#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_) -#define _I386_BUS_PIO_H_ -#define _I386_BUS_MEMIO_H_ -#endif - -/* - * Values for the i386 bus space tag, not to be used directly by MI code. - */ -#define I386_BUS_SPACE_IO 0 /* space is i/o space */ -#define I386_BUS_SPACE_MEM 1 /* space is mem space */ - -/* - * Bus address and size types - */ -typedef u_int bus_addr_t; -typedef u_int bus_size_t; - -#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF -#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ -#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF -#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXADDR 0xFFFFFFFF - -#define BUS_SPACE_UNRESTRICTED (~0) - -/* - * Access methods for bus resources and address space. - */ -typedef int bus_space_tag_t; -typedef u_int bus_space_handle_t; - -/* - * Map a region of device bus space into CPU virtual address space. - */ - -#define BUS_SPACE_MAP_CACHEABLE 0x01 -#define BUS_SPACE_MAP_LINEAR 0x02 - -int bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, - int flags, bus_space_handle_t *bshp); - -/* - * Unmap a region of device bus space. - */ - -void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size); - -/* - * Get a new handle for a subregion of an already-mapped area of bus space. - */ - -int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, - bus_space_handle_t *nbshp); - -/* - * Allocate a region of memory that is accessible to devices in bus space. - */ - -int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, - bus_addr_t rend, bus_size_t size, bus_size_t align, - bus_size_t boundary, int flags, bus_addr_t *addrp, - bus_space_handle_t *bshp); - -/* - * Free a region of bus space accessible memory. - */ - -void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size); - -#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) - -/* - * Read a 1, 2, 4, or 8 byte quantity from bus space - * described by tag/handle/offset. - */ -static __inline u_int8_t bus_space_read_1(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int8_t -bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ -#if defined (_I386_BUS_PIO_H_) -#if defined (_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - return (inb(handle + offset)); -#endif -#if defined (_I386_BUS_MEMIO_H_) - return (*(volatile u_int8_t *)(handle + offset)); -#endif -} - -static __inline u_int16_t -bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - return (inw(handle + offset)); -#endif -#if defined(_I386_BUS_MEMIO_H_) - return (*(volatile u_int16_t *)(handle + offset)); -#endif -} - -static __inline u_int32_t -bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - return (inl(handle + offset)); -#endif -#if defined(_I386_BUS_MEMIO_H_) - return (*(volatile u_int32_t *)(handle + offset)); -#endif -} - -#if 0 /* Cause a link error for bus_space_read_8 */ -#define bus_space_read_8(t, h, o) !!! bus_space_read_8 unimplemented !!! -#endif - -/* - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle/offset and copy into buffer provided. - */ -static __inline void bus_space_read_multi_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, - size_t count); - -static __inline void bus_space_read_multi_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, - size_t count); - -static __inline void bus_space_read_multi_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, - size_t count); - -static __inline void -bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - insb(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: movb (%2),%%al \n\ - stosb \n\ - loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory"); - } -#endif -} - -static __inline void -bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - insw(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: movw (%2),%%ax \n\ - stosw \n\ - loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory"); - } -#endif -} - -static __inline void -bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - insl(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: movl (%2),%%eax \n\ - stosl \n\ - loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory"); - } -#endif -} - -#if 0 /* Cause a link error for bus_space_read_multi_8 */ -#define bus_space_read_multi_8 !!! bus_space_read_multi_8 unimplemented !!! -#endif - -/* - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle and starting at `offset' and copy into - * buffer provided. - */ -static __inline void bus_space_read_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, - size_t count); - -static __inline void bus_space_read_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, - size_t count); - -static __inline void bus_space_read_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, - size_t count); - - -static __inline void -bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: inb %w2,%%al \n\ - stosb \n\ - incl %2 \n\ - loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsb" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: inw %w2,%%ax \n\ - stosw \n\ - addl $2,%2 \n\ - loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsw" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: inl %w2,%%eax \n\ - stosl \n\ - addl $4,%2 \n\ - loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsl" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); - } -#endif -} - -#if 0 /* Cause a link error for bus_space_read_region_8 */ -#define bus_space_read_region_8 !!! bus_space_read_region_8 unimplemented !!! -#endif - -/* - * Write the 1, 2, 4, or 8 byte value `value' to bus space - * described by tag/handle/offset. - */ - -static __inline void bus_space_write_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value); - -static __inline void bus_space_write_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value); - -static __inline void bus_space_write_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value); - -static __inline void -bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outb(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - *(volatile u_int8_t *)(bsh + offset) = value; -#endif -} - -static __inline void -bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outw(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - *(volatile u_int16_t *)(bsh + offset) = value; -#endif -} - -static __inline void -bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outl(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - *(volatile u_int32_t *)(bsh + offset) = value; -#endif -} - -#if 0 /* Cause a link error for bus_space_write_8 */ -#define bus_space_write_8 !!! bus_space_write_8 not implemented !!! -#endif - -/* - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer - * provided to bus space described by tag/handle/offset. - */ - -static __inline void bus_space_write_multi_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int8_t *addr, - size_t count); -static __inline void bus_space_write_multi_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int16_t *addr, - size_t count); - -static __inline void bus_space_write_multi_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int32_t *addr, - size_t count); - -static __inline void -bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int8_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outsb(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: lodsb \n\ - movb %%al,(%2) \n\ - loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int16_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outsw(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: lodsw \n\ - movw %%ax,(%1) \n\ - movw %%ax,(%2) \n\ - loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int32_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) +#ifdef PC98 +/* NEC PC-98 */ +#include <machine/bus_pc98.h> +#else +/* IBM-PC */ +#include <machine/bus_at386.h> #endif - outsl(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: lodsl \n\ - movl %%eax,(%2) \n\ - loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); - } -#endif -} - -#if 0 /* Cause a link error for bus_space_write_multi_8 */ -#define bus_space_write_multi_8(t, h, o, a, c) \ - !!! bus_space_write_multi_8 unimplemented !!! -#endif - -/* - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided - * to bus space described by tag/handle starting at `offset'. - */ - -static __inline void bus_space_write_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int8_t *addr, - size_t count); -static __inline void bus_space_write_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int16_t *addr, - size_t count); -static __inline void bus_space_write_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int32_t *addr, - size_t count); - -static __inline void -bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int8_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: lodsb \n\ - outb %%al,%w0 \n\ - incl %0 \n\ - loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsb" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int16_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: lodsw \n\ - outw %%ax,%w0 \n\ - addl $2,%0 \n\ - loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsw" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int32_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: lodsl \n\ - outl %%eax,%w0 \n\ - addl $4,%0 \n\ - loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsl" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); - } -#endif -} - -#if 0 /* Cause a link error for bus_space_write_region_8 */ -#define bus_space_write_region_8 \ - !!! bus_space_write_region_8 unimplemented !!! -#endif - -/* - * Write the 1, 2, 4, or 8 byte value `val' to bus space described - * by tag/handle/offset `count' times. - */ - -static __inline void bus_space_set_multi_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - u_int8_t value, size_t count); -static __inline void bus_space_set_multi_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - u_int16_t value, size_t count); -static __inline void bus_space_set_multi_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - u_int32_t value, size_t count); - -static __inline void -bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - while (count--) - outb(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - while (count--) - *(volatile u_int8_t *)(addr) = value; -#endif -} - -static __inline void -bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - while (count--) - outw(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - while (count--) - *(volatile u_int16_t *)(addr) = value; -#endif -} - -static __inline void -bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - while (count--) - outl(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - while (count--) - *(volatile u_int32_t *)(addr) = value; -#endif -} - -#if 0 /* Cause a link error for bus_space_set_multi_8 */ -#define bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!! -#endif - -/* - * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described - * by tag/handle starting at `offset'. - */ - -static __inline void bus_space_set_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value, - size_t count); -static __inline void bus_space_set_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value, - size_t count); -static __inline void bus_space_set_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, - size_t count); - -static __inline void -bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - for (; count != 0; count--, addr++) - outb(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - for (; count != 0; count--, addr++) - *(volatile u_int8_t *)(addr) = value; -#endif -} - -static __inline void -bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - for (; count != 0; count--, addr += 2) - outw(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - for (; count != 0; count--, addr += 2) - *(volatile u_int16_t *)(addr) = value; -#endif -} - -static __inline void -bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - for (; count != 0; count--, addr += 4) - outl(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - for (; count != 0; count--, addr += 4) - *(volatile u_int32_t *)(addr) = value; -#endif -} - -#if 0 /* Cause a link error for bus_space_set_region_8 */ -#define bus_space_set_region_8 !!! bus_space_set_region_8 unimplemented !!! -#endif - -/* - * Copy `count' 1, 2, 4, or 8 byte values from bus space starting - * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. - */ - -static __inline void bus_space_copy_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh1, - bus_size_t off1, - bus_space_handle_t bsh2, - bus_size_t off2, size_t count); - -static __inline void bus_space_copy_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh1, - bus_size_t off1, - bus_space_handle_t bsh2, - bus_size_t off2, size_t count); - -static __inline void bus_space_copy_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh1, - bus_size_t off1, - bus_space_handle_t bsh2, - bus_size_t off2, size_t count); - -static __inline void -bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, - bus_size_t off1, bus_space_handle_t bsh2, - bus_size_t off2, size_t count) -{ - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1++, addr2++) - outb(addr2, inb(addr1)); - } else { - /* dest after src: copy backwards */ - for (addr1 += (count - 1), addr2 += (count - 1); - count != 0; count--, addr1--, addr2--) - outb(addr2, inb(addr1)); - } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1++, addr2++) - *(volatile u_int8_t *)(addr2) = - *(volatile u_int8_t *)(addr1); - } else { - /* dest after src: copy backwards */ - for (addr1 += (count - 1), addr2 += (count - 1); - count != 0; count--, addr1--, addr2--) - *(volatile u_int8_t *)(addr2) = - *(volatile u_int8_t *)(addr1); - } - } -#endif -} - -static __inline void -bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, - bus_size_t off1, bus_space_handle_t bsh2, - bus_size_t off2, size_t count) -{ - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1 += 2, addr2 += 2) - outw(addr2, inw(addr1)); - } else { - /* dest after src: copy backwards */ - for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1); - count != 0; count--, addr1 -= 2, addr2 -= 2) - outw(addr2, inw(addr1)); - } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1 += 2, addr2 += 2) - *(volatile u_int16_t *)(addr2) = - *(volatile u_int16_t *)(addr1); - } else { - /* dest after src: copy backwards */ - for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1); - count != 0; count--, addr1 -= 2, addr2 -= 2) - *(volatile u_int16_t *)(addr2) = - *(volatile u_int16_t *)(addr1); - } - } -#endif -} - -static __inline void -bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, - bus_size_t off1, bus_space_handle_t bsh2, - bus_size_t off2, size_t count) -{ - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1 += 4, addr2 += 4) - outl(addr2, inl(addr1)); - } else { - /* dest after src: copy backwards */ - for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1); - count != 0; count--, addr1 -= 4, addr2 -= 4) - outl(addr2, inl(addr1)); - } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1 += 4, addr2 += 4) - *(volatile u_int32_t *)(addr2) = - *(volatile u_int32_t *)(addr1); - } else { - /* dest after src: copy backwards */ - for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1); - count != 0; count--, addr1 -= 4, addr2 -= 4) - *(volatile u_int32_t *)(addr2) = - *(volatile u_int32_t *)(addr1); - } - } -#endif -} - -#endif /* defined(_I386_BUS_PIO_H_) || defined(_I386_MEM_IO_H_) */ - -#if 0 /* Cause a link error for bus_space_copy_8 */ -#define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!! -#endif - -/* - * Bus read/write barrier methods. - * - * void bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t bsh, - * bus_size_t offset, bus_size_t len, int flags); - * - * Note: the i386 does not currently require barriers, but we must - * provide the flags to MI code. - */ -#define bus_space_barrier(t, h, o, l, f) \ - ((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f))) -#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ -#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ - -/* - * Flags used in various bus DMA methods. - */ -#define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ -#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ -#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMAMEM_NOSYNC 0x04 /* map memory to not require sync */ -#define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */ -#define BUS_DMA_BUS2 0x20 -#define BUS_DMA_BUS3 0x40 -#define BUS_DMA_BUS4 0x80 - -/* Forwards needed by prototypes below. */ -struct mbuf; -struct uio; - -/* - * bus_dmasync_op_t - * - * Operations performed by bus_dmamap_sync(). - */ -typedef enum { - BUS_DMASYNC_PREREAD, - BUS_DMASYNC_POSTREAD, - BUS_DMASYNC_PREWRITE, - BUS_DMASYNC_POSTWRITE -} bus_dmasync_op_t; - -/* - * bus_dma_tag_t - * - * A machine-dependent opaque type describing the characteristics - * of how to perform DMA mappings. This structure encapsultes - * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. - */ -typedef struct bus_dma_tag *bus_dma_tag_t; - -/* - * bus_dmamap_t - * - * DMA mapping instance information. - */ -typedef struct bus_dmamap *bus_dmamap_t; - -/* - * bus_dma_segment_t - * - * Describes a single contiguous DMA transaction. Values - * are suitable for programming into DMA registers. - */ -typedef struct bus_dma_segment { - bus_addr_t ds_addr; /* DMA address */ - bus_size_t ds_len; /* length of transfer */ -} bus_dma_segment_t; - -/* - * A function that returns 1 if the address cannot be accessed by - * a device and 0 if it can be. - */ -typedef int bus_dma_filter_t(void *, bus_addr_t); - -/* - * Allocate a device specific dma_tag encapsulating the constraints of - * the parent tag in addition to other restrictions specified: - * - * alignment: alignment for segments. - * boundary: Boundary that segments cannot cross. - * lowaddr: Low restricted address that cannot appear in a mapping. - * highaddr: High restricted address that cannot appear in a mapping. - * filtfunc: An optional function to further test if an address - * within the range of lowaddr and highaddr cannot appear - * in a mapping. - * filtfuncarg: An argument that will be passed to filtfunc in addition - * to the address to test. - * maxsize: Maximum mapping size supported by this tag. - * nsegments: Number of discontinuities allowed in maps. - * maxsegsz: Maximum size of a segment in the map. - * flags: Bus DMA flags. - * dmat: A pointer to set to a valid dma tag should the return - * value of this function indicate success. - */ -/* XXX Should probably allow specification of alignment */ -int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignemnt, - bus_size_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filtfunc, - void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat); - -int bus_dma_tag_destroy(bus_dma_tag_t dmat); - -/* - * Allocate a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); - -/* - * Destroy a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map); - -/* - * Allocate a piece of memory that can be efficiently mapped into - * bus device space based on the constraints lited in the dma tag. - * A dmamap to for use with dmamap_load is also allocated. - */ -int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, - bus_dmamap_t *mapp); - -/* - * Free a piece of memory and it's allociated dmamap, that was allocated - * via bus_dmamem_alloc. - */ -void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); - -/* - * A function that processes a successfully loaded dma map or an error - * from a delayed load map. - */ -typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); - -/* - * Map the buffer buf into bus space using the dmamap map. - */ -int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, - void *callback_arg, int flags); - -/* - * Perform a syncronization operation on the given map. - */ -void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -#define bus_dmamap_sync(dmat, dmamap, op) \ - if ((dmamap) != NULL) \ - _bus_dmamap_sync(dmat, dmamap, op) - -/* - * Release the mapping held by map. - */ -void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); -#define bus_dmamap_unload(dmat, dmamap) \ - if ((dmamap) != NULL) \ - _bus_dmamap_unload(dmat, dmamap) #endif /* _I386_BUS_H_ */ diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h index 6617612..2dc6ecb 100644 --- a/sys/amd64/include/bus_amd64.h +++ b/sys/amd64/include/bus_amd64.h @@ -69,8 +69,8 @@ */ /* $FreeBSD$ */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _I386_BUS_AT386_H_ +#define _I386_BUS_AT386_H_ #include <machine/cpufunc.h> @@ -1288,4 +1288,4 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) -#endif /* _I386_BUS_H_ */ +#endif /* _I386_BUS_AT386_H_ */ diff --git a/sys/amd64/include/bus_at386.h b/sys/amd64/include/bus_at386.h index 6617612..2dc6ecb 100644 --- a/sys/amd64/include/bus_at386.h +++ b/sys/amd64/include/bus_at386.h @@ -69,8 +69,8 @@ */ /* $FreeBSD$ */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _I386_BUS_AT386_H_ +#define _I386_BUS_AT386_H_ #include <machine/cpufunc.h> @@ -1288,4 +1288,4 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) -#endif /* _I386_BUS_H_ */ +#endif /* _I386_BUS_AT386_H_ */ diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h index 6617612..2dc6ecb 100644 --- a/sys/amd64/include/bus_dma.h +++ b/sys/amd64/include/bus_dma.h @@ -69,8 +69,8 @@ */ /* $FreeBSD$ */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _I386_BUS_AT386_H_ +#define _I386_BUS_AT386_H_ #include <machine/cpufunc.h> @@ -1288,4 +1288,4 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) -#endif /* _I386_BUS_H_ */ +#endif /* _I386_BUS_AT386_H_ */ diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 5e9e69a..e9e8203 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -62,6 +62,7 @@ #include <sys/bus.h> #include <sys/malloc.h> #include <machine/bus.h> +#include <sys/rman.h> #include <machine/resource.h> @@ -132,12 +133,113 @@ isa_alloc_resource(device_t bus, device_t child, int type, int *rid, start, end, count, flags); } +#ifdef PC98 +/* + * Indirection support. The type of bus_space_handle_t is + * defined in sys/i386/include/bus_pc98.h. + */ +struct resource * +isa_alloc_resourcev(device_t child, int type, int *rid, + bus_addr_t *res, bus_size_t count, u_int flags) +{ + struct isa_device* idev = DEVTOISA(child); + struct resource_list *rl = &idev->id_resources; + + device_t bus = device_get_parent(child); + bus_addr_t ioport; + struct resource *re; + struct resource **bsre; + int i, j, k, linear_cnt, ressz, bsrid; + + ioport = bus_get_resource_start(child, SYS_RES_IOPORT, 0); + + linear_cnt = count; + ressz = 1; + for (i = 1; i < count; ++i) { + if (res[i] > res[i - 1] + 1) { + if (i < linear_cnt) + linear_cnt = i; + ++ressz; + } + } + + re = isa_alloc_resource(bus, child, type, rid, ioport + res[0], + ioport + res[linear_cnt - 1], linear_cnt, flags); + if (re == NULL) + return NULL; + + bsre = malloc(sizeof (struct resource *) * ressz, M_DEVBUF, M_NOWAIT); + if (bsre == NULL) { + resource_list_release(rl, bus, child, type, *rid, re); + return NULL; + } + bsre[0] = re; + + for (i = linear_cnt, k = 1; i < count; i = j, k++) { + for (j = i + 1; j < count; j++) { + if (res[j] > res[j - 1] + 1) + break; + } + bsrid = *rid + k; + bsre[k] = isa_alloc_resource(bus, child, type, &bsrid, + ioport + res[i], ioport + res[j - 1], j - i, flags); + if (bsre[k] == NULL) { + for (k--; k >= 0; k--) + resource_list_release(rl, bus, child, type, + *rid + k, bsre[k]); + free(bsre, M_DEVBUF); + return NULL; + } + } + + re->r_bushandle.bsh_res = bsre; + re->r_bushandle.bsh_ressz = ressz; + + return re; +} + +int +isa_load_resourcev(struct resource *re, bus_addr_t *res, bus_size_t count) +{ + bus_addr_t *addr; + int i; + + addr = malloc(sizeof (bus_addr_t) * count, M_DEVBUF, M_NOWAIT); + if (addr == NULL) + return 1; + + for (i = 0; i < count; i++) + addr[i] = rman_get_start(re) + res[i]; + + rman_set_bustag(re, I386_BUS_SPACE_IO_IND); + re->r_bushandle.bsh_iat = addr; + re->r_bushandle.bsh_iatsz = count; + + return 0; +} +#endif /* PC98 */ + int isa_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { struct isa_device* idev = DEVTOISA(child); struct resource_list *rl = &idev->id_resources; +#ifdef PC98 + /* + * Indirection support. The type of bus_space_handle_t is + * defined in sys/i386/include/bus_pc98.h. + */ + int i; + + for (i = 1; i < r->r_bushandle.bsh_ressz; i++) + resource_list_release(rl, bus, child, type, rid + i, + r->r_bushandle.bsh_res[i]); + if (r->r_bushandle.bsh_res != NULL) + free(r->r_bushandle.bsh_res, M_DEVBUF); + if (r->r_bushandle.bsh_iat != NULL) + free(r->r_bushandle.bsh_iat, M_DEVBUF); +#endif return resource_list_release(rl, bus, child, type, rid, r); } diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c index f5554f8..5fdda2b 100644 --- a/sys/i386/i386/legacy.c +++ b/sys/i386/i386/legacy.c @@ -289,7 +289,17 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_set_bustag(rv, I386_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { rman_set_bustag(rv, I386_BUS_SPACE_IO); +#ifdef PC98 + /* PC-98: the type of bus_space_handle_t is the structure. */ + rv->r_bushandle.bsh_base = rv->r_start; + rv->r_bushandle.bsh_iat = NULL; + rv->r_bushandle.bsh_iatsz = 0; + rv->r_bushandle.bsh_res = NULL; + rv->r_bushandle.bsh_ressz = 0; +#else + /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(rv, rv->r_start); +#endif } if (needactivate) { @@ -329,7 +339,17 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid, vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; } rman_set_virtual(r, vaddr); +#ifdef PC98 + /* PC-98: the type of bus_space_handle_t is the structure. */ + r->r_bushandle.bsh_base = (bus_addr_t) vaddr; + r->r_bushandle.bsh_iat = NULL; + r->r_bushandle.bsh_iatsz = 0; + r->r_bushandle.bsh_res = NULL; + r->r_bushandle.bsh_ressz = 0; +#else + /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(r, (bus_space_handle_t) vaddr); +#endif } return (rman_activate_resource(r)); } diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c index f5554f8..5fdda2b 100644 --- a/sys/i386/i386/nexus.c +++ b/sys/i386/i386/nexus.c @@ -289,7 +289,17 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_set_bustag(rv, I386_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { rman_set_bustag(rv, I386_BUS_SPACE_IO); +#ifdef PC98 + /* PC-98: the type of bus_space_handle_t is the structure. */ + rv->r_bushandle.bsh_base = rv->r_start; + rv->r_bushandle.bsh_iat = NULL; + rv->r_bushandle.bsh_iatsz = 0; + rv->r_bushandle.bsh_res = NULL; + rv->r_bushandle.bsh_ressz = 0; +#else + /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(rv, rv->r_start); +#endif } if (needactivate) { @@ -329,7 +339,17 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid, vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; } rman_set_virtual(r, vaddr); +#ifdef PC98 + /* PC-98: the type of bus_space_handle_t is the structure. */ + r->r_bushandle.bsh_base = (bus_addr_t) vaddr; + r->r_bushandle.bsh_iat = NULL; + r->r_bushandle.bsh_iatsz = 0; + r->r_bushandle.bsh_res = NULL; + r->r_bushandle.bsh_ressz = 0; +#else + /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(r, (bus_space_handle_t) vaddr); +#endif } return (rman_activate_resource(r)); } diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h index 6617612..04814ea 100644 --- a/sys/i386/include/bus.h +++ b/sys/i386/include/bus.h @@ -1,61 +1,22 @@ -/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ - /*- - * Copyright (c) 1996, 1997 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 - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * Copyright (c) KATO Takenori, 1999. * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``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. - */ - -/* - * Copyright (c) 1996 Charles M. Hannum. All rights reserved. - * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. + * All rights reserved. Unpublished rights reserved under the copyright + * laws of Japan. * * 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. + * notice, this list of conditions and the following disclaimer as + * the first lines of this file unmodified. * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christopher G. Demetriou - * for the NetBSD Project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * * 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. @@ -66,1226 +27,19 @@ * 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. + * + * $FreeBSD$ */ -/* $FreeBSD$ */ #ifndef _I386_BUS_H_ #define _I386_BUS_H_ -#include <machine/cpufunc.h> - -/* - * To remain compatible with NetBSD's interface, default to both memio and - * pio when neither of them is defined. - */ -#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_) -#define _I386_BUS_PIO_H_ -#define _I386_BUS_MEMIO_H_ -#endif - -/* - * Values for the i386 bus space tag, not to be used directly by MI code. - */ -#define I386_BUS_SPACE_IO 0 /* space is i/o space */ -#define I386_BUS_SPACE_MEM 1 /* space is mem space */ - -/* - * Bus address and size types - */ -typedef u_int bus_addr_t; -typedef u_int bus_size_t; - -#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF -#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ -#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF -#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXADDR 0xFFFFFFFF - -#define BUS_SPACE_UNRESTRICTED (~0) - -/* - * Access methods for bus resources and address space. - */ -typedef int bus_space_tag_t; -typedef u_int bus_space_handle_t; - -/* - * Map a region of device bus space into CPU virtual address space. - */ - -#define BUS_SPACE_MAP_CACHEABLE 0x01 -#define BUS_SPACE_MAP_LINEAR 0x02 - -int bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, - int flags, bus_space_handle_t *bshp); - -/* - * Unmap a region of device bus space. - */ - -void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size); - -/* - * Get a new handle for a subregion of an already-mapped area of bus space. - */ - -int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, - bus_space_handle_t *nbshp); - -/* - * Allocate a region of memory that is accessible to devices in bus space. - */ - -int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, - bus_addr_t rend, bus_size_t size, bus_size_t align, - bus_size_t boundary, int flags, bus_addr_t *addrp, - bus_space_handle_t *bshp); - -/* - * Free a region of bus space accessible memory. - */ - -void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size); - -#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) - -/* - * Read a 1, 2, 4, or 8 byte quantity from bus space - * described by tag/handle/offset. - */ -static __inline u_int8_t bus_space_read_1(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int8_t -bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ -#if defined (_I386_BUS_PIO_H_) -#if defined (_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - return (inb(handle + offset)); -#endif -#if defined (_I386_BUS_MEMIO_H_) - return (*(volatile u_int8_t *)(handle + offset)); -#endif -} - -static __inline u_int16_t -bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - return (inw(handle + offset)); -#endif -#if defined(_I386_BUS_MEMIO_H_) - return (*(volatile u_int16_t *)(handle + offset)); -#endif -} - -static __inline u_int32_t -bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - return (inl(handle + offset)); -#endif -#if defined(_I386_BUS_MEMIO_H_) - return (*(volatile u_int32_t *)(handle + offset)); -#endif -} - -#if 0 /* Cause a link error for bus_space_read_8 */ -#define bus_space_read_8(t, h, o) !!! bus_space_read_8 unimplemented !!! -#endif - -/* - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle/offset and copy into buffer provided. - */ -static __inline void bus_space_read_multi_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, - size_t count); - -static __inline void bus_space_read_multi_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, - size_t count); - -static __inline void bus_space_read_multi_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, - size_t count); - -static __inline void -bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - insb(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: movb (%2),%%al \n\ - stosb \n\ - loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory"); - } -#endif -} - -static __inline void -bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - insw(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: movw (%2),%%ax \n\ - stosw \n\ - loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory"); - } -#endif -} - -static __inline void -bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - insl(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: movl (%2),%%eax \n\ - stosl \n\ - loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory"); - } -#endif -} - -#if 0 /* Cause a link error for bus_space_read_multi_8 */ -#define bus_space_read_multi_8 !!! bus_space_read_multi_8 unimplemented !!! -#endif - -/* - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle and starting at `offset' and copy into - * buffer provided. - */ -static __inline void bus_space_read_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, - size_t count); - -static __inline void bus_space_read_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, - size_t count); - -static __inline void bus_space_read_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, - size_t count); - - -static __inline void -bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: inb %w2,%%al \n\ - stosb \n\ - incl %2 \n\ - loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsb" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: inw %w2,%%ax \n\ - stosw \n\ - addl $2,%2 \n\ - loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsw" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: inl %w2,%%eax \n\ - stosl \n\ - addl $4,%2 \n\ - loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsl" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); - } -#endif -} - -#if 0 /* Cause a link error for bus_space_read_region_8 */ -#define bus_space_read_region_8 !!! bus_space_read_region_8 unimplemented !!! -#endif - -/* - * Write the 1, 2, 4, or 8 byte value `value' to bus space - * described by tag/handle/offset. - */ - -static __inline void bus_space_write_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value); - -static __inline void bus_space_write_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value); - -static __inline void bus_space_write_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value); - -static __inline void -bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outb(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - *(volatile u_int8_t *)(bsh + offset) = value; -#endif -} - -static __inline void -bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outw(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - *(volatile u_int16_t *)(bsh + offset) = value; -#endif -} - -static __inline void -bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outl(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - *(volatile u_int32_t *)(bsh + offset) = value; -#endif -} - -#if 0 /* Cause a link error for bus_space_write_8 */ -#define bus_space_write_8 !!! bus_space_write_8 not implemented !!! -#endif - -/* - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer - * provided to bus space described by tag/handle/offset. - */ - -static __inline void bus_space_write_multi_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int8_t *addr, - size_t count); -static __inline void bus_space_write_multi_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int16_t *addr, - size_t count); - -static __inline void bus_space_write_multi_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int32_t *addr, - size_t count); - -static __inline void -bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int8_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outsb(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: lodsb \n\ - movb %%al,(%2) \n\ - loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int16_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - outsw(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: lodsw \n\ - movw %%ax,(%1) \n\ - movw %%ax,(%2) \n\ - loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int32_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) +#ifdef PC98 +/* NEC PC-98 */ +#include <machine/bus_pc98.h> +#else +/* IBM-PC */ +#include <machine/bus_at386.h> #endif - outsl(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - __asm __volatile(" \n\ - cld \n\ - 1: lodsl \n\ - movl %%eax,(%2) \n\ - loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); - } -#endif -} - -#if 0 /* Cause a link error for bus_space_write_multi_8 */ -#define bus_space_write_multi_8(t, h, o, a, c) \ - !!! bus_space_write_multi_8 unimplemented !!! -#endif - -/* - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided - * to bus space described by tag/handle starting at `offset'. - */ - -static __inline void bus_space_write_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int8_t *addr, - size_t count); -static __inline void bus_space_write_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int16_t *addr, - size_t count); -static __inline void bus_space_write_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int32_t *addr, - size_t count); - -static __inline void -bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int8_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: lodsb \n\ - outb %%al,%w0 \n\ - incl %0 \n\ - loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsb" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int16_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: lodsw \n\ - outw %%ax,%w0 \n\ - addl $2,%0 \n\ - loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsw" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); - } -#endif -} - -static __inline void -bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int32_t *addr, size_t count) -{ -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - 1: lodsl \n\ - outl %%eax,%w0 \n\ - addl $4,%0 \n\ - loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - int _port_ = bsh + offset; \ - __asm __volatile(" \n\ - cld \n\ - repne \n\ - movsl" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); - } -#endif -} - -#if 0 /* Cause a link error for bus_space_write_region_8 */ -#define bus_space_write_region_8 \ - !!! bus_space_write_region_8 unimplemented !!! -#endif - -/* - * Write the 1, 2, 4, or 8 byte value `val' to bus space described - * by tag/handle/offset `count' times. - */ - -static __inline void bus_space_set_multi_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - u_int8_t value, size_t count); -static __inline void bus_space_set_multi_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - u_int16_t value, size_t count); -static __inline void bus_space_set_multi_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - u_int32_t value, size_t count); - -static __inline void -bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - while (count--) - outb(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - while (count--) - *(volatile u_int8_t *)(addr) = value; -#endif -} - -static __inline void -bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - while (count--) - outw(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - while (count--) - *(volatile u_int16_t *)(addr) = value; -#endif -} - -static __inline void -bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - while (count--) - outl(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - while (count--) - *(volatile u_int32_t *)(addr) = value; -#endif -} - -#if 0 /* Cause a link error for bus_space_set_multi_8 */ -#define bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!! -#endif - -/* - * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described - * by tag/handle starting at `offset'. - */ - -static __inline void bus_space_set_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value, - size_t count); -static __inline void bus_space_set_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value, - size_t count); -static __inline void bus_space_set_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, - size_t count); - -static __inline void -bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - for (; count != 0; count--, addr++) - outb(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - for (; count != 0; count--, addr++) - *(volatile u_int8_t *)(addr) = value; -#endif -} - -static __inline void -bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - for (; count != 0; count--, addr += 2) - outw(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - for (; count != 0; count--, addr += 2) - *(volatile u_int16_t *)(addr) = value; -#endif -} - -static __inline void -bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, size_t count) -{ - bus_addr_t addr = bsh + offset; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - for (; count != 0; count--, addr += 4) - outl(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - for (; count != 0; count--, addr += 4) - *(volatile u_int32_t *)(addr) = value; -#endif -} - -#if 0 /* Cause a link error for bus_space_set_region_8 */ -#define bus_space_set_region_8 !!! bus_space_set_region_8 unimplemented !!! -#endif - -/* - * Copy `count' 1, 2, 4, or 8 byte values from bus space starting - * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. - */ - -static __inline void bus_space_copy_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh1, - bus_size_t off1, - bus_space_handle_t bsh2, - bus_size_t off2, size_t count); - -static __inline void bus_space_copy_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh1, - bus_size_t off1, - bus_space_handle_t bsh2, - bus_size_t off2, size_t count); - -static __inline void bus_space_copy_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh1, - bus_size_t off1, - bus_space_handle_t bsh2, - bus_size_t off2, size_t count); - -static __inline void -bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, - bus_size_t off1, bus_space_handle_t bsh2, - bus_size_t off2, size_t count) -{ - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1++, addr2++) - outb(addr2, inb(addr1)); - } else { - /* dest after src: copy backwards */ - for (addr1 += (count - 1), addr2 += (count - 1); - count != 0; count--, addr1--, addr2--) - outb(addr2, inb(addr1)); - } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1++, addr2++) - *(volatile u_int8_t *)(addr2) = - *(volatile u_int8_t *)(addr1); - } else { - /* dest after src: copy backwards */ - for (addr1 += (count - 1), addr2 += (count - 1); - count != 0; count--, addr1--, addr2--) - *(volatile u_int8_t *)(addr2) = - *(volatile u_int8_t *)(addr1); - } - } -#endif -} - -static __inline void -bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, - bus_size_t off1, bus_space_handle_t bsh2, - bus_size_t off2, size_t count) -{ - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1 += 2, addr2 += 2) - outw(addr2, inw(addr1)); - } else { - /* dest after src: copy backwards */ - for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1); - count != 0; count--, addr1 -= 2, addr2 -= 2) - outw(addr2, inw(addr1)); - } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1 += 2, addr2 += 2) - *(volatile u_int16_t *)(addr2) = - *(volatile u_int16_t *)(addr1); - } else { - /* dest after src: copy backwards */ - for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1); - count != 0; count--, addr1 -= 2, addr2 -= 2) - *(volatile u_int16_t *)(addr2) = - *(volatile u_int16_t *)(addr1); - } - } -#endif -} - -static __inline void -bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, - bus_size_t off1, bus_space_handle_t bsh2, - bus_size_t off2, size_t count) -{ - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1 += 4, addr2 += 4) - outl(addr2, inl(addr1)); - } else { - /* dest after src: copy backwards */ - for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1); - count != 0; count--, addr1 -= 4, addr2 -= 4) - outl(addr2, inl(addr1)); - } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { - if (addr1 >= addr2) { - /* src after dest: copy forward */ - for (; count != 0; count--, addr1 += 4, addr2 += 4) - *(volatile u_int32_t *)(addr2) = - *(volatile u_int32_t *)(addr1); - } else { - /* dest after src: copy backwards */ - for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1); - count != 0; count--, addr1 -= 4, addr2 -= 4) - *(volatile u_int32_t *)(addr2) = - *(volatile u_int32_t *)(addr1); - } - } -#endif -} - -#endif /* defined(_I386_BUS_PIO_H_) || defined(_I386_MEM_IO_H_) */ - -#if 0 /* Cause a link error for bus_space_copy_8 */ -#define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!! -#endif - -/* - * Bus read/write barrier methods. - * - * void bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t bsh, - * bus_size_t offset, bus_size_t len, int flags); - * - * Note: the i386 does not currently require barriers, but we must - * provide the flags to MI code. - */ -#define bus_space_barrier(t, h, o, l, f) \ - ((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f))) -#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ -#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ - -/* - * Flags used in various bus DMA methods. - */ -#define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ -#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ -#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMAMEM_NOSYNC 0x04 /* map memory to not require sync */ -#define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */ -#define BUS_DMA_BUS2 0x20 -#define BUS_DMA_BUS3 0x40 -#define BUS_DMA_BUS4 0x80 - -/* Forwards needed by prototypes below. */ -struct mbuf; -struct uio; - -/* - * bus_dmasync_op_t - * - * Operations performed by bus_dmamap_sync(). - */ -typedef enum { - BUS_DMASYNC_PREREAD, - BUS_DMASYNC_POSTREAD, - BUS_DMASYNC_PREWRITE, - BUS_DMASYNC_POSTWRITE -} bus_dmasync_op_t; - -/* - * bus_dma_tag_t - * - * A machine-dependent opaque type describing the characteristics - * of how to perform DMA mappings. This structure encapsultes - * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. - */ -typedef struct bus_dma_tag *bus_dma_tag_t; - -/* - * bus_dmamap_t - * - * DMA mapping instance information. - */ -typedef struct bus_dmamap *bus_dmamap_t; - -/* - * bus_dma_segment_t - * - * Describes a single contiguous DMA transaction. Values - * are suitable for programming into DMA registers. - */ -typedef struct bus_dma_segment { - bus_addr_t ds_addr; /* DMA address */ - bus_size_t ds_len; /* length of transfer */ -} bus_dma_segment_t; - -/* - * A function that returns 1 if the address cannot be accessed by - * a device and 0 if it can be. - */ -typedef int bus_dma_filter_t(void *, bus_addr_t); - -/* - * Allocate a device specific dma_tag encapsulating the constraints of - * the parent tag in addition to other restrictions specified: - * - * alignment: alignment for segments. - * boundary: Boundary that segments cannot cross. - * lowaddr: Low restricted address that cannot appear in a mapping. - * highaddr: High restricted address that cannot appear in a mapping. - * filtfunc: An optional function to further test if an address - * within the range of lowaddr and highaddr cannot appear - * in a mapping. - * filtfuncarg: An argument that will be passed to filtfunc in addition - * to the address to test. - * maxsize: Maximum mapping size supported by this tag. - * nsegments: Number of discontinuities allowed in maps. - * maxsegsz: Maximum size of a segment in the map. - * flags: Bus DMA flags. - * dmat: A pointer to set to a valid dma tag should the return - * value of this function indicate success. - */ -/* XXX Should probably allow specification of alignment */ -int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignemnt, - bus_size_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filtfunc, - void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat); - -int bus_dma_tag_destroy(bus_dma_tag_t dmat); - -/* - * Allocate a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); - -/* - * Destroy a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map); - -/* - * Allocate a piece of memory that can be efficiently mapped into - * bus device space based on the constraints lited in the dma tag. - * A dmamap to for use with dmamap_load is also allocated. - */ -int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, - bus_dmamap_t *mapp); - -/* - * Free a piece of memory and it's allociated dmamap, that was allocated - * via bus_dmamem_alloc. - */ -void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); - -/* - * A function that processes a successfully loaded dma map or an error - * from a delayed load map. - */ -typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); - -/* - * Map the buffer buf into bus space using the dmamap map. - */ -int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, - void *callback_arg, int flags); - -/* - * Perform a syncronization operation on the given map. - */ -void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -#define bus_dmamap_sync(dmat, dmamap, op) \ - if ((dmamap) != NULL) \ - _bus_dmamap_sync(dmat, dmamap, op) - -/* - * Release the mapping held by map. - */ -void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); -#define bus_dmamap_unload(dmat, dmamap) \ - if ((dmamap) != NULL) \ - _bus_dmamap_unload(dmat, dmamap) #endif /* _I386_BUS_H_ */ diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h index 6617612..2dc6ecb 100644 --- a/sys/i386/include/bus_at386.h +++ b/sys/i386/include/bus_at386.h @@ -69,8 +69,8 @@ */ /* $FreeBSD$ */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _I386_BUS_AT386_H_ +#define _I386_BUS_AT386_H_ #include <machine/cpufunc.h> @@ -1288,4 +1288,4 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) -#endif /* _I386_BUS_H_ */ +#endif /* _I386_BUS_AT386_H_ */ diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h index 6617612..2dc6ecb 100644 --- a/sys/i386/include/bus_dma.h +++ b/sys/i386/include/bus_dma.h @@ -69,8 +69,8 @@ */ /* $FreeBSD$ */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _I386_BUS_AT386_H_ +#define _I386_BUS_AT386_H_ #include <machine/cpufunc.h> @@ -1288,4 +1288,4 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) -#endif /* _I386_BUS_H_ */ +#endif /* _I386_BUS_AT386_H_ */ diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h index 6617612..5bfce17 100644 --- a/sys/i386/include/bus_pc98.h +++ b/sys/i386/include/bus_pc98.h @@ -69,17 +69,19 @@ */ /* $FreeBSD$ */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _I386_BUS_PC98_H_ +#define _I386_BUS_PC98_H_ +#include <sys/bus.h> #include <machine/cpufunc.h> /* * To remain compatible with NetBSD's interface, default to both memio and * pio when neither of them is defined. */ -#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_) +#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_PIO_IND_H_) && !defined(_I386_BUS_MEMIO_H_) #define _I386_BUS_PIO_H_ +#define _I386_BUS_PIO_IND_H_ #define _I386_BUS_MEMIO_H_ #endif @@ -88,6 +90,7 @@ */ #define I386_BUS_SPACE_IO 0 /* space is i/o space */ #define I386_BUS_SPACE_MEM 1 /* space is mem space */ +#define I386_BUS_SPACE_IO_IND 2 /* space is i/o space */ /* * Bus address and size types @@ -107,8 +110,25 @@ typedef u_int bus_size_t; /* * Access methods for bus resources and address space. */ +struct resource; + typedef int bus_space_tag_t; -typedef u_int bus_space_handle_t; +typedef struct { + bus_addr_t bsh_base; + bus_addr_t *bsh_iat; + size_t bsh_iatsz; + struct resource **bsh_res; + size_t bsh_ressz; +} bus_space_handle_t; + +/* + * Allocate discontinuous resources for ISA bus. + */ +struct resource * +isa_alloc_resourcev(device_t child, int type, int *rid, + bus_addr_t *res, bus_size_t count, u_int flags); +int +isa_load_resourcev(struct resource *re, bus_addr_t *res, bus_size_t count); /* * Map a region of device bus space into CPU virtual address space. @@ -151,7 +171,7 @@ int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size); -#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) /* * Read a 1, 2, 4, or 8 byte quantity from bus space @@ -170,47 +190,74 @@ static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, bus_size_t offset); static __inline u_int8_t -bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, +bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset) { -#if defined (_I386_BUS_PIO_H_) -#if defined (_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - return (inb(handle + offset)); + return (inb(bsh.bsh_base + offset)); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + return (inb(bsh.bsh_iat[offset])); #endif -#if defined (_I386_BUS_MEMIO_H_) - return (*(volatile u_int8_t *)(handle + offset)); +#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + else +#endif + return (*(volatile u_int8_t *)(bsh.bsh_base + offset)); #endif } static __inline u_int16_t -bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, +bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - return (inw(handle + offset)); + return (inw(bsh.bsh_base + offset)); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + return (inw(bsh.bsh_iat[offset])); #endif #if defined(_I386_BUS_MEMIO_H_) - return (*(volatile u_int16_t *)(handle + offset)); +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + else +#endif + return (*(volatile u_int16_t *)(bsh.bsh_base + offset)); #endif } static __inline u_int32_t -bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, +bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - return (inl(handle + offset)); + return (inl(bsh.bsh_base + offset)); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + return (inl(bsh.bsh_iat[offset])); #endif #if defined(_I386_BUS_MEMIO_H_) - return (*(volatile u_int32_t *)(handle + offset)); +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + else +#endif + return (*(volatile u_int32_t *)(bsh.bsh_base + offset)); #endif } @@ -242,14 +289,20 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - insb(bsh + offset, addr, count); + insb(bsh.bsh_base + offset, addr, count); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + insb(bsh.bsh_iat[offset], addr, count); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { __asm __volatile(" \n\ @@ -258,7 +311,7 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, stosb \n\ loop 1b" : "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "r" (bsh.bsh_base + offset), "0" (addr), "1" (count) : "%eax", "memory"); } #endif @@ -269,14 +322,20 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - insw(bsh + offset, addr, count); + insw(bsh.bsh_base + offset, addr, count); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + insw(bsh.bsh_iat[offset], addr, count); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { __asm __volatile(" \n\ @@ -285,7 +344,7 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, stosw \n\ loop 1b" : "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "r" (bsh.bsh_base + offset), "0" (addr), "1" (count) : "%eax", "memory"); } #endif @@ -296,14 +355,20 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - insl(bsh + offset, addr, count); + insl(bsh.bsh_base + offset, addr, count); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + insl(bsh.bsh_iat[offset], addr, count); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { __asm __volatile(" \n\ @@ -312,7 +377,7 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, stosl \n\ loop 1b" : "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "r" (bsh.bsh_base + offset), "0" (addr), "1" (count) : "%eax", "memory"); } #endif @@ -348,11 +413,11 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ 1: inb %w2,%%al \n\ @@ -364,12 +429,29 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + __asm __volatile(" \n\ + cld \n\ + 1: movl bsh.bsh_iat(%l2), %%edx \n\ + inb %%dx,%%al \n\ + stosb \n\ + incl %2 \n\ + loop 1b" : + "=D" (addr), "=c" (count), "=b" (offset) : + "0" (addr), "1" (count), "2" (offset) : + "%eax", "memory", "cc"); + } +#endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -386,11 +468,11 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ 1: inw %w2,%%ax \n\ @@ -402,12 +484,29 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + __asm __volatile(" \n\ + cld \n\ + 1: movl bsh.bsh_iat(%l2), %%edx \n\ + inw %%dx,%%ax \n\ + stosw \n\ + addl $2,%2 \n\ + loop 1b" : + "=D" (addr), "=c" (count), "=b" (offset) : + "0" (addr), "1" (count), "2" (offset) : + "%eax", "memory", "cc"); + } +#endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -424,11 +523,11 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ 1: inl %w2,%%eax \n\ @@ -440,12 +539,29 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + __asm __volatile(" \n\ + cld \n\ + 1: movl bsh.bsh_iat(%l2), %%edx \n\ + inl %%dx,%%eax \n\ + stosl \n\ + addl $4,%2 \n\ + loop 1b" : + "=D" (addr), "=c" (count), "=b" (offset) : + "0" (addr), "1" (count), "2" (offset) : + "%eax", "memory", "cc"); + } +#endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -483,16 +599,22 @@ bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - outb(bsh + offset, value); + outb(bsh.bsh_base + offset, value); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + outb(bsh.bsh_iat[offset], value); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif - *(volatile u_int8_t *)(bsh + offset) = value; + *(volatile u_int8_t *)(bsh.bsh_base + offset) = value; #endif } @@ -501,16 +623,22 @@ bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - outw(bsh + offset, value); + outw(bsh.bsh_base + offset, value); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + outw(bsh.bsh_iat[offset], value); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif - *(volatile u_int16_t *)(bsh + offset) = value; + *(volatile u_int16_t *)(bsh.bsh_base + offset) = value; #endif } @@ -519,16 +647,22 @@ bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - outl(bsh + offset, value); + outl(bsh.bsh_base + offset, value); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + outl(bsh.bsh_iat[offset], value); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif - *(volatile u_int32_t *)(bsh + offset) = value; + *(volatile u_int32_t *)(bsh.bsh_base + offset) = value; #endif } @@ -563,14 +697,20 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - outsb(bsh + offset, addr, count); + outsb(bsh.bsh_base + offset, addr, count); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + outsb(bsh.bsh_iat[offset], addr, count); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { __asm __volatile(" \n\ @@ -579,7 +719,7 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, movb %%al,(%2) \n\ loop 1b" : "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "r" (bsh.bsh_base + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); } #endif @@ -590,14 +730,20 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int16_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - outsw(bsh + offset, addr, count); + outsw(bsh.bsh_base + offset, addr, count); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + outsw(bsh.bsh_iat[offset], addr, count); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { __asm __volatile(" \n\ @@ -607,7 +753,7 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, movw %%ax,(%2) \n\ loop 1b" : "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "r" (bsh.bsh_base + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); } #endif @@ -618,14 +764,20 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int32_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif - outsl(bsh + offset, addr, count); + outsl(bsh.bsh_base + offset, addr, count); +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + outsl(bsh.bsh_iat[offset], addr, count); #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { __asm __volatile(" \n\ @@ -634,7 +786,7 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, movl %%eax,(%2) \n\ loop 1b" : "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "r" (bsh.bsh_base + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); } #endif @@ -671,11 +823,11 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -687,12 +839,29 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + __asm __volatile(" \n\ + cld \n\ + 1: lodsb \n\ + movl bsh.bsh_iat(%l0), %%edx \n\ + outb %%al,%%dx \n\ + incl %0 \n\ + loop 1b" : + "=b" (offset), "=S" (addr), "=c" (count) : + "0" (offset), "1" (addr), "2" (count) : + "%eax", "memory", "cc"); + } +#endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -709,11 +878,11 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int16_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -725,12 +894,29 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + __asm __volatile(" \n\ + cld \n\ + 1: lodsw \n\ + movl bsh.bsh_iat(%l0), %%edx \n\ + outw %%ax,%%dx \n\ + addl $2,%0 \n\ + loop 1b" : + "=b" (offset), "=S" (addr), "=c" (count) : + "0" (offset), "1" (addr), "2" (count) : + "%eax", "memory", "cc"); + } +#endif #if defined(_I386_BUS_MEMIO_H_) #if defined(_I386_BUS_PIO_H_) - else + if (tag == I386_BUS_SPACE_MEM) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -747,11 +933,11 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int32_t *addr, size_t count) { #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -763,12 +949,29 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + __asm __volatile(" \n\ + cld \n\ + 1: lodsl \n\ + movl bsh.bsh_iat(%l0), %%edx \n\ + outl %%eax,%%dx \n\ + addl $4,%0 \n\ + loop 1b" : + "=b" (offset), "=S" (addr), "=c" (count) : + "0" (offset), "1" (addr), "2" (count) : + "%eax", "memory", "cc"); + } +#endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh.bsh_base + offset; \ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -807,21 +1010,35 @@ static __inline void bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value, size_t count) { - bus_addr_t addr = bsh + offset; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; + while (count--) + outb(addr, value); + } +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + bus_addr_t addr = bsh.bsh_iat[offset]; while (count--) outb(addr, value); + } #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; while (count--) *(volatile u_int8_t *)(addr) = value; + } #endif } @@ -829,21 +1046,35 @@ static __inline void bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value, size_t count) { - bus_addr_t addr = bsh + offset; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; while (count--) outw(addr, value); + } +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + bus_addr_t addr = bsh.bsh_iat[offset]; + while (count--) + outw(addr, value); + } #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; while (count--) *(volatile u_int16_t *)(addr) = value; + } #endif } @@ -851,21 +1082,35 @@ static __inline void bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value, size_t count) { - bus_addr_t addr = bsh + offset; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; while (count--) outl(addr, value); + } +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + bus_addr_t addr = bsh.bsh_iat[offset]; + while (count--) + outl(addr, value); + } #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; while (count--) *(volatile u_int32_t *)(addr) = value; + } #endif } @@ -895,21 +1140,34 @@ static __inline void bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value, size_t count) { - bus_addr_t addr = bsh + offset; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; for (; count != 0; count--, addr++) outb(addr, value); + } +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + for (; count != 0; count--, offset++) + outb(bsh.bsh_iat[offset], value); + } #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; for (; count != 0; count--, addr++) *(volatile u_int8_t *)(addr) = value; + } #endif } @@ -917,21 +1175,34 @@ static __inline void bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value, size_t count) { - bus_addr_t addr = bsh + offset; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; for (; count != 0; count--, addr += 2) outw(addr, value); + } +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + for (; count != 0; count--, offset += 2) + outw(bsh.bsh_iat[offset], value); + } #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; for (; count != 0; count--, addr += 2) *(volatile u_int16_t *)(addr) = value; + } #endif } @@ -939,21 +1210,34 @@ static __inline void bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value, size_t count) { - bus_addr_t addr = bsh + offset; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; for (; count != 0; count--, addr += 4) outl(addr, value); + } +#endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + for (; count != 0; count--, offset += 4) + outl(bsh.bsh_iat[offset], value); + } #endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif + { + bus_addr_t addr = bsh.bsh_base + offset; for (; count != 0; count--, addr += 4) *(volatile u_int32_t *)(addr) = value; + } #endif } @@ -989,14 +1273,13 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { + bus_addr_t addr1 = bsh1.bsh_base + off1; + bus_addr_t addr2 = bsh2.bsh_base + off2; if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -1004,16 +1287,37 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, } else { /* dest after src: copy backwards */ for (addr1 += (count - 1), addr2 += (count - 1); - count != 0; count--, addr1--, addr2--) + count != 0; count--, addr1--, addr2--) outb(addr2, inb(addr1)); } } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + if (bsh1.bsh_iat[off1] >= bsh2.bsh_iat[off2]) { + /* src after dest: copy forward */ + for (; count != 0; count--, off1++, off2++) + outb(bsh2.bsh_iat[off2], + inb(bsh1.bsh_iat[off1])); + } else { + /* dest after src: copy backwards */ + for (off1 += (count - 1), off2 += (count - 1); + count != 0; count--, off1--, off2--) + outb(bsh2.bsh_iat[off2], + inb(bsh1.bsh_iat[off1])); + } + } +#endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { + bus_addr_t addr1 = bsh1.bsh_base + off1; + bus_addr_t addr2 = bsh2.bsh_base + off2; if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -1022,7 +1326,7 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, } else { /* dest after src: copy backwards */ for (addr1 += (count - 1), addr2 += (count - 1); - count != 0; count--, addr1--, addr2--) + count != 0; count--, addr1--, addr2--) *(volatile u_int8_t *)(addr2) = *(volatile u_int8_t *)(addr1); } @@ -1035,14 +1339,13 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { + bus_addr_t addr1 = bsh1.bsh_base + off1; + bus_addr_t addr2 = bsh2.bsh_base + off2; if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -1050,16 +1353,37 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, } else { /* dest after src: copy backwards */ for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1); - count != 0; count--, addr1 -= 2, addr2 -= 2) + count != 0; count--, addr1 -= 2, addr2 -= 2) outw(addr2, inw(addr1)); } } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + if (bsh1.bsh_iat[off1] >= bsh2.bsh_iat[off2]) { + /* src after dest: copy forward */ + for (; count != 0; count--, off1 += 2, off2 += 2) + outw(bsh2.bsh_iat[off2], + inw(bsh1.bsh_iat[off1])); + } else { + /* dest after src: copy backwards */ + for (off1 += 2 * (count - 1), off2 += 2 * (count - 1); + count != 0; count--, off1 -= 2, off2 -= 2) + outw(bsh2.bsh_iat[off2], + inw(bsh1.bsh_iat[off1])); + } + } +#endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { + bus_addr_t addr1 = bsh1.bsh_base + off1; + bus_addr_t addr2 = bsh2.bsh_base + off2; if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -1068,7 +1392,7 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, } else { /* dest after src: copy backwards */ for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1); - count != 0; count--, addr1 -= 2, addr2 -= 2) + count != 0; count--, addr1 -= 2, addr2 -= 2) *(volatile u_int16_t *)(addr2) = *(volatile u_int16_t *)(addr1); } @@ -1081,14 +1405,13 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; - #if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) +#if defined(_I386_BUS_PIO_IND_H_) || defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) #endif { + bus_addr_t addr1 = bsh1.bsh_base + off1; + bus_addr_t addr2 = bsh2.bsh_base + off2; if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) @@ -1101,11 +1424,32 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, } } #endif +#if defined(_I386_BUS_PIO_IND_H_) +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO_IND) +#endif + { + if (bsh1.bsh_iat[off1] >= bsh2.bsh_iat[off2]) { + /* src after dest: copy forward */ + for (; count != 0; count--, off1 += 4, off2 += 4) + outl(bsh2.bsh_iat[off2], + inl(bsh1.bsh_iat[off1])); + } else { + /* dest after src: copy backwards */ + for (off1 += 4 * (count - 1), off2 += 4 * (count - 1); + count != 0; count--, off1 -= 4, off2 -= 4) + outl(bsh2.bsh_iat[off2], + inl(bsh1.bsh_iat[off1])); + } + } +#endif #if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else +#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_PIO_IND_H_) + if (tag == I386_BUS_SPACE_MEM) #endif { + bus_addr_t addr1 = bsh1.bsh_base + off1; + bus_addr_t addr2 = bsh2.bsh_base + off2; if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) @@ -1288,4 +1632,4 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) -#endif /* _I386_BUS_H_ */ +#endif /* _I386_BUS_PC98_H_ */ diff --git a/sys/i386/include/bus_pio_ind.h b/sys/i386/include/bus_pio_ind.h new file mode 100644 index 0000000..c4d7169 --- /dev/null +++ b/sys/i386/include/bus_pio_ind.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 1997 Justin Gibbs. + * All rights reserved. + * + * 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, + * without modification, immediately at the beginning of the file. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 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. + * + * $FreeBSD$ + */ + +#ifndef _I386_BUS_PIO_IND_H_ +#define _I386_BUS_PIO_IND_H_ +#endif /* _I386_BUS_PIO_IND_H_ */ diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 5e9e69a..e9e8203 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -62,6 +62,7 @@ #include <sys/bus.h> #include <sys/malloc.h> #include <machine/bus.h> +#include <sys/rman.h> #include <machine/resource.h> @@ -132,12 +133,113 @@ isa_alloc_resource(device_t bus, device_t child, int type, int *rid, start, end, count, flags); } +#ifdef PC98 +/* + * Indirection support. The type of bus_space_handle_t is + * defined in sys/i386/include/bus_pc98.h. + */ +struct resource * +isa_alloc_resourcev(device_t child, int type, int *rid, + bus_addr_t *res, bus_size_t count, u_int flags) +{ + struct isa_device* idev = DEVTOISA(child); + struct resource_list *rl = &idev->id_resources; + + device_t bus = device_get_parent(child); + bus_addr_t ioport; + struct resource *re; + struct resource **bsre; + int i, j, k, linear_cnt, ressz, bsrid; + + ioport = bus_get_resource_start(child, SYS_RES_IOPORT, 0); + + linear_cnt = count; + ressz = 1; + for (i = 1; i < count; ++i) { + if (res[i] > res[i - 1] + 1) { + if (i < linear_cnt) + linear_cnt = i; + ++ressz; + } + } + + re = isa_alloc_resource(bus, child, type, rid, ioport + res[0], + ioport + res[linear_cnt - 1], linear_cnt, flags); + if (re == NULL) + return NULL; + + bsre = malloc(sizeof (struct resource *) * ressz, M_DEVBUF, M_NOWAIT); + if (bsre == NULL) { + resource_list_release(rl, bus, child, type, *rid, re); + return NULL; + } + bsre[0] = re; + + for (i = linear_cnt, k = 1; i < count; i = j, k++) { + for (j = i + 1; j < count; j++) { + if (res[j] > res[j - 1] + 1) + break; + } + bsrid = *rid + k; + bsre[k] = isa_alloc_resource(bus, child, type, &bsrid, + ioport + res[i], ioport + res[j - 1], j - i, flags); + if (bsre[k] == NULL) { + for (k--; k >= 0; k--) + resource_list_release(rl, bus, child, type, + *rid + k, bsre[k]); + free(bsre, M_DEVBUF); + return NULL; + } + } + + re->r_bushandle.bsh_res = bsre; + re->r_bushandle.bsh_ressz = ressz; + + return re; +} + +int +isa_load_resourcev(struct resource *re, bus_addr_t *res, bus_size_t count) +{ + bus_addr_t *addr; + int i; + + addr = malloc(sizeof (bus_addr_t) * count, M_DEVBUF, M_NOWAIT); + if (addr == NULL) + return 1; + + for (i = 0; i < count; i++) + addr[i] = rman_get_start(re) + res[i]; + + rman_set_bustag(re, I386_BUS_SPACE_IO_IND); + re->r_bushandle.bsh_iat = addr; + re->r_bushandle.bsh_iatsz = count; + + return 0; +} +#endif /* PC98 */ + int isa_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { struct isa_device* idev = DEVTOISA(child); struct resource_list *rl = &idev->id_resources; +#ifdef PC98 + /* + * Indirection support. The type of bus_space_handle_t is + * defined in sys/i386/include/bus_pc98.h. + */ + int i; + + for (i = 1; i < r->r_bushandle.bsh_ressz; i++) + resource_list_release(rl, bus, child, type, rid + i, + r->r_bushandle.bsh_res[i]); + if (r->r_bushandle.bsh_res != NULL) + free(r->r_bushandle.bsh_res, M_DEVBUF); + if (r->r_bushandle.bsh_iat != NULL) + free(r->r_bushandle.bsh_iat, M_DEVBUF); +#endif return resource_list_release(rl, bus, child, type, rid, r); } diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h index 6617612..2dc6ecb 100644 --- a/sys/sys/bus_dma.h +++ b/sys/sys/bus_dma.h @@ -69,8 +69,8 @@ */ /* $FreeBSD$ */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _I386_BUS_AT386_H_ +#define _I386_BUS_AT386_H_ #include <machine/cpufunc.h> @@ -1288,4 +1288,4 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) -#endif /* _I386_BUS_H_ */ +#endif /* _I386_BUS_AT386_H_ */ |
