Module Name: src
Committed By: cliff
Date: Sat Apr 17 07:49:23 UTC 2010
Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl
Added Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pci_cfg_space.c
rmixl_pci_ecfg_space.c rmixl_pci_io_space.c rmixl_pci_mem_space.c
Removed Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie_cfg_space.c
rmixl_pcie_ecfg_space.c rmixl_pcie_io_space.c
rmixl_pcie_mem_space.c
Log Message:
- rename "pcie" bus space files to "pci" to reflect common use
by either pcie or pcix, depending on RMI chip type.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/sys/arch/mips/conf/files.rmixl
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c \
src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c \
src/sys/arch/mips/rmi/rmixl_pci_io_space.c \
src/sys/arch/mips/rmi/rmixl_pci_mem_space.c
cvs rdiff -u -r1.1.2.3 -r0 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
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/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.12 src/sys/arch/mips/conf/files.rmixl:1.1.2.13
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.12 Mon Apr 12 22:00:51 2010
+++ src/sys/arch/mips/conf/files.rmixl Sat Apr 17 07:49:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.rmixl,v 1.1.2.12 2010/04/12 22:00:51 cliff Exp $
+# $NetBSD: files.rmixl,v 1.1.2.13 2010/04/17 07:49:23 cliff Exp $
#
# Configuration info for RMI XLP, XLR, XLS
#
@@ -31,10 +31,10 @@
file arch/mips/rmi/rmixl_obio.c obio_rmixl
file arch/mips/rmi/rmixl_obio_eb_space.c obio_rmixl
file arch/mips/rmi/rmixl_obio_el_space.c obio_rmixl
-file arch/mips/rmi/rmixl_pcie_cfg_space.c rmixl_pcix | rmixl_pcie
-file arch/mips/rmi/rmixl_pcie_ecfg_space.c rmixl_pcie
-file arch/mips/rmi/rmixl_pcie_io_space.c rmixl_pcix | rmixl_pcie
-file arch/mips/rmi/rmixl_pcie_mem_space.c rmixl_pcix | rmixl_pcie
+file arch/mips/rmi/rmixl_pci_cfg_space.c rmixl_pcix | rmixl_pcie
+file arch/mips/rmi/rmixl_pci_ecfg_space.c rmixl_pcie
+file arch/mips/rmi/rmixl_pci_io_space.c rmixl_pcix | rmixl_pcie
+file arch/mips/rmi/rmixl_pci_mem_space.c rmixl_pcix | rmixl_pcie
# NS16550 compatible serial ports
attach com at obio with com_rmixl
Added files:
Index: src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c:1.1.2.1
--- /dev/null Sat Apr 17 07:49:23 2010
+++ src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c Sat Apr 17 07:49:23 2010
@@ -0,0 +1,65 @@
+/* $NetBSD: rmixl_pci_cfg_space.c,v 1.1.2.1 2010/04/17 07:49:23 cliff Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+/*
+ * Little Endian bus_space(9) support for PCI CFG space access
+ * on RMI {XLP,XLR,XLS} chips
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_cfg_space.c,v 1.1.2.1 2010/04/17 07:49:23 cliff Exp $");
+
+#include <sys/types.h>
+#include <sys/param.h>
+
+#include <machine/bus.h>
+#include <mips/rmi/rmixl_obiovar.h>
+#include <mips/rmi/rmixlreg.h>
+#include <mips/rmi/rmixlvar.h>
+
+#define CHIP rmixl_pci_cfg
+#define CHIP_MEM /* defined */
+#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_pci_cfg_ex)
+
+/* MEM region 1 */
+#define CHIP_W1_BUS_START(v) \
+ (((struct rmixl_config *)(v))->rc_pci_cfg_pbase)
+#define CHIP_W1_BUS_END(v) \
+ (CHIP_W1_SYS_START(v) + \
+ (((struct rmixl_config *)(v))->rc_pci_cfg_size) - 1)
+#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
+#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
+
+#include <mips/mips/bus_space_alignstride_chipdep.c>
Index: src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c:1.1.2.1
--- /dev/null Sat Apr 17 07:49:23 2010
+++ src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c Sat Apr 17 07:49:23 2010
@@ -0,0 +1,65 @@
+/* $NetBSD: rmixl_pci_ecfg_space.c,v 1.1.2.1 2010/04/17 07:49:23 cliff Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+/*
+ * Little Endian bus_space(9) support for PCI ECFG space access
+ * on RMI {XLP,XLR,XLS} chips
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_ecfg_space.c,v 1.1.2.1 2010/04/17 07:49:23 cliff Exp $");
+
+#include <sys/types.h>
+#include <sys/param.h>
+
+#include <machine/bus.h>
+#include <mips/rmi/rmixl_obiovar.h>
+#include <mips/rmi/rmixlreg.h>
+#include <mips/rmi/rmixlvar.h>
+
+#define CHIP rmixl_pci_ecfg
+#define CHIP_MEM /* defined */
+#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_pci_ecfg_ex)
+
+/* MEM region 1 */
+#define CHIP_W1_BUS_START(v) \
+ (((struct rmixl_config *)(v))->rc_pci_ecfg_pbase)
+#define CHIP_W1_BUS_END(v) \
+ (CHIP_W1_SYS_START(v) + \
+ (((struct rmixl_config *)(v))->rc_pci_ecfg_size) - 1)
+#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
+#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
+
+#include <mips/mips/bus_space_alignstride_chipdep.c>
Index: src/sys/arch/mips/rmi/rmixl_pci_io_space.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_pci_io_space.c:1.1.2.1
--- /dev/null Sat Apr 17 07:49:23 2010
+++ src/sys/arch/mips/rmi/rmixl_pci_io_space.c Sat Apr 17 07:49:23 2010
@@ -0,0 +1,63 @@
+/* $NetBSD: rmixl_pci_io_space.c,v 1.1.2.1 2010/04/17 07:49:23 cliff Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+/*
+ * Little Endian bus_space(9) support for PCI I/O access
+ * on RMI {XLP,XLR,XLS} chips
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_io_space.c,v 1.1.2.1 2010/04/17 07:49:23 cliff Exp $");
+
+#include <sys/types.h>
+#include <sys/param.h>
+
+#include <machine/bus.h>
+#include <mips/rmi/rmixl_obiovar.h>
+#include <mips/rmi/rmixlreg.h>
+#include <mips/rmi/rmixlvar.h>
+
+#define CHIP rmixl_pci
+#define CHIP_IO /* defined */
+#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_pci_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) + \
+ (((struct rmixl_config *)(v))->rc_pci_io_size) - 1)
+#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
+#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
+
+#include <mips/mips/bus_space_alignstride_chipdep.c>
Index: src/sys/arch/mips/rmi/rmixl_pci_mem_space.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_pci_mem_space.c:1.1.2.1
--- /dev/null Sat Apr 17 07:49:23 2010
+++ src/sys/arch/mips/rmi/rmixl_pci_mem_space.c Sat Apr 17 07:49:23 2010
@@ -0,0 +1,63 @@
+/* $NetBSD: rmixl_pci_mem_space.c,v 1.1.2.1 2010/04/17 07:49:23 cliff Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+/*
+ * Little Endian bus_space(9) support for PCI MEM access
+ * on RMI {XLP,XLR,XLS} chips
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_mem_space.c,v 1.1.2.1 2010/04/17 07:49:23 cliff Exp $");
+
+#include <sys/types.h>
+#include <sys/param.h>
+
+#include <machine/bus.h>
+#include <mips/rmi/rmixl_obiovar.h>
+#include <mips/rmi/rmixlreg.h>
+#include <mips/rmi/rmixlvar.h>
+
+#define CHIP rmixl_pci
+#define CHIP_MEM /* defined */
+#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_pci_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) + \
+ (((struct rmixl_config *)(v))->rc_pci_mem_size) - 1)
+#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
+#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
+
+#include <mips/mips/bus_space_alignstride_chipdep.c>
