Module Name: src
Committed By: cliff
Date: Mon Dec 14 07:18:26 UTC 2009
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio.c rmixl_obiovar.h
rmixlvar.h
Log Message:
- replace single bus space with two (big & little endian) bus spaces for obio
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/arch/mips/rmi/rmixl_obio.c
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/mips/rmi/rmixl_obiovar.h
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 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.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.7 src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.8
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.7 Wed Nov 18 01:14:49 2009
+++ src/sys/arch/mips/rmi/rmixl_obio.c Mon Dec 14 07:18:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.1.2.7 2009/11/18 01:14:49 cliff Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.1.2.8 2009/12/14 07:18:26 cliff Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.7 2009/11/18 01:14:49 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.8 2009/12/14 07:18:26 cliff Exp $");
#include "locators.h"
#include "obio.h"
@@ -141,7 +141,8 @@
struct obio_softc *sc = device_private(parent);
struct obio_attach_args obio;
- obio.obio_bst = sc->sc_bst;
+ obio.obio_eb_bst = sc->sc_eb_bst;
+ obio.obio_el_bst = sc->sc_el_bst;
obio.obio_addr = cf->cf_loc[OBIOCF_ADDR];
obio.obio_size = cf->cf_loc[OBIOCF_SIZE];
obio.obio_mult = cf->cf_loc[OBIOCF_MULT];
@@ -166,9 +167,13 @@
return;
done = 1;
- /* obio (devio) space */
- if (rcp->rc_obio_memt.bs_cookie == 0)
- rmixl_obio_bus_mem_init(&rcp->rc_obio_memt, rcp);
+ /* obio (devio) space, Big Endian */
+ if (rcp->rc_obio_eb_memt.bs_cookie == 0)
+ rmixl_obio_eb_bus_mem_init(&rcp->rc_obio_eb_memt, rcp);
+
+ /* obio (devio) space, Little Endian */
+ if (rcp->rc_obio_el_memt.bs_cookie == 0)
+ rmixl_obio_el_bus_mem_init(&rcp->rc_obio_el_memt, rcp);
/* dma space for addr < 512MB */
if (rcp->rc_29bit_dmat._cookie == 0)
@@ -184,7 +189,8 @@
sc->sc_base = (bus_addr_t)rcp->rc_io_pbase;
sc->sc_size = (bus_size_t)RMIXL_IO_DEV_SIZE;
- sc->sc_bst = (bus_space_tag_t)&rcp->rc_obio_memt;
+ sc->sc_eb_bst = (bus_space_tag_t)&rcp->rc_obio_eb_memt;
+ sc->sc_el_bst = (bus_space_tag_t)&rcp->rc_obio_el_memt;
sc->sc_29bit_dmat = &rcp->rc_29bit_dmat;
#ifdef NOTYET
sc->sc_32bit_dmat = &rcp->rc_32bit_dmat;
Index: src/sys/arch/mips/rmi/rmixl_obiovar.h
diff -u src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.6 src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.7
--- src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.6 Sun Nov 15 22:58:15 2009
+++ src/sys/arch/mips/rmi/rmixl_obiovar.h Mon Dec 14 07:18:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obiovar.h,v 1.1.2.6 2009/11/15 22:58:15 cliff Exp $ */
+/* $NetBSD: rmixl_obiovar.h,v 1.1.2.7 2009/12/14 07:18:26 cliff Exp $ */
#ifndef _MIPS_RMI_RMIXL_OBIOVAR_H_
#define _MIPS_RMI_RMIXL_OBIOVAR_H_
@@ -8,7 +8,8 @@
#include <mips/pci_machdep.h>
struct obio_attach_args {
- bus_space_tag_t obio_bst;
+ bus_space_tag_t obio_eb_bst;
+ bus_space_tag_t obio_el_bst;
bus_addr_t obio_addr;
bus_size_t obio_size;
int obio_intr;
@@ -20,7 +21,8 @@
typedef struct obio_softc {
device_t sc_dev;
- bus_space_tag_t sc_bst;
+ bus_space_tag_t sc_eb_bst;
+ bus_space_tag_t sc_el_bst;
bus_dma_tag_t sc_29bit_dmat;
bus_dma_tag_t sc_32bit_dmat;
bus_dma_tag_t sc_64bit_dmat;
Index: src/sys/arch/mips/rmi/rmixlvar.h
diff -u src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.8 src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.9
--- src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.8 Wed Nov 18 01:16:07 2009
+++ src/sys/arch/mips/rmi/rmixlvar.h Mon Dec 14 07:18:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixlvar.h,v 1.1.2.8 2009/11/18 01:16:07 cliff Exp $ */
+/* $NetBSD: rmixlvar.h,v 1.1.2.9 2009/12/14 07:18:26 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -100,7 +100,8 @@
bus_size_t rc_pci_mem_size;
bus_addr_t rc_pci_io_pbase;
bus_size_t rc_pci_io_size;
- struct mips_bus_space rc_obio_memt; /* DEVIO */
+ struct mips_bus_space rc_obio_eb_memt; /* DEVIO -eb */
+ struct mips_bus_space rc_obio_el_memt; /* DEVIO -el */
struct mips_bus_space rc_pcie_cfg_memt; /* PCI CFG */
struct mips_bus_space rc_pcie_ecfg_memt; /* PCI ECFG */
struct mips_bus_space rc_pci_memt; /* PCI MEM */
@@ -109,7 +110,8 @@
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_obio_eb_ex;
+ struct extent *rc_obio_el_ex;
struct extent *rc_pcie_cfg_ex;
struct extent *rc_pcie_ecfg_ex;
struct extent *rc_pcie_mem_ex;
@@ -119,7 +121,8 @@
extern struct rmixl_config rmixl_configuration;
-extern void rmixl_obio_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_obio_eb_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_obio_el_bus_mem_init(bus_space_tag_t, void *);
extern void rmixl_pcie_cfg_bus_mem_init(bus_space_tag_t, void *);
extern void rmixl_pcie_ecfg_bus_mem_init(bus_space_tag_t, void *);
extern void rmixl_pcie_bus_mem_init(bus_space_tag_t, void *);
