Module Name: src
Committed By: cliff
Date: Wed Nov 18 01:16:07 UTC 2009
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio_space.c
rmixl_pcie_cfg_space.c rmixl_pcie_ecfg_space.c
rmixl_pcie_io_space.c rmixl_pcie_mem_space.c rmixlvar.h
Log Message:
- add extents for bus spaces
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/mips/rmi/rmixl_obio_space.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c \
src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c \
src/sys/arch/mips/rmi/rmixl_pcie_io_space.c \
src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/arch/mips/rmi/rmixlvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_obio_space.c
diff -u src/sys/arch/mips/rmi/rmixl_obio_space.c:1.1.2.4 src/sys/arch/mips/rmi/rmixl_obio_space.c:1.1.2.5
--- src/sys/arch/mips/rmi/rmixl_obio_space.c:1.1.2.4 Sun Nov 15 22:58:15 2009
+++ src/sys/arch/mips/rmi/rmixl_obio_space.c Wed Nov 18 01:16:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio_space.c,v 1.1.2.4 2009/11/15 22:58:15 cliff Exp $ */
+/* $NetBSD: rmixl_obio_space.c,v 1.1.2.5 2009/11/18 01:16:07 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio_space.c,v 1.1.2.4 2009/11/15 22:58:15 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio_space.c,v 1.1.2.5 2009/11/18 01:16:07 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -49,6 +49,10 @@
#define CHIP_ACCESS_SIZE 4
#define CHIP_BIG_ENDIAN
+#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_obio_ex)
+
+
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) 0
#define CHIP_W1_BUS_END(v) (RMIXL_IO_DEV_SIZE - 1)
Index: src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.2
--- src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.1 Sun Nov 15 23:29:18 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c Wed Nov 18 01:16:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $ */
+/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,6 +50,9 @@
#define CHIP_ACCESS_SIZE 1
#define CHIP_LITTLE_ENDIAN
+#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pcie_cfg_ex)
+
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) \
(((struct rmixl_config *)(v))->rc_pcie_cfg_pbase)
Index: src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.2
--- src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.1 Sun Nov 15 23:29:18 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c Wed Nov 18 01:16:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $ */
+/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,6 +50,9 @@
#define CHIP_ACCESS_SIZE 1
#define CHIP_LITTLE_ENDIAN
+#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pcie_ecfg_ex)
+
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) \
(((struct rmixl_config *)(v))->rc_pcie_ecfg_pbase)
Index: src/sys/arch/mips/rmi/rmixl_pcie_io_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.2
--- src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.1 Mon Nov 9 10:17:06 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_io_space.c Wed Nov 18 01:16:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.1 2009/11/09 10:17:06 cliff Exp $ */
+/* $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_io_space.c,v 1.1.2.1 2009/11/09 10:17:06 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_io_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,6 +50,9 @@
#define CHIP_ACCESS_SIZE 1
#define CHIP_LITTLE_ENDIAN
+#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pcie_io_ex)
+
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) (((struct rmixl_config *)(v))->rc_pci_io_pbase)
#define CHIP_W1_BUS_END(v) (CHIP_W1_SYS_START(v) + \
Index: src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c:1.1.2.2
--- src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c:1.1.2.1 Mon Nov 9 10:17:06 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c Wed Nov 18 01:16:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie_mem_space.c,v 1.1.2.1 2009/11/09 10:17:06 cliff Exp $ */
+/* $NetBSD: rmixl_pcie_mem_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_mem_space.c,v 1.1.2.1 2009/11/09 10:17:06 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_mem_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,6 +50,9 @@
#define CHIP_ACCESS_SIZE 1
#define CHIP_LITTLE_ENDIAN
+#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pcie_mem_ex)
+
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) (((struct rmixl_config *)(v))->rc_pci_mem_pbase)
#define CHIP_W1_BUS_END(v) (CHIP_W1_SYS_START(v) + \
Index: src/sys/arch/mips/rmi/rmixlvar.h
diff -u src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.7 src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.8
--- src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.7 Sun Nov 15 23:11:32 2009
+++ src/sys/arch/mips/rmi/rmixlvar.h Wed Nov 18 01:16:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixlvar.h,v 1.1.2.7 2009/11/15 23:11:32 cliff Exp $ */
+/* $NetBSD: rmixlvar.h,v 1.1.2.8 2009/11/18 01:16:07 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -109,6 +109,11 @@
struct mips_bus_dma_tag rc_32bit_dmat;
struct mips_bus_dma_tag rc_64bit_dmat;
struct extent *rc_phys_ex; /* Note: MB units */
+ struct extent *rc_obio_ex;
+ struct extent *rc_pcie_cfg_ex;
+ struct extent *rc_pcie_ecfg_ex;
+ struct extent *rc_pcie_mem_ex;
+ struct extent *rc_pcie_io_ex;
int rc_mallocsafe;
};
