 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * On-board device autoconfiguration support for RMI {XLP, XLR, XLS} chips
  */
 #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"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #define _MIPS_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 @@ -131,70 +131,76 @@ obio_print(void *aux, const char *pnp)
 		aprint_normal(" mult %d", obio->obio_mult);
 	if (obio->obio_intr != OBIOCF_INTR_DEFAULT)
 		aprint_normal(" intr %d", obio->obio_intr);
 	return (UNCONF);
+}
 static int
 obio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	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];
 	obio.obio_intr = cf->cf_loc[OBIOCF_INTR];
 	obio.obio_29bit_dmat = sc->sc_29bit_dmat;
 	obio.obio_32bit_dmat = sc->sc_32bit_dmat;
 	obio.obio_64bit_dmat = sc->sc_64bit_dmat;
 	if (config_match(parent, cf, &obio) > 0)
 		config_attach(parent, cf, &obio, obio_print);
 	return 0;
+}
 static void
 obio_bus_init(struct obio_softc *sc)
+{
 	struct rmixl_config *rcp = &rmixl_configuration;
 	static int done = 0;
 	if (done)
 		return;
 	done = 1;
-	/* obio (devio) space */
+	/* obio (devio) space, Big Endian */
-	if (rcp->rc_obio_memt.bs_cookie == 0)
+	if (rcp->rc_obio_eb_memt.bs_cookie == 0)
-		rmixl_obio_bus_mem_init(&rcp->rc_obio_memt, rcp);
+		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)
 		obio_dma_init_29(&rcp->rc_29bit_dmat);
 #ifdef NOTYET
 	/* dma space for addr < 4GB */
 	if (rcp->rc_32bit_dmat._cookie == 0)
 		obio_dma_init_32(&rcp->rc_32bit_dmat);
 	/* dma space for all memory, including >= 4GB */
 	if (rcp->rc_64bit_dmat._cookie == 0)
 		obio_dma_init_64(&rcp->rc_64bit_dmat);
 #endif
 	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;
 	sc->sc_64bit_dmat = &rcp->rc_64bit_dmat;
 #else
 	sc->sc_32bit_dmat = NULL;
 	sc->sc_64bit_dmat = NULL;
 #endif
+}
 static void
 obio_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
     bus_size_t len, int ops)

 @@ -1,31 +1,33 @@
-/*	$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_
 #include <dev/pci/pcivar.h>
 #include <mips/bus_dma.h>
 #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;
 	unsigned int	obio_mult;
 	bus_dma_tag_t	obio_29bit_dmat;
 	bus_dma_tag_t	obio_32bit_dmat;
 	bus_dma_tag_t	obio_64bit_dmat;
 };
 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;
 	bus_addr_t		sc_base;
 	bus_size_t		sc_size;
 } obio_softc_t;
 #endif /* _MIPS_RMI_RMIXL_OBIOVAR_H_ */

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Written by Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -90,46 +90,49 @@ typedef enum {
 	RMIXL_INTR_LOW,
 } rmixl_intr_polarity_t;
 struct rmixl_config {
 	uint64_t		 rc_io_pbase;
 	bus_addr_t		 rc_pcie_cfg_pbase;
 	bus_size_t		 rc_pcie_cfg_size;
 	bus_addr_t		 rc_pcie_ecfg_pbase;
 	bus_size_t		 rc_pcie_ecfg_size;
 	bus_addr_t		 rc_pci_mem_pbase;
 	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 */
 	struct mips_bus_space	 rc_pci_iot; 		/* PCI IO  */
 	struct mips_bus_dma_tag	 rc_29bit_dmat;
 	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;
 	struct extent		*rc_pcie_io_ex;
 	int			 rc_mallocsafe;
 };
 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 *);
 extern void rmixl_pcie_bus_io_init(bus_space_tag_t, void *);
 extern const char *rmixl_intr_string(int);
 extern void *rmixl_intr_establish(int, int,
 	rmixl_intr_trigger_t, rmixl_intr_polarity_t,
 	int (*)(void *), void *);
 extern void  rmixl_intr_disestablish(void *);
 extern void rmixl_addr_error_init(void);
 extern int  rmixl_addr_error_check(void);