diff options
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/aim/ofw_machdep.c | 5 | ||||
| -rw-r--r-- | sys/powerpc/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/powerpc/include/_bus.h | 2 | ||||
| -rw-r--r-- | sys/powerpc/include/bus.h | 970 | ||||
| -rw-r--r-- | sys/powerpc/powermac/grackle.c | 7 | ||||
| -rw-r--r-- | sys/powerpc/powermac/macio.c | 6 | ||||
| -rw-r--r-- | sys/powerpc/powermac/uninorth.c | 8 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/bus_machdep.c | 788 | ||||
| -rw-r--r-- | sys/powerpc/psim/iobus.c | 9 |
9 files changed, 1146 insertions, 651 deletions
diff --git a/sys/powerpc/aim/ofw_machdep.c b/sys/powerpc/aim/ofw_machdep.c index d63236f..1f40c92 100644 --- a/sys/powerpc/aim/ofw_machdep.c +++ b/sys/powerpc/aim/ofw_machdep.c @@ -415,10 +415,7 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag, OF_get_addr_props(bridge, &naddr, &nsize, &pci); } - /* Default to memory mapped I/O. */ - *tag = PPC_BUS_SPACE_MEM; - if (spc == OFW_PCI_PHYS_HI_SPACE_IO) - *tag = PPC_BUS_SPACE_IO; + *tag = &bs_le_tag; return (bus_space_map(*tag, addr, size, 0, handle)); } diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES index e25528a..e2f1c6b 100644 --- a/sys/powerpc/conf/NOTES +++ b/sys/powerpc/conf/NOTES @@ -47,6 +47,8 @@ nodevice snake_saver # isa nodevice pcii nodevice tnt4882 +# sound +nodevice snd_cmi # wants gdb_cur nodevice dcons nodevice dcons_crom diff --git a/sys/powerpc/include/_bus.h b/sys/powerpc/include/_bus.h index 5561ce7..2ede04a 100644 --- a/sys/powerpc/include/_bus.h +++ b/sys/powerpc/include/_bus.h @@ -40,7 +40,7 @@ typedef u_int32_t bus_size_t; /* * Access methods for bus resources and address space. */ -typedef u_int32_t bus_space_tag_t; +typedef struct bus_space *bus_space_tag_t; typedef u_int32_t bus_space_handle_t; #endif /* POWERPC_INCLUDE__BUS_H */ diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h index 7460d13..dbefcf4 100644 --- a/sys/powerpc/include/bus.h +++ b/sys/powerpc/include/bus.h @@ -1,5 +1,7 @@ +/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */ + /*- - * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. + * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -65,677 +67,395 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $NetBSD: bus.h,v 1.9.4.1 2000/06/30 16:27:30 simonb Exp $ * $FreeBSD$ */ -#ifndef _MACPPC_BUS_H_ -#define _MACPPC_BUS_H_ +#ifndef _MACHINE_BUS_H_ +#define _MACHINE_BUS_H_ #include <machine/_bus.h> -#include <machine/pio.h> - -#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF -#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE 0xFFFFFFFF -#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF -#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXADDR 0xFFFFFFFF - -#define BUS_SPACE_UNRESTRICTED (~0) - -/* - * Values for the macppc bus space tag, not to be used directly by MI code. - */ -#define __BUS_SPACE_HAS_STREAM_METHODS 1 +#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) -/* - * Define the PPC tag values - */ -#define PPC_BUS_SPACE_MEM 1 /* space is mem space */ -#define PPC_BUS_SPACE_IO 2 /* space is io space */ - -static __inline void * -__ppc_ba(bus_space_tag_t tag __unused, bus_space_handle_t handle, - bus_size_t offset) -{ - return ((void *)(handle + offset)); -} +#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF +#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF +#define BUS_SPACE_MAXADDR 0xFFFFFFFF +#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF +#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF +#define BUS_SPACE_MAXSIZE 0xFFFFFFFF + +#define BUS_SPACE_MAP_CACHEABLE 0x01 +#define BUS_SPACE_MAP_LINEAR 0x02 +#define BUS_SPACE_MAP_PREFETCHABLE 0x04 + +#define BUS_SPACE_UNRESTRICTED (~0) + +#define BUS_SPACE_BARRIER_READ 0x01 +#define BUS_SPACE_BARRIER_WRITE 0x02 + +struct bus_space_access; + +struct bus_space { + /* mapping/unmapping */ + int (*bs_map)(bus_addr_t, bus_size_t, int, + bus_space_handle_t *); + void (*bs_unmap)(bus_size_t); + int (*bs_subregion)(bus_space_handle_t, bus_size_t, + bus_size_t, bus_space_handle_t *); + + /* allocation/deallocation */ + int (*bs_alloc)(bus_addr_t, bus_addr_t, bus_size_t, + bus_size_t, bus_size_t, int, bus_addr_t *, bus_space_handle_t *); + void (*bs_free)(bus_space_handle_t, bus_size_t); + + void (*bs_barrier)(bus_space_handle_t, bus_size_t, + bus_size_t, int); + + /* Read single. */ + uint8_t (*bs_r_1)(bus_space_handle_t, bus_size_t); + uint16_t (*bs_r_2)(bus_space_handle_t, bus_size_t); + uint32_t (*bs_r_4)(bus_space_handle_t, bus_size_t); + uint64_t (*bs_r_8)(bus_space_handle_t, bus_size_t); + + uint16_t (*bs_r_s_2)(bus_space_handle_t, bus_size_t); + uint32_t (*bs_r_s_4)(bus_space_handle_t, bus_size_t); + uint64_t (*bs_r_s_8)(bus_space_handle_t, bus_size_t); + + /* read multiple */ + void (*bs_rm_1)(bus_space_handle_t, bus_size_t, uint8_t *, + bus_size_t); + void (*bs_rm_2)(bus_space_handle_t, bus_size_t, uint16_t *, + bus_size_t); + void (*bs_rm_4)(bus_space_handle_t, bus_size_t, uint32_t *, + bus_size_t); + void (*bs_rm_8)(bus_space_handle_t, bus_size_t, uint64_t *, + bus_size_t); + + void (*bs_rm_s_2)(bus_space_handle_t, bus_size_t, uint16_t *, + bus_size_t); + void (*bs_rm_s_4)(bus_space_handle_t, bus_size_t, uint32_t *, + bus_size_t); + void (*bs_rm_s_8)(bus_space_handle_t, bus_size_t, uint64_t *, + bus_size_t); + + /* read region */ + void (*bs_rr_1)(bus_space_handle_t, bus_size_t, uint8_t *, + bus_size_t); + void (*bs_rr_2)(bus_space_handle_t, bus_size_t, uint16_t *, + bus_size_t); + void (*bs_rr_4)(bus_space_handle_t, bus_size_t, uint32_t *, + bus_size_t); + void (*bs_rr_8)(bus_space_handle_t, bus_size_t, uint64_t *, + bus_size_t); + + void (*bs_rr_s_2)(bus_space_handle_t, bus_size_t, uint16_t *, + bus_size_t); + void (*bs_rr_s_4)(bus_space_handle_t, bus_size_t, uint32_t *, + bus_size_t); + void (*bs_rr_s_8)(bus_space_handle_t, bus_size_t, uint64_t *, + bus_size_t); + + /* write */ + void (*bs_w_1)(bus_space_handle_t, bus_size_t, uint8_t); + void (*bs_w_2)(bus_space_handle_t, bus_size_t, uint16_t); + void (*bs_w_4)(bus_space_handle_t, bus_size_t, uint32_t); + void (*bs_w_8)(bus_space_handle_t, bus_size_t, uint64_t); + + void (*bs_w_s_2)(bus_space_handle_t, bus_size_t, uint16_t); + void (*bs_w_s_4)(bus_space_handle_t, bus_size_t, uint32_t); + void (*bs_w_s_8)(bus_space_handle_t, bus_size_t, uint64_t); + + /* write multiple */ + void (*bs_wm_1)(bus_space_handle_t, bus_size_t, + const uint8_t *, bus_size_t); + void (*bs_wm_2)(bus_space_handle_t, bus_size_t, + const uint16_t *, bus_size_t); + void (*bs_wm_4)(bus_space_handle_t, bus_size_t, + const uint32_t *, bus_size_t); + void (*bs_wm_8)(bus_space_handle_t, bus_size_t, + const uint64_t *, bus_size_t); + + void (*bs_wm_s_2)(bus_space_handle_t, bus_size_t, + const uint16_t *, bus_size_t); + void (*bs_wm_s_4)(bus_space_handle_t, bus_size_t, + const uint32_t *, bus_size_t); + void (*bs_wm_s_8)(bus_space_handle_t, bus_size_t, + const uint64_t *, bus_size_t); + + /* write region */ + void (*bs_wr_1)(bus_space_handle_t, bus_size_t, + const uint8_t *, bus_size_t); + void (*bs_wr_2)(bus_space_handle_t, bus_size_t, + const uint16_t *, bus_size_t); + void (*bs_wr_4)(bus_space_handle_t, bus_size_t, + const uint32_t *, bus_size_t); + void (*bs_wr_8)(bus_space_handle_t, bus_size_t, + const uint64_t *, bus_size_t); + + void (*bs_wr_s_2)(bus_space_handle_t, bus_size_t, + const uint16_t *, bus_size_t); + void (*bs_wr_s_4)(bus_space_handle_t, bus_size_t, + const uint32_t *, bus_size_t); + void (*bs_wr_s_8)(bus_space_handle_t, bus_size_t, + const uint64_t *, bus_size_t); + + /* set multiple */ + void (*bs_sm_1)(bus_space_handle_t, bus_size_t, uint8_t, + bus_size_t); + void (*bs_sm_2)(bus_space_handle_t, bus_size_t, uint16_t, + bus_size_t); + void (*bs_sm_4)(bus_space_handle_t, bus_size_t, uint32_t, + bus_size_t); + void (*bs_sm_8)(bus_space_handle_t, bus_size_t, uint64_t, + bus_size_t); + + void (*bs_sm_s_2)(bus_space_handle_t, bus_size_t, uint16_t, + bus_size_t); + void (*bs_sm_s_4)(bus_space_handle_t, bus_size_t, uint32_t, + bus_size_t); + void (*bs_sm_s_8)(bus_space_handle_t, bus_size_t, uint64_t, + bus_size_t); + + /* set region */ + void (*bs_sr_1)(bus_space_handle_t, bus_size_t, uint8_t, + bus_size_t); + void (*bs_sr_2)(bus_space_handle_t, bus_size_t, uint16_t, + bus_size_t); + void (*bs_sr_4)(bus_space_handle_t, bus_size_t, uint32_t, + bus_size_t); + void (*bs_sr_8)(bus_space_handle_t, bus_size_t, uint64_t, + bus_size_t); + + void (*bs_sr_s_2)(bus_space_handle_t, bus_size_t, uint16_t, + bus_size_t); + void (*bs_sr_s_4)(bus_space_handle_t, bus_size_t, uint32_t, + bus_size_t); + void (*bs_sr_s_8)(bus_space_handle_t, bus_size_t, uint64_t, + bus_size_t); + + /* copy region */ + void (*bs_cr_1)(bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_cr_2)(bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_cr_4)(bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_cr_8)(bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + + void (*bs_cr_s_2)(bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_cr_s_4)(bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_cr_s_8)(bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); +}; + +extern struct bus_space bs_be_tag; +extern struct bus_space bs_le_tag; + +#define __bs_c(a,b) __CONCAT(a,b) +#define __bs_opname(op,size) __bs_c(__bs_c(__bs_c(bs_,op),_),size) + +#define __bs_rs(sz, t, h, o) \ + (*(t)->__bs_opname(r,sz))(h, o) +#define __bs_ws(sz, t, h, o, v) \ + (*(t)->__bs_opname(w,sz))(h, o, v) +#define __bs_nonsingle(type, sz, t, h, o, a, c) \ + (*(t)->__bs_opname(type,sz))(h, o, a, c) +#define __bs_set(type, sz, t, h, o, v, c) \ + (*(t)->__bs_opname(type,sz))(h, o, v, c) +#define __bs_copy(sz, t, h1, o1, h2, o2, cnt) \ + (*(t)->__bs_opname(c,sz))(h1, o1, h2, o2, cnt) /* - * int bus_space_map(bus_space_tag_t t, bus_addr_t addr, - * bus_size_t size, int flags, bus_space_handle_t *bshp)); - * - * Map a region of bus space. + * Mapping and unmapping operations. */ - -static __inline int -bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr, - bus_size_t size __unused, int flags __unused, - bus_space_handle_t *bshp) -{ - - *bshp = addr; - return (0); -} +#define bus_space_map(t, a, s, c, hp) (*(t)->bs_map)(a, s, c, hp) +#define bus_space_unmap(t, h, s) (*(t)->bs_unmap)(h, s) +#define bus_space_subregion(t, h, o, s, hp) (*(t)->bs_subregion)(h, o, s, hp) /* - * int bus_space_unmap(bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); - * - * Unmap a region of bus space. + * Allocation and deallocation operations. */ - -static __inline void -bus_space_unmap(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, - bus_size_t size __unused) -{ -} +#define bus_space_alloc(t, rs, re, s, a, b, c, ap, hp) \ + (*(t)->bs_alloc)(rs, re, s, a, b, c, ap, hp) +#define bus_space_free(t, h, s) \ + (*(t)->bs_free)(h, s) /* - * 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)); - * - * Get a new handle for a subregion of an already-mapped area of bus space. + * Bus barrier operations. */ - -static __inline int -bus_space_subregion(bus_space_tag_t t __unused, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size __unused, bus_space_handle_t *nbshp) -{ - *nbshp = bsh + offset; - return (0); -} +#define bus_space_barrier(t, h, o, l, f) (*(t)->bs_barrier)(h, o, l, f) /* - * 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)); - * - * Allocate a region of bus space. + * Bus read (single) operations. */ +#define bus_space_read_1(t, h, o) __bs_rs(1,t,h,o) +#define bus_space_read_2(t, h, o) __bs_rs(2,t,h,o) +#define bus_space_read_4(t, h, o) __bs_rs(4,t,h,o) +#define bus_space_read_8(t, h, o) __bs_rs(8,t,h,o) -#if 0 -#define bus_space_alloc(t, rs, re, s, a, b, f, ap, hp) !!! unimplemented !!! -#endif - -/* - * int bus_space_free(bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); - * - * Free a region of bus space. - */ -#if 0 -#define bus_space_free(t, h, s) !!! unimplemented !!! -#endif +#define bus_space_read_stream_1 bus_space_read_1 +#define bus_space_read_stream_2(t, h, o) __bs_rs(s_2,t,h,o) +#define bus_space_read_stream_4(t, h, o) __bs_rs(s_4,t,h,o) +#define bus_space_read_stream_8(t, h, o) __bs_rs(s_8,t,h,o) /* - * u_intN_t bus_space_read_N(bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); - * - * Read a 1, 2, 4, or 8 byte quantity from bus space - * described by tag/handle/offset. + * Bus read multiple operations. */ - -static __inline u_int8_t -bus_space_read_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) -{ - return (in8(__ppc_ba(t, h, o))); -} - -static __inline u_int16_t -bus_space_read_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) -{ - return (in16rb(__ppc_ba(t, h, o))); -} - -static __inline u_int32_t -bus_space_read_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) -{ - return (in32rb(__ppc_ba(t, h, o))); -} - -#if 0 /* Cause a link error for bus_space_read_8 */ -#define bus_space_read_8(t, h, o) !!! unimplemented !!! -#endif - -static __inline u_int8_t -bus_space_read_stream_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) -{ - return (in8(__ppc_ba(t, h, o))); -} - -static __inline u_int16_t -bus_space_read_stream_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) -{ - return (in16(__ppc_ba(t, h, o))); -} - -static __inline u_int32_t -bus_space_read_stream_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o) -{ - return (in32(__ppc_ba(t, h, o))); -} - -#if 0 /* Cause a link error for bus_space_read_stream_8 */ -#define bus_space_read_stream_8(t, h, o) !!! unimplemented !!! -#endif +#define bus_space_read_multi_1(t, h, o, a, c) \ + __bs_nonsingle(rm,1,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_2(t, h, o, a, c) \ + __bs_nonsingle(rm,2,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_4(t, h, o, a, c) \ + __bs_nonsingle(rm,4,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_8(t, h, o, a, c) \ + __bs_nonsingle(rm,8,(t),(h),(o),(a),(c)) + +#define bus_space_read_multi_stream_1 bus_space_read_multi_1 +#define bus_space_read_multi_stream_2(t, h, o, a, c) \ + __bs_nonsingle(rm,s_2,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_4(t, h, o, a, c) \ + __bs_nonsingle(rm,s_4,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_8(t, h, o, a, c) \ + __bs_nonsingle(rm,s_8,(t),(h),(o),(a),(c)) /* - * void bus_space_read_multi_N(bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); - * - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle/offset and copy into buffer provided. + * Bus read region operations. */ - -static __inline void -bus_space_read_multi_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - u_int8_t *a, size_t c) -{ - ins8(__ppc_ba(t, h, o), a, c); -} - -static __inline void -bus_space_read_multi_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - u_int16_t *a, size_t c) -{ - ins16rb(__ppc_ba(t, h, o), a, c); -} - -static __inline void -bus_space_read_multi_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - u_int32_t *a, size_t c) -{ - ins32rb(__ppc_ba(t, h, o), a, c); -} - -#if 0 /* Cause a link error for bus_space_read_multi_8 */ -#define bus_space_read_multi_8 !!! unimplemented !!! -#endif - -static __inline void -bus_space_read_multi_stream_1(bus_space_tag_t t, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, size_t c) -{ - ins8(__ppc_ba(t, h, o), a, c); -} - -static __inline void -bus_space_read_multi_stream_2(bus_space_tag_t t, bus_space_handle_t h, - bus_size_t o, u_int16_t *a, size_t c) -{ - ins16(__ppc_ba(t, h, o), a, c); -} - -static __inline void -bus_space_read_multi_stream_4(bus_space_tag_t t, bus_space_handle_t h, - bus_size_t o, u_int32_t *a, size_t c) -{ - ins32(__ppc_ba(t, h, o), a, c); -} - -#if 0 /* Cause a link error for bus_space_read_multi_stream_8 */ -#define bus_space_read_multi_stream_8 !!! unimplemented !!! -#endif +#define bus_space_read_region_1(t, h, o, a, c) \ + __bs_nonsingle(rr,1,(t),(h),(o),(a),(c)) +#define bus_space_read_region_2(t, h, o, a, c) \ + __bs_nonsingle(rr,2,(t),(h),(o),(a),(c)) +#define bus_space_read_region_4(t, h, o, a, c) \ + __bs_nonsingle(rr,4,(t),(h),(o),(a),(c)) +#define bus_space_read_region_8(t, h, o, a, c) \ + __bs_nonsingle(rr,8,(t),(h),(o),(a),(c)) + +#define bus_space_read_region_stream_1 bus_space_read_region_1 +#define bus_space_read_region_stream_2(t, h, o, a, c) \ + __bs_nonsingle(rr,s_2,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_4(t, h, o, a, c) \ + __bs_nonsingle(rr,s_4,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_8(t, h, o, a, c) \ + __bs_nonsingle(rr,s_8,(t),(h),(o),(a),(c)) /* - * void bus_space_read_region_N(bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); - * - * 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. + * Bus write (single) operations. */ +#define bus_space_write_1(t, h, o, v) __bs_ws(1,(t),(h),(o),(v)) +#define bus_space_write_2(t, h, o, v) __bs_ws(2,(t),(h),(o),(v)) +#define bus_space_write_4(t, h, o, v) __bs_ws(4,(t),(h),(o),(v)) +#define bus_space_write_8(t, h, o, v) __bs_ws(8,(t),(h),(o),(v)) -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) -{ - volatile u_int8_t *s = __ppc_ba(tag, bsh, offset); - - while (count--) - *addr++ = *s++; - __asm __volatile("eieio; sync"); -} - -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) -{ - volatile u_int16_t *s = __ppc_ba(tag, bsh, offset); - - while (count--) - __asm __volatile("lhbrx %0, 0, %1" : - "=r"(*addr++) : "r"(s++)); - __asm __volatile("eieio; sync"); -} - -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) -{ - volatile u_int32_t *s = __ppc_ba(tag, bsh, offset); - - while (count--) - __asm __volatile("lwbrx %0, 0, %1" : - "=r"(*addr++) : "r"(s++)); - __asm __volatile("eieio; sync"); -} - -#if 0 /* Cause a link error for bus_space_read_region_8 */ -#define bus_space_read_region_8 !!! unimplemented !!! -#endif - -static __inline void -bus_space_read_region_stream_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, size_t count) -{ - volatile u_int16_t *s = __ppc_ba(tag, bsh, offset); - - while (count--) - *addr++ = *s++; - __asm __volatile("eieio; sync"); -} - -static __inline void -bus_space_read_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) -{ - volatile u_int32_t *s = __ppc_ba(tag, bsh, offset); - - while (count--) - *addr++ = *s++; - __asm __volatile("eieio; sync"); -} - -#if 0 /* Cause a link error */ -#define bus_space_read_region_stream_8 !!! unimplemented !!! -#endif +#define bus_space_write_stream_1 bus_space_write_1 +#define bus_space_write_stream_2(t, h, o, v) __bs_ws(s_2,(t),(h),(o),(v)) +#define bus_space_write_stream_4(t, h, o, v) __bs_ws(s_4,(t),(h),(o),(v)) +#define bus_space_write_stream_8(t, h, o, v) __bs_ws(s_8,(t),(h),(o),(v)) /* - * void bus_space_write_N(bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); - * - * Write the 1, 2, 4, or 8 byte value `value' to bus space - * described by tag/handle/offset. + * Bus write multiple operations. */ - -static __inline void -bus_space_write_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint8_t v) -{ - out8(__ppc_ba(t, h, o), v); -} - -static __inline void -bus_space_write_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint16_t v) -{ - out16rb(__ppc_ba(t, h, o), v); -} - -static __inline void -bus_space_write_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint32_t v) -{ - out32rb(__ppc_ba(t, h, o), v); -} - -#if 0 /* Cause a link error for bus_space_write_8 */ -#define bus_space_write_8 !!! unimplemented !!! -#endif - -static __inline void -bus_space_write_stream_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint8_t v) -{ - out8(__ppc_ba(t, h, o), v); -} - -static __inline void -bus_space_write_stream_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint16_t v) -{ - out16(__ppc_ba(t, h, o), v); -} - -static __inline void -bus_space_write_stream_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint32_t v) -{ - out32(__ppc_ba(t, h, o), v); -} - -#if 0 /* Cause a link error for bus_space_write_stream_8 */ -#define bus_space_write_stream_8 !!! unimplemented !!! -#endif - +#define bus_space_write_multi_1(t, h, o, a, c) \ + __bs_nonsingle(wm,1,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_2(t, h, o, a, c) \ + __bs_nonsingle(wm,2,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_4(t, h, o, a, c) \ + __bs_nonsingle(wm,4,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_8(t, h, o, a, c) \ + __bs_nonsingle(wm,8,(t),(h),(o),(a),(c)) + +#define bus_space_write_multi_stream_1 bus_space_write_multi_1 +#define bus_space_write_multi_stream_2(t, h, o, a, c) \ + __bs_nonsingle(wm,s_2,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_4(t, h, o, a, c) \ + __bs_nonsingle(wm,s_4,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_8(t, h, o, a, c) \ + __bs_nonsingle(wm,s_8,(t),(h),(o),(a),(c)) /* - * void bus_space_write_multi_N(bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); - * - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer - * provided to bus space described by tag/handle/offset. + * Bus write region operations. */ - -static __inline void -bus_space_write_multi_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint8_t *a, size_t c) -{ - outsb(__ppc_ba(t, h, o), a, c); -} - -static __inline void -bus_space_write_multi_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint16_t *a, size_t c) -{ - outsw(__ppc_ba(t, h, o), a, c); -} - -static __inline void -bus_space_write_multi_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, - uint32_t *a, size_t c) -{ - outsl(__ppc_ba(t, h, o), a, c); -} - -#if 0 -#define bus_space_write_multi_8 !!! unimplemented !!! -#endif - -static __inline void -bus_space_write_multi_stream_1(bus_space_tag_t t, bus_space_handle_t h, - bus_size_t o, const u_int8_t *a, size_t c) -{ - outsb(__ppc_ba(t, h, o), a, c); -} - -static __inline void -bus_space_write_multi_stream_2(bus_space_tag_t t, bus_space_handle_t h, - bus_size_t o, const u_int16_t *a, size_t c) -{ - outsw(__ppc_ba(t, h, o), a, c); -} - -static __inline void -bus_space_write_multi_stream_4(bus_space_tag_t t, bus_space_handle_t h, - bus_size_t o, const u_int32_t *a, size_t c) -{ - outsl(__ppc_ba(t, h, o), a, c); -} - -#if 0 -#define bus_space_write_multi_stream_8 !!! unimplemented !!! -#endif +#define bus_space_write_region_1(t, h, o, a, c) \ + __bs_nonsingle(wr,1,(t),(h),(o),(a),(c)) +#define bus_space_write_region_2(t, h, o, a, c) \ + __bs_nonsingle(wr,2,(t),(h),(o),(a),(c)) +#define bus_space_write_region_4(t, h, o, a, c) \ + __bs_nonsingle(wr,4,(t),(h),(o),(a),(c)) +#define bus_space_write_region_8(t, h, o, a, c) \ + __bs_nonsingle(wr,8,(t),(h),(o),(a),(c)) + +#define bus_space_write_region_stream_1 bus_space_write_region_1 +#define bus_space_write_region_stream_2(t, h, o, a, c) \ + __bs_nonsingle(wr,s_2,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_4(t, h, o, a, c) \ + __bs_nonsingle(wr,s_4,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_8(t, h, o, a, c) \ + __bs_nonsingle(wr,s_8,(t),(h),(o),(a),(c)) /* - * void bus_space_write_region_N(bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); - * - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided - * to bus space described by tag/handle starting at `offset'. + * Set multiple operations. */ - -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) -{ - volatile u_int8_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d++ = *addr++; - __asm __volatile("eieio; sync"); -} - -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) -{ - volatile u_int16_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - __asm __volatile("sthbrx %0, 0, %1" :: - "r"(*addr++), "r"(d++)); - __asm __volatile("eieio; sync"); -} - -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) -{ - volatile u_int32_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - __asm __volatile("stwbrx %0, 0, %1" :: - "r"(*addr++), "r"(d++)); - __asm __volatile("eieio; sync"); -} - -#if 0 -#define bus_space_write_region_8 !!! bus_space_write_region_8 unimplemented !!! -#endif - -static __inline void -bus_space_write_region_stream_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int16_t *addr, size_t count) -{ - volatile u_int16_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d++ = *addr++; - __asm __volatile("eieio; sync"); -} - -static __inline void -bus_space_write_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int32_t *addr, size_t count) -{ - volatile u_int32_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d++ = *addr++; - __asm __volatile("eieio; sync"); -} - -#if 0 -#define bus_space_write_region_stream_8 !!! unimplemented !!! -#endif +#define bus_space_set_multi_1(t, h, o, v, c) \ + __bs_set(sm,1,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_2(t, h, o, v, c) \ + __bs_set(sm,2,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_4(t, h, o, v, c) \ + __bs_set(sm,4,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_8(t, h, o, v, c) \ + __bs_set(sm,8,(t),(h),(o),(v),(c)) + +#define bus_space_set_multi_stream_1 bus_space_set_multi_1 +#define bus_space_set_multi_stream_2(t, h, o, v, c) \ + __bs_set(sm,s_2,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_stream_4(t, h, o, v, c) \ + __bs_set(sm,s_4,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_stream_8(t, h, o, v, c) \ + __bs_set(sm,s_8,(t),(h),(o),(v),(c)) /* - * void bus_space_set_multi_N(bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); - * - * Write the 1, 2, 4, or 8 byte value `val' to bus space described - * by tag/handle/offset `count' times. + * Set region operations. */ - -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 val, size_t count) -{ - volatile u_int8_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d = val; - __asm __volatile("eieio; sync"); -} - -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 val, size_t count) -{ - volatile u_int16_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - __asm __volatile("sthbrx %0, 0, %1" :: - "r"(val), "r"(d)); - __asm __volatile("eieio; sync"); -} - -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 val, size_t count) -{ - volatile u_int32_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - __asm __volatile("stwbrx %0, 0, %1" :: - "r"(val), "r"(d)); - __asm __volatile("eieio; sync"); -} +#define bus_space_set_region_1(t, h, o, v, c) \ + __bs_set(sr,1,(t),(h),(o),(v),(c)) +#define bus_space_set_region_2(t, h, o, v, c) \ + __bs_set(sr,2,(t),(h),(o),(v),(c)) +#define bus_space_set_region_4(t, h, o, v, c) \ + __bs_set(sr,4,(t),(h),(o),(v),(c)) +#define bus_space_set_region_8(t, h, o, v, c) \ + __bs_set(sr,8,(t),(h),(o),(v),(c)) + +#define bus_space_set_region_stream_1 bus_space_set_region_1 +#define bus_space_set_region_stream_2(t, h, o, v, c) \ + __bs_set(sr,s_2,(t),(h),(o),(v),(c)) +#define bus_space_set_region_stream_4(t, h, o, v, c) \ + __bs_set(sr,s_4,(t),(h),(o),(v),(c)) +#define bus_space_set_region_stream_8(t, h, o, v, c) \ + __bs_set(sr,s_8,(t),(h),(o),(v),(c)) #if 0 -#define bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!! -#endif - -static __inline void -bus_space_set_multi_stream_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t val, size_t count) -{ - volatile u_int16_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d = val; - __asm __volatile("eieio; sync"); -} - -static __inline void -bus_space_set_multi_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t val, size_t count) -{ - volatile u_int32_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d = val; - __asm __volatile("eieio; sync"); -} - -#if 0 -#define bus_space_set_multi_stream_8 !!! unimplemented !!! -#endif - /* - * void bus_space_set_region_N(bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); - * - * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described - * by tag/handle starting at `offset'. + * Copy operations. */ - -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 val, size_t count) -{ - volatile u_int8_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d++ = val; - __asm __volatile("eieio; sync"); -} - -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 val, size_t count) -{ - volatile u_int16_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - __asm __volatile("sthbrx %0, 0, %1" :: - "r"(val), "r"(d++)); - __asm __volatile("eieio; sync"); -} - -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 val, size_t count) -{ - volatile u_int32_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - __asm __volatile("stwbrx %0, 0, %1" :: - "r"(val), "r"(d++)); - __asm __volatile("eieio; sync"); -} - -#if 0 -#define bus_space_set_region_8 !!! bus_space_set_region_8 unimplemented !!! +#define bus_space_copy_region_1(t, h1, o1, h2, o2, c) \ + __bs_copy(1, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_2(t, h1, o1, h2, o2, c) \ + __bs_copy(2, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \ + __bs_copy(4, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \ + __bs_copy(8, t, h1, o1, h2, o2, c) + +#define bus_space_copy_region_stream_1 bus_space_copy_region_1 +#define bus_space_copy_region_stream_2(t, h1, o1, h2, o2, c) \ + __bs_copy(s_2, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \ + __bs_copy(s_4, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_stream_8(t, h1, o1, h2, o2, c) \ + __bs_copy(s_8, t, h1, o1, h2, o2, c) #endif -static __inline void -bus_space_set_region_stream_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t val, size_t count) -{ - volatile u_int16_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d++ = val; - __asm __volatile("eieio; sync"); -} - -static __inline void -bus_space_set_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t val, size_t count) -{ - volatile u_int32_t *d = __ppc_ba(tag, bsh, offset); - - while (count--) - *d++ = val; - __asm __volatile("eieio; sync"); -} - -#if 0 -#define bus_space_set_region_stream_8 !!! unimplemented !!! -#endif - -/* - * void bus_space_copy_region_N(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)); - * - * 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. - */ - - /* XXX IMPLEMENT bus_space_copy_N() XXX */ - -/* - * 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 macppc does not currently require barriers, but we must - * provide the flags to MI code. - */ - -#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ -#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ - -static __inline void -bus_space_barrier(bus_space_tag_t tag __unused, - bus_space_handle_t bsh __unused, bus_size_t offset __unused, - bus_size_t len __unused, int flags __unused) -{ - __asm __volatile("" : : : "memory"); -} - - -#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) - #include <machine/bus_dma.h> -#endif /* _MACPPC_BUS_H_ */ +#endif /* _MACHINE_BUS_H_ */ diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c index f606b65..03e15f0 100644 --- a/sys/powerpc/powermac/grackle.c +++ b/sys/powerpc/powermac/grackle.c @@ -43,6 +43,7 @@ #include <machine/bus.h> #include <machine/md_var.h> #include <machine/nexusvar.h> +#include <machine/pio.h> #include <machine/resource.h> #include <sys/rman.h> @@ -363,7 +364,6 @@ grackle_alloc_resource(device_t bus, device_t child, int type, int *rid, struct grackle_softc *sc; struct resource *rv; struct rman *rm; - bus_space_tag_t bt; int needactivate; needactivate = flags & RF_ACTIVE; @@ -374,18 +374,15 @@ grackle_alloc_resource(device_t bus, device_t child, int type, int *rid, switch (type) { case SYS_RES_MEMORY: rm = &sc->sc_mem_rman; - bt = PPC_BUS_SPACE_MEM; break; case SYS_RES_IOPORT: rm = &sc->sc_io_rman; - bt = PPC_BUS_SPACE_IO; break; case SYS_RES_IRQ: return (bus_alloc_resource(bus, type, rid, start, end, count, flags)); - break; default: device_printf(bus, "unknown resource request from %s\n", @@ -401,7 +398,7 @@ grackle_alloc_resource(device_t bus, device_t child, int type, int *rid, } rman_set_rid(rv, *rid); - rman_set_bustag(rv, bt); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c index d3d3dd4..36ef06e 100644 --- a/sys/powerpc/powermac/macio.c +++ b/sys/powerpc/powermac/macio.c @@ -369,7 +369,6 @@ macio_alloc_resource(device_t bus, device_t child, int type, int *rid, int needactivate; struct resource *rv; struct rman *rm; - bus_space_tag_t tagval; u_long adjstart, adjend, adjcount; struct macio_devinfo *dinfo; struct resource_list_entry *rle; @@ -408,8 +407,6 @@ macio_alloc_resource(device_t bus, device_t child, int type, int *rid, adjcount = adjend - adjstart; rm = &sc->sc_mem_rman; - - tagval = PPC_BUS_SPACE_MEM; break; case SYS_RES_IRQ: @@ -431,7 +428,6 @@ macio_alloc_resource(device_t bus, device_t child, int type, int *rid, return (resource_list_alloc(&dinfo->mdi_resources, bus, child, type, rid, start, end, count, flags)); - break; default: device_printf(bus, "unknown resource request from %s\n", @@ -449,7 +445,7 @@ macio_alloc_resource(device_t bus, device_t child, int type, int *rid, } rman_set_rid(rv, *rid); - rman_set_bustag(rv, tagval); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c index f3b0996..3510983 100644 --- a/sys/powerpc/powermac/uninorth.c +++ b/sys/powerpc/powermac/uninorth.c @@ -41,6 +41,7 @@ #include <machine/bus.h> #include <machine/md_var.h> #include <machine/nexusvar.h> +#include <machine/pio.h> #include <machine/resource.h> #include <sys/rman.h> @@ -347,7 +348,6 @@ uninorth_alloc_resource(device_t bus, device_t child, int type, int *rid, struct uninorth_softc *sc; struct resource *rv; struct rman *rm; - bus_space_tag_t bt; int needactivate; needactivate = flags & RF_ACTIVE; @@ -358,18 +358,16 @@ uninorth_alloc_resource(device_t bus, device_t child, int type, int *rid, switch (type) { case SYS_RES_MEMORY: rm = &sc->sc_mem_rman; - bt = PPC_BUS_SPACE_MEM; break; case SYS_RES_IOPORT: rm = &sc->sc_io_rman; - bt = PPC_BUS_SPACE_IO; break; case SYS_RES_IRQ: return (bus_alloc_resource(bus, type, rid, start, end, count, flags)); - break; + default: device_printf(bus, "unknown resource request from %s\n", device_get_nameunit(child)); @@ -384,7 +382,7 @@ uninorth_alloc_resource(device_t bus, device_t child, int type, int *rid, } rman_set_rid(rv, *rid); - rman_set_bustag(rv, bt); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { diff --git a/sys/powerpc/powerpc/bus_machdep.c b/sys/powerpc/powerpc/bus_machdep.c new file mode 100644 index 0000000..42e5baa --- /dev/null +++ b/sys/powerpc/powerpc/bus_machdep.c @@ -0,0 +1,788 @@ +/*- + * Copyright (c) 2006 Semihalf, Rafal Jaworowski <raj@semihalf.com> + * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * 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. + * + * 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> + +#include <machine/bus.h> +#include <machine/pio.h> + +#define TODO panic("%s: not implemented", __func__) + +static __inline void * +__ppc_ba(bus_space_handle_t bsh, bus_size_t ofs) +{ + return ((void *)(bsh + ofs)); +} + +static int +bs_gen_map(bus_addr_t addr, bus_size_t size __unused, int flags __unused, + bus_space_handle_t *bshp) +{ + *bshp = addr; + return (0); +} + +static void +bs_gen_unmap(bus_size_t size __unused) +{ +} + +static int +bs_gen_subregion(bus_space_handle_t bsh, bus_size_t ofs, + bus_size_t size __unused, bus_space_handle_t *nbshp) +{ + *nbshp = bsh + ofs; + return (0); +} + +static int +bs_gen_alloc(bus_addr_t rstart __unused, bus_addr_t rend __unused, + bus_size_t size __unused, bus_size_t alignment __unused, + bus_size_t boundary __unused, int flags __unused, + bus_addr_t *bpap __unused, bus_space_handle_t *bshp __unused) +{ + TODO; +} + +static void +bs_gen_free(bus_space_handle_t bsh __unused, bus_size_t size __unused) +{ + TODO; +} + +static void +bs_gen_barrier(bus_space_handle_t bsh __unused, bus_size_t ofs __unused, + bus_size_t size __unused, int flags __unused) +{ + __asm __volatile("" : : : "memory"); +} + +/* + * Big-endian access functions + */ +static uint8_t +bs_be_rs_1(bus_space_handle_t bsh, bus_size_t ofs) +{ + return (in8(__ppc_ba(bsh, ofs))); +} + +static uint16_t +bs_be_rs_2(bus_space_handle_t bsh, bus_size_t ofs) +{ + return (in16(__ppc_ba(bsh, ofs))); +} + +static uint32_t +bs_be_rs_4(bus_space_handle_t bsh, bus_size_t ofs) +{ + return (in32(__ppc_ba(bsh, ofs))); +} + +static uint64_t +bs_be_rs_8(bus_space_handle_t bsh, bus_size_t ofs) +{ + TODO; +} + +static void +bs_be_rm_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t *addr, size_t cnt) +{ + ins8(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_be_rm_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t *addr, size_t cnt) +{ + ins16(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_be_rm_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t *addr, size_t cnt) +{ + ins32(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_be_rm_8(bus_space_handle_t bshh, bus_size_t ofs, uint64_t *addr, size_t cnt) +{ + TODO; +} + +static void +bs_be_rr_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t *addr, size_t cnt) +{ + volatile uint8_t *s = __ppc_ba(bsh, ofs); + + while (cnt--) + *addr++ = *s++; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_rr_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t *addr, size_t cnt) +{ + volatile uint16_t *s = __ppc_ba(bsh, ofs); + + while (cnt--) + *addr++ = *s++; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_rr_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t *addr, size_t cnt) +{ + volatile uint32_t *s = __ppc_ba(bsh, ofs); + + while (cnt--) + *addr++ = *s++; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_rr_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t *addr, size_t cnt) +{ + TODO; +} + +static void +bs_be_ws_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t val) +{ + out8(__ppc_ba(bsh, ofs), val); +} + +static void +bs_be_ws_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t val) +{ + out16(__ppc_ba(bsh, ofs), val); +} + +static void +bs_be_ws_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t val) +{ + out32(__ppc_ba(bsh, ofs), val); +} + +static void +bs_be_ws_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t val) +{ + TODO; +} + +static void +bs_be_wm_1(bus_space_handle_t bsh, bus_size_t ofs, const uint8_t *addr, + bus_size_t cnt) +{ + outsb(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_be_wm_2(bus_space_handle_t bsh, bus_size_t ofs, const uint16_t *addr, + bus_size_t cnt) +{ + outsw(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_be_wm_4(bus_space_handle_t bsh, bus_size_t ofs, const uint32_t *addr, + bus_size_t cnt) +{ + outsl(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_be_wm_8(bus_space_handle_t bsh, bus_size_t ofs, const uint64_t *addr, + bus_size_t cnt) +{ + TODO; +} + +static void +bs_be_wr_1(bus_space_handle_t bsh, bus_size_t ofs, const uint8_t *addr, + size_t cnt) +{ + volatile uint8_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d++ = *addr++; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_wr_2(bus_space_handle_t bsh, bus_size_t ofs, const uint16_t *addr, + size_t cnt) +{ + volatile uint16_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d++ = *addr++; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_wr_4(bus_space_handle_t bsh, bus_size_t ofs, const uint32_t *addr, + size_t cnt) +{ + volatile uint32_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d++ = *addr++; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_wr_8(bus_space_handle_t bsh, bus_size_t ofs, const uint64_t *addr, + size_t cnt) +{ + TODO; +} + +static void +bs_be_sm_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t val, size_t cnt) +{ + volatile uint8_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d = val; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_sm_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t val, size_t cnt) +{ + volatile uint16_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d = val; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_sm_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t val, size_t cnt) +{ + volatile uint32_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d = val; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_sm_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t val, size_t cnt) +{ + TODO; +} + +static void +bs_be_sr_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t val, size_t cnt) +{ + volatile uint8_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d++ = val; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_sr_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t val, size_t cnt) +{ + volatile uint16_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d++ = val; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_sr_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t val, size_t cnt) +{ + volatile uint32_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d++ = val; + __asm __volatile("eieio; sync"); +} + +static void +bs_be_sr_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t val, size_t cnt) +{ + TODO; +} + +/* + * Little-endian access functions + */ +static uint8_t +bs_le_rs_1(bus_space_handle_t bsh, bus_size_t ofs) +{ + return (in8(__ppc_ba(bsh, ofs))); +} + +static uint16_t +bs_le_rs_2(bus_space_handle_t bsh, bus_size_t ofs) +{ + return (in16rb(__ppc_ba(bsh, ofs))); +} + +static uint32_t +bs_le_rs_4(bus_space_handle_t bsh, bus_size_t ofs) +{ + return (in32rb(__ppc_ba(bsh, ofs))); +} + +static uint64_t +bs_le_rs_8(bus_space_handle_t bsh, bus_size_t ofs) +{ + TODO; +} + +static void +bs_le_rm_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t *addr, size_t cnt) +{ + ins8(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_le_rm_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t *addr, size_t cnt) +{ + ins16rb(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_le_rm_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t *addr, size_t cnt) +{ + ins32rb(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_le_rm_8(bus_space_handle_t bshh, bus_size_t ofs, uint64_t *addr, size_t cnt) +{ + TODO; +} + +static void +bs_le_rr_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t *addr, size_t cnt) +{ + volatile uint8_t *s = __ppc_ba(bsh, ofs); + + while (cnt--) + *addr++ = *s++; + __asm __volatile("eieio; sync"); +} + +static void +bs_le_rr_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t *addr, size_t cnt) +{ + volatile uint16_t *s = __ppc_ba(bsh, ofs); + + while (cnt--) + *addr++ = in16rb(s++); + __asm __volatile("eieio; sync"); +} + +static void +bs_le_rr_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t *addr, size_t cnt) +{ + volatile uint32_t *s = __ppc_ba(bsh, ofs); + + while (cnt--) + *addr++ = in32rb(s++); + __asm __volatile("eieio; sync"); +} + +static void +bs_le_rr_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t *addr, size_t cnt) +{ + TODO; +} + +static void +bs_le_ws_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t val) +{ + out8(__ppc_ba(bsh, ofs), val); +} + +static void +bs_le_ws_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t val) +{ + out16rb(__ppc_ba(bsh, ofs), val); +} + +static void +bs_le_ws_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t val) +{ + out32rb(__ppc_ba(bsh, ofs), val); +} + +static void +bs_le_ws_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t val) +{ + TODO; +} + +static void +bs_le_wm_1(bus_space_handle_t bsh, bus_size_t ofs, const uint8_t *addr, + bus_size_t cnt) +{ + outs8(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_le_wm_2(bus_space_handle_t bsh, bus_size_t ofs, const uint16_t *addr, + bus_size_t cnt) +{ + outs16rb(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_le_wm_4(bus_space_handle_t bsh, bus_size_t ofs, const uint32_t *addr, + bus_size_t cnt) +{ + outs32rb(__ppc_ba(bsh, ofs), addr, cnt); +} + +static void +bs_le_wm_8(bus_space_handle_t bsh, bus_size_t ofs, const uint64_t *addr, + bus_size_t cnt) +{ + TODO; +} + +static void +bs_le_wr_1(bus_space_handle_t bsh, bus_size_t ofs, const uint8_t *addr, + size_t cnt) +{ + volatile uint8_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d++ = *addr++; + __asm __volatile("eieio; sync"); +} + +static void +bs_le_wr_2(bus_space_handle_t bsh, bus_size_t ofs, const uint16_t *addr, + size_t cnt) +{ + volatile uint16_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + out16rb(d++, *addr++); + __asm __volatile("eieio; sync"); +} + +static void +bs_le_wr_4(bus_space_handle_t bsh, bus_size_t ofs, const uint32_t *addr, + size_t cnt) +{ + volatile uint32_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + out32rb(d++, *addr++); + __asm __volatile("eieio; sync"); +} + +static void +bs_le_wr_8(bus_space_handle_t bsh, bus_size_t ofs, const uint64_t *addr, + size_t cnt) +{ + TODO; +} + +static void +bs_le_sm_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t val, size_t cnt) +{ + volatile uint8_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d = val; + __asm __volatile("eieio; sync"); +} + +static void +bs_le_sm_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t val, size_t cnt) +{ + volatile uint16_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + out16rb(d, val); + __asm __volatile("eieio; sync"); +} + +static void +bs_le_sm_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t val, size_t cnt) +{ + volatile uint32_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + out32rb(d, val); + __asm __volatile("eieio; sync"); +} + +static void +bs_le_sm_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t val, size_t cnt) +{ + TODO; +} + +static void +bs_le_sr_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t val, size_t cnt) +{ + volatile uint8_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + *d++ = val; + __asm __volatile("eieio; sync"); +} + +static void +bs_le_sr_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t val, size_t cnt) +{ + volatile uint16_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + out16rb(d++, val); + __asm __volatile("eieio; sync"); +} + +static void +bs_le_sr_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t val, size_t cnt) +{ + volatile uint32_t *d = __ppc_ba(bsh, ofs); + + while (cnt--) + out32rb(d++, val); + __asm __volatile("eieio; sync"); +} + +static void +bs_le_sr_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t val, size_t cnt) +{ + TODO; +} + +struct bus_space bs_be_tag = { + /* mapping/unmapping */ + bs_gen_map, + bs_gen_unmap, + bs_gen_subregion, + + /* allocation/deallocation */ + bs_gen_alloc, + bs_gen_free, + + /* barrier */ + bs_gen_barrier, + + /* read (single) */ + bs_be_rs_1, + bs_be_rs_2, + bs_be_rs_4, + bs_be_rs_8, + + bs_be_rs_2, + bs_be_rs_4, + bs_be_rs_8, + + /* read multiple */ + bs_be_rm_1, + bs_be_rm_2, + bs_be_rm_4, + bs_be_rm_8, + + bs_be_rm_2, + bs_be_rm_4, + bs_be_rm_8, + + /* read region */ + bs_be_rr_1, + bs_be_rr_2, + bs_be_rr_4, + bs_be_rr_8, + + bs_be_rr_2, + bs_be_rr_4, + bs_be_rr_8, + + /* write (single) */ + bs_be_ws_1, + bs_be_ws_2, + bs_be_ws_4, + bs_be_ws_8, + + bs_be_ws_2, + bs_be_ws_4, + bs_be_ws_8, + + /* write multiple */ + bs_be_wm_1, + bs_be_wm_2, + bs_be_wm_4, + bs_be_wm_8, + + bs_be_wm_2, + bs_be_wm_4, + bs_be_wm_8, + + /* write region */ + bs_be_wr_1, + bs_be_wr_2, + bs_be_wr_4, + bs_be_wr_8, + + bs_be_wr_2, + bs_be_wr_4, + bs_be_wr_8, + + /* set multiple */ + bs_be_sm_1, + bs_be_sm_2, + bs_be_sm_4, + bs_be_sm_8, + + bs_be_sm_2, + bs_be_sm_4, + bs_be_sm_8, + + /* set region */ + bs_be_sr_1, + bs_be_sr_2, + bs_be_sr_4, + bs_be_sr_8, + + bs_be_sr_2, + bs_be_sr_4, + bs_be_sr_8, +}; + +struct bus_space bs_le_tag = { + /* mapping/unmapping */ + bs_gen_map, + bs_gen_unmap, + bs_gen_subregion, + + /* allocation/deallocation */ + bs_gen_alloc, + bs_gen_free, + + /* barrier */ + bs_gen_barrier, + + /* read (single) */ + bs_le_rs_1, + bs_le_rs_2, + bs_le_rs_4, + bs_le_rs_8, + + bs_be_rs_2, + bs_be_rs_4, + bs_be_rs_8, + + /* read multiple */ + bs_le_rm_1, + bs_le_rm_2, + bs_le_rm_4, + bs_le_rm_8, + + bs_be_rm_2, + bs_be_rm_4, + bs_be_rm_8, + + /* read region */ + bs_le_rr_1, + bs_le_rr_2, + bs_le_rr_4, + bs_le_rr_8, + + bs_be_rr_2, + bs_be_rr_4, + bs_be_rr_8, + + /* write (single) */ + bs_le_ws_1, + bs_le_ws_2, + bs_le_ws_4, + bs_le_ws_8, + + bs_be_ws_2, + bs_be_ws_4, + bs_be_ws_8, + + /* write multiple */ + bs_le_wm_1, + bs_le_wm_2, + bs_le_wm_4, + bs_le_wm_8, + + bs_be_wm_2, + bs_be_wm_4, + bs_be_wm_8, + + /* write region */ + bs_le_wr_1, + bs_le_wr_2, + bs_le_wr_4, + bs_le_wr_8, + + bs_be_wr_2, + bs_be_wr_4, + bs_be_wr_8, + + /* set multiple */ + bs_le_sm_1, + bs_le_sm_2, + bs_le_sm_4, + bs_le_sm_8, + + bs_be_sm_2, + bs_be_sm_4, + bs_be_sm_8, + + /* set region */ + bs_le_sr_1, + bs_le_sr_2, + bs_le_sr_4, + bs_le_sr_8, + + bs_be_sr_2, + bs_be_sr_4, + bs_be_sr_8, +}; diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index 30cbeed..9fc2c57 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -311,7 +311,6 @@ iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, int needactivate; struct resource *rv; struct rman *rm; - bus_space_tag_t tagval; sc = device_get_softc(bus); @@ -322,15 +321,13 @@ iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, case SYS_RES_MEMORY: case SYS_RES_IOPORT: rm = &sc->sc_mem_rman; - tagval = PPC_BUS_SPACE_MEM; break; case SYS_RES_IRQ: return (bus_alloc_resource(bus, type, rid, start, end, count, - flags)); - break; + flags)); default: device_printf(bus, "unknown resource request from %s\n", - device_get_nameunit(child)); + device_get_nameunit(child)); return (NULL); } @@ -342,7 +339,7 @@ iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, } rman_set_rid(rv, *rid); - rman_set_bustag(rv, tagval); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { |
