Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Per discussion at
details: https://anonhg.NetBSD.org/src/rev/9ae105093b88
branches: trunk
changeset: 766765:9ae105093b88
user: dyoung <dyoung%NetBSD.org@localhost>
date: Fri Jul 01 17:09:58 2011 +0000
description:
Per discussion at
<http://mail-index.netbsd.org/tech-kern/2010/04/02/msg007941.html>,
divide each machine's bus.h into bus_defs.h (constants & data types)
and bus_funcs.h (macro implementations of bus_space(9) routines and MD
prototypes).
Note that some bus_space(9) routines' implementation will move to .c
files from inline subroutines or macros in .h files.
I've only made the split for machine architectures where there is PCI.
All of the non-PCI-having architectures will require a similar split.
These #include files are not referenced by any (committed) Makefiles or
header files, yet. Changes to Makefiles, to <sys/bus.h>, and to some
more machine-dependent files will dribble in before I throw the switch.
diffstat:
sys/arch/algor/include/bus_defs.h | 392 ++++++++++++++++
sys/arch/algor/include/bus_funcs.h | 363 +++++++++++++++
sys/arch/alpha/include/bus_defs.h | 473 +++++++++++++++++++
sys/arch/alpha/include/bus_funcs.h | 365 +++++++++++++++
sys/arch/amd64/include/bus_defs.h | 3 +
sys/arch/amd64/include/bus_funcs.h | 3 +
sys/arch/arc/include/bus_defs.h | 294 ++++++++++++
sys/arch/arc/include/bus_funcs.h | 387 ++++++++++++++++
sys/arch/arm/include/bus_defs.h | 444 ++++++++++++++++++
sys/arch/arm/include/bus_funcs.h | 608 +++++++++++++++++++++++++
sys/arch/atari/include/bus_defs.h | 386 ++++++++++++++++
sys/arch/atari/include/bus_funcs.h | 385 ++++++++++++++++
sys/arch/bebox/include/bus_defs.h | 38 +
sys/arch/bebox/include/bus_funcs.h | 38 +
sys/arch/cats/include/bus_defs.h | 3 +
sys/arch/cats/include/bus_funcs.h | 3 +
sys/arch/cobalt/include/bus_defs.h | 174 +++++++
sys/arch/cobalt/include/bus_funcs.h | 241 ++++++++++
sys/arch/evbarm/include/bus_defs.h | 3 +
sys/arch/evbarm/include/bus_funcs.h | 3 +
sys/arch/evbmips/include/bus_defs.h | 10 +
sys/arch/evbmips/include/bus_funcs.h | 9 +
sys/arch/evbppc/include/bus_defs.h | 3 +
sys/arch/evbppc/include/bus_funcs.h | 3 +
sys/arch/hp700/include/bus_defs.h | 284 +++++++++++
sys/arch/hp700/include/bus_funcs.h | 201 ++++++++
sys/arch/i386/include/bus_defs.h | 3 +
sys/arch/i386/include/bus_funcs.h | 3 +
sys/arch/ibmnws/include/bus_defs.h | 9 +
sys/arch/ibmnws/include/bus_funcs.h | 9 +
sys/arch/iyonix/include/bus_defs.h | 3 +
sys/arch/iyonix/include/bus_funcs.h | 3 +
sys/arch/landisk/include/bus_defs.h | 351 ++++++++++++++
sys/arch/landisk/include/bus_funcs.h | 343 ++++++++++++++
sys/arch/macppc/include/bus_defs.h | 7 +
sys/arch/macppc/include/bus_funcs.h | 4 +
sys/arch/mvmeppc/include/bus_defs.h | 38 +
sys/arch/mvmeppc/include/bus_funcs.h | 38 +
sys/arch/netwinder/include/bus_defs.h | 3 +
sys/arch/netwinder/include/bus_funcs.h | 3 +
sys/arch/ofppc/include/bus_defs.h | 12 +
sys/arch/ofppc/include/bus_funcs.h | 9 +
sys/arch/powerpc/include/bus_defs.h | 380 +++++++++++++++
sys/arch/powerpc/include/bus_funcs.h | 568 +++++++++++++++++++++++
sys/arch/prep/include/bus_defs.h | 39 +
sys/arch/prep/include/bus_funcs.h | 44 +
sys/arch/sandpoint/include/bus_defs.h | 24 +
sys/arch/sandpoint/include/bus_funcs.h | 17 +
sys/arch/sbmips/include/bus_defs.h | 11 +
sys/arch/sbmips/include/bus_funcs.h | 9 +
sys/arch/sgimips/include/bus_defs.h | 207 ++++++++
sys/arch/sgimips/include/bus_funcs.h | 134 +++++
sys/arch/sh3/include/bus_defs.h | 113 ++++
sys/arch/sh3/include/bus_funcs.h | 785 +++++++++++++++++++++++++++++++++
sys/arch/sparc/include/bus_defs.h | 329 +++++++++++++
sys/arch/sparc/include/bus_funcs.h | 243 ++++++++++
sys/arch/sparc64/include/bus_defs.h | 298 ++++++++++++
sys/arch/sparc64/include/bus_funcs.h | 408 +++++++++++++++++
sys/arch/x86/include/bus_defs.h | 139 +++++
sys/arch/x86/include/bus_funcs.h | 75 +++
60 files changed, 9777 insertions(+), 0 deletions(-)
diffs (truncated from 10017 to 300 lines):
diff -r c54a51faa05c -r 9ae105093b88 sys/arch/algor/include/bus_defs.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/algor/include/bus_defs.h Fri Jul 01 17:09:58 2011 +0000
@@ -0,0 +1,392 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $ */
+
+/*-
+ * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE 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 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ * Software Distribution Coordinator or Software.Distribution%CS.CMU.EDU@localhost
+ * School of Computer Science
+ * Carnegie Mellon University
+ * Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#ifndef _ALGOR_BUS_DEFS_H_
+#define _ALGOR_BUS_DEFS_H_
+
+#include <sys/types.h>
+
+#ifdef _KERNEL
+/*
+ * Addresses (in bus space).
+ */
+typedef u_long bus_addr_t;
+typedef u_long bus_size_t;
+
+/*
+ * Turn on BUS_SPACE_DEBUG if the global DEBUG option is enabled.
+ */
+#if defined(DEBUG) && !defined(BUS_SPACE_DEBUG)
+#define BUS_SPACE_DEBUG
+#endif
+
+#ifdef BUS_SPACE_DEBUG
+#include <sys/systm.h> /* for printf() prototype */
+/*
+ * Macros for checking the aligned-ness of pointers passed to bus
+ * space ops. Strict alignment is required by the MIPS architecture,
+ * and a trap will occur if unaligned access is performed. These
+ * may aid in the debugging of a broken device driver by displaying
+ * useful information about the problem.
+ */
+#define __BUS_SPACE_ALIGNED_ADDRESS(p, t) \
+ ((((u_long)(p)) & (sizeof(t)-1)) == 0)
+
+#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) \
+({ \
+ if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \
+ printf("%s 0x%lx not aligned to %zu bytes %s:%d\n", \
+ d, (u_long)(p), sizeof(t), __FILE__, __LINE__); \
+ } \
+ (void) 0; \
+})
+
+#define BUS_SPACE_ALIGNED_POINTER(p, t) __BUS_SPACE_ALIGNED_ADDRESS(p, t)
+#else
+#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) (void) 0
+#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
+#endif /* BUS_SPACE_DEBUG */
+#endif /* _KERNEL */
+
+struct mips_bus_space_translation;
+
+/*
+ * Access methods for bus space.
+ */
+typedef struct algor_bus_space *bus_space_tag_t;
+typedef u_long bus_space_handle_t;
+
+struct algor_bus_space {
+ /* cookie */
+ void *bs_cookie;
+
+ /* mapping/unmapping */
+ int (*bs_map)(void *, bus_addr_t, bus_size_t,
+ int, bus_space_handle_t *, int);
+ void (*bs_unmap)(void *, bus_space_handle_t,
+ bus_size_t, int);
+ int (*bs_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+
+ /* ALGOR SPECIFIC MAPPING METHOD */
+ int (*bs_translate)(void *, bus_addr_t, bus_size_t,
+ int, struct mips_bus_space_translation *);
+ int (*bs_get_window)(void *, int,
+ struct mips_bus_space_translation *);
+
+ /* allocation/deallocation */
+ int (*bs_alloc)(void *, 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)(void *, bus_space_handle_t,
+ bus_size_t);
+
+ /* get kernel virtual address */
+ void * (*bs_vaddr)(void *, bus_space_handle_t);
+
+ /* mmap for user */
+ paddr_t (*bs_mmap)(void *, bus_addr_t, off_t, int, int);
+
+ /* barrier */
+ void (*bs_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
+
+ /* read (single) */
+ u_int8_t (*bs_r_1)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int16_t (*bs_r_2)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int32_t (*bs_r_4)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int64_t (*bs_r_8)(void *, bus_space_handle_t,
+ bus_size_t);
+
+ /* read multiple */
+ void (*bs_rm_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*bs_rm_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*bs_rm_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*bs_rm_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
+
+ /* read region */
+ void (*bs_rr_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*bs_rr_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*bs_rr_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*bs_rr_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
+
+ /* write (single) */
+ void (*bs_w_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+ void (*bs_w_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+ void (*bs_w_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+ void (*bs_w_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
+
+ /* write multiple */
+ void (*bs_wm_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+ void (*bs_wm_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+ void (*bs_wm_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+ void (*bs_wm_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
+
+ /* write region */
+ void (*bs_wr_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+ void (*bs_wr_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+ void (*bs_wr_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+ void (*bs_wr_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
+
+ /* set multiple */
+ void (*bs_sm_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+ void (*bs_sm_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+ void (*bs_sm_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+ void (*bs_sm_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
+
+ /* set region */
+ void (*bs_sr_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+ void (*bs_sr_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+ void (*bs_sr_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+ void (*bs_sr_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
+
+ /* copy */
+ void (*bs_c_1)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_2)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_4)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_8)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+};
+
+/*
+ * Translation of an MIPS bus address; INTERNAL USE ONLY.
+ */
+struct mips_bus_space_translation {
+ bus_addr_t mbst_bus_start; /* start of bus window */
+ bus_addr_t mbst_bus_end; /* end of bus window */
+ paddr_t mbst_sys_start; /* start of sysBus window */
+ paddr_t mbst_sys_end; /* end of sysBus window */
+ int mbst_align_stride;/* alignment stride */
+ int mbst_flags; /* flags; see below */
+};
+
+#define BUS_SPACE_MAP_CACHEABLE 0x01
+#define BUS_SPACE_MAP_LINEAR 0x02
+#define BUS_SPACE_MAP_PREFETCHABLE 0x04
+
+#ifdef _KERNEL
+
+#define BUS_SPACE_BARRIER_READ 0x01
+#define BUS_SPACE_BARRIER_WRITE 0x02
+
+#define __BUS_SPACE_HAS_STREAM_METHODS 1
+
+/*
+ * Flags used in various bus DMA methods.
+ */
+#define BUS_DMA_WAITOK 0x000 /* safe to sleep (pseudo-flag) */
+#define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */
+#define BUS_DMA_ALLOCNOW 0x002 /* perform resource allocation now */
+#define BUS_DMA_COHERENT 0x004 /* hint: map memory DMA coherent */
+#define BUS_DMA_STREAMING 0x008 /* hint: sequential, unidirectional */
+#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
+#define BUS_DMA_BUS2 0x020
+#define BUS_DMA_BUS3 0x040
+#define BUS_DMA_BUS4 0x080
+#define BUS_DMA_READ 0x100 /* mapping is device -> memory only */
+#define BUS_DMA_WRITE 0x200 /* mapping is memory -> device only */
+#define BUS_DMA_NOCACHE 0x400 /* hint: map non-cached memory */
+
+/*
+ * Private flags stored in the DMA map.
+ */
+#define ALGOR_DMAMAP_COHERENT 0x10000 /* no cache flush necessary on sync */
+
+/* Forwards needed by prototypes below. */
+struct mbuf;
+struct uio;
+
+/*
+ * Operations performed by bus_dmamap_sync().
+ */
+#define BUS_DMASYNC_PREREAD 0x01 /* pre-read synchronization */
+#define BUS_DMASYNC_POSTREAD 0x02 /* post-read synchronization */
+#define BUS_DMASYNC_PREWRITE 0x04 /* pre-write synchronization */
+#define BUS_DMASYNC_POSTWRITE 0x08 /* post-write synchronization */
+
Home |
Main Index |
Thread Index |
Old Index