MFC r277454, r277460, r277465, r277466, r277467, r277469, r277470, r277471,

    r277472, r277473, r277474, r277475, r277476, r277477, r277478, r277479,
    r277480, r277512, r277516:

  Add inline implementations of arm bus_space_read/write_N().

  Revise the arm bus_space implementation to avoid dereferencing the tag on
  every operation to retrieve the bs_cookie value almost nothing actually uses.

  Use the explicit member initializer style to init the bus_space struct.

  Use arm/bus_space-v6.c for all armv6 systems

  Consolidate many identical implementations of bus_space to a single
  common tag and implementation shared by armv4 and armv6.

  Micro-optimize the new arm inline bus_space implementation by grouping all
  the data the inline functions access together at the start of the bus_space
  struct so that they all fit in a single cache line.

6 files changed, 35 insertions, 197 deletions

diff --git a/sys/arm/samsung/exynos/files.exynos5 b/sys/arm/samsung/exynos/files.exynos5
index 2bd3a16..134590e 100644
--- a/sys/arm/samsung/exynos/files.exynos5
+++ b/sys/arm/samsung/exynos/files.exynos5
@@ -9,7 +9,7 @@ arm/arm/cpufunc_asm_arm10.S			standard
 arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
-arm/arm/bus_space-v6.c				standard
+arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
 arm/arm/generic_timer.c				standard
 
diff --git a/sys/arm/samsung/s3c2xx0/files.s3c2xx0 b/sys/arm/samsung/s3c2xx0/files.s3c2xx0
index eb02fc5..7b6c7e4 100644
--- a/sys/arm/samsung/s3c2xx0/files.s3c2xx0
+++ b/sys/arm/samsung/s3c2xx0/files.s3c2xx0
@@ -1,4 +1,5 @@
 # $FreeBSD$
+arm/arm/bus_space_base.c	standard
 arm/arm/bus_space_asm_generic.S	standard
 arm/arm/bus_space_generic.c	standard
 arm/arm/cpufunc_asm_arm9.S	standard
@@ -6,7 +7,6 @@ arm/samsung/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
 arm/samsung/s3c2xx0/s3c24x0_rtc.c	standard
 arm/samsung/s3c2xx0/s3c24x0_machdep.c	standard
 arm/samsung/s3c2xx0/s3c24x0.c   	standard
-arm/samsung/s3c2xx0/s3c2xx0_space.c	standard
 arm/samsung/s3c2xx0/s3c24x0_clk.c	standard
 arm/samsung/s3c2xx0/uart_bus_s3c2410.c	optional	uart
 arm/samsung/s3c2xx0/uart_cpu_s3c2410.c	optional	uart
diff --git a/sys/arm/samsung/s3c2xx0/s3c24x0.c b/sys/arm/samsung/s3c2xx0/s3c24x0.c
index 49acdc6..845651f 100644
--- a/sys/arm/samsung/s3c2xx0/s3c24x0.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0.c
@@ -56,6 +56,8 @@ __FBSDID("$FreeBSD$");
 
 #define S3C2XX0_XTAL_CLK 12000000
 
+bus_space_tag_t s3c2xx0_bs_tag;
+
 #define IPL_LEVELS 13
 u_int irqmasks[IPL_LEVELS];
 
@@ -349,7 +351,7 @@ s3c24x0_alloc_resource(device_t bus, device_t child, int type, int *rid,
 			panic("Unable to map address space %#lX-%#lX", start,
 			    end);
 
-		rman_set_bustag(res, &s3c2xx0_bs_tag);
+		rman_set_bustag(res, s3c2xx0_bs_tag);
 		rman_set_bushandle(res, start);
 		if (flags & RF_ACTIVE) {
 			if (bus_activate_resource(child, type, *rid, res)) {
@@ -442,8 +444,9 @@ s3c24x0_attach(device_t dev)
 	unsigned int i, j;
 	u_long irqmax;
 
+	s3c2xx0_bs_tag = arm_base_bs_tag;
 	s3c2xx0_softc = &(sc->sc_sx);
-	sc->sc_sx.sc_iot = iot = &s3c2xx0_bs_tag;
+	sc->sc_sx.sc_iot = iot = s3c2xx0_bs_tag;
 	s3c2xx0_softc->s3c2xx0_irq_rman.rm_type = RMAN_ARRAY;
 	s3c2xx0_softc->s3c2xx0_irq_rman.rm_descr = "S3C24X0 IRQs";
 	s3c2xx0_softc->s3c2xx0_mem_rman.rm_type = RMAN_ARRAY;
@@ -641,7 +644,7 @@ cpu_reset(void)
 {
 	(void) disable_interrupts(PSR_I|PSR_F);
 
-	bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_wdt_ioh, WDT_WTCON,
+	bus_space_write_4(s3c2xx0_bs_tag, s3c2xx0_softc->sc_wdt_ioh, WDT_WTCON,
 	    WTCON_ENABLE | WTCON_CLKSEL_16 | WTCON_ENRST);
 	for(;;);
 }
@@ -651,9 +654,9 @@ s3c24x0_sleep(int mode __unused)
 {
 	int reg;
 
-	reg = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_clkman_ioh,
+	reg = bus_space_read_4(s3c2xx0_bs_tag, s3c2xx0_softc->sc_clkman_ioh,
 	    CLKMAN_CLKCON);
-	bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_clkman_ioh,
+	bus_space_write_4(s3c2xx0_bs_tag, s3c2xx0_softc->sc_clkman_ioh,
 	    CLKMAN_CLKCON, reg | CLKCON_IDLE);
 }
 
@@ -664,15 +667,15 @@ arm_get_next_irq(int last __unused)
 	uint32_t intpnd;
 	int irq, subirq;
 
-	if ((irq = bus_space_read_4(&s3c2xx0_bs_tag,
+	if ((irq = bus_space_read_4(s3c2xx0_bs_tag,
 	    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTOFFSET)) != 0) {
 
 		/* Clear the pending bit */
-		intpnd = bus_space_read_4(&s3c2xx0_bs_tag,
+		intpnd = bus_space_read_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTPND);
-		bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh,
+		bus_space_write_4(s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh,
 		    INTCTL_SRCPND, intpnd);
-		bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh,
+		bus_space_write_4(s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh,
 		    INTCTL_INTPND, intpnd);
 
 		switch (irq) {
@@ -682,9 +685,9 @@ arm_get_next_irq(int last __unused)
 		case S3C24X0_INT_UART2:
 			/* Find the sub IRQ */
 			subirq = 0x7ff;
-			subirq &= bus_space_read_4(&s3c2xx0_bs_tag,
+			subirq &= bus_space_read_4(s3c2xx0_bs_tag,
 			    s3c2xx0_softc->sc_intctl_ioh, INTCTL_SUBSRCPND);
-			subirq &= ~(bus_space_read_4(&s3c2xx0_bs_tag,
+			subirq &= ~(bus_space_read_4(s3c2xx0_bs_tag,
 			    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK));
 			if (subirq == 0)
 				return (irq);
@@ -692,7 +695,7 @@ arm_get_next_irq(int last __unused)
 			subirq = ffs(subirq) - 1;
 
 			/* Clear the sub irq pending bit */
-			bus_space_write_4(&s3c2xx0_bs_tag,
+			bus_space_write_4(s3c2xx0_bs_tag,
 			    s3c2xx0_softc->sc_intctl_ioh, INTCTL_SUBSRCPND,
 			    (1 << subirq));
 
@@ -716,9 +719,9 @@ arm_get_next_irq(int last __unused)
 		case S3C24X0_INT_8_23:
 			/* Find the external interrupt being called */
 			subirq = 0x7fffff;
-			subirq &= bus_space_read_4(&s3c2xx0_bs_tag,
+			subirq &= bus_space_read_4(s3c2xx0_bs_tag,
 			    s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTPEND);
-			subirq &= ~bus_space_read_4(&s3c2xx0_bs_tag,
+			subirq &= ~bus_space_read_4(s3c2xx0_bs_tag,
 			    s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTMASK);
 			if (subirq == 0)
 				return (irq);
@@ -726,7 +729,7 @@ arm_get_next_irq(int last __unused)
 			subirq = ffs(subirq) - 1;
 
 			/* Clear the external irq pending bit */
-			bus_space_write_4(&s3c2xx0_bs_tag,
+			bus_space_write_4(s3c2xx0_bs_tag,
 			    s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTPEND,
 			    (1 << subirq));
 
@@ -748,22 +751,22 @@ arm_mask_irq(uintptr_t irq)
 		irq -= S3C24X0_EXTIRQ_MIN;
 	}
 	if (irq < S3C24X0_SUBIRQ_MIN) {
-		mask = bus_space_read_4(&s3c2xx0_bs_tag,
+		mask = bus_space_read_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK);
 		mask |= (1 << irq);
-		bus_space_write_4(&s3c2xx0_bs_tag,
+		bus_space_write_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK, mask);
 	} else if (irq < S3C24X0_EXTIRQ_MIN) {
-		mask = bus_space_read_4(&s3c2xx0_bs_tag,
+		mask = bus_space_read_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK);
 		mask |= (1 << (irq - S3C24X0_SUBIRQ_MIN));
-		bus_space_write_4(&s3c2xx0_bs_tag,
+		bus_space_write_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK, mask);
 	} else {
-		mask = bus_space_read_4(&s3c2xx0_bs_tag,
+		mask = bus_space_read_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTMASK);
 		mask |= (1 << (irq - S3C24X0_EXTIRQ_MIN));
-		bus_space_write_4(&s3c2xx0_bs_tag,
+		bus_space_write_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, GPIO_EINTMASK, mask);
 	}
 }
@@ -778,22 +781,22 @@ arm_unmask_irq(uintptr_t irq)
 		irq -= S3C24X0_EXTIRQ_MIN;
 	}
 	if (irq < S3C24X0_SUBIRQ_MIN) {
-		mask = bus_space_read_4(&s3c2xx0_bs_tag,
+		mask = bus_space_read_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK);
 		mask &= ~(1 << irq);
-		bus_space_write_4(&s3c2xx0_bs_tag,
+		bus_space_write_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK, mask);
 	} else if (irq < S3C24X0_EXTIRQ_MIN) {
-		mask = bus_space_read_4(&s3c2xx0_bs_tag,
+		mask = bus_space_read_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK);
 		mask &= ~(1 << (irq - S3C24X0_SUBIRQ_MIN));
-		bus_space_write_4(&s3c2xx0_bs_tag,
+		bus_space_write_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK, mask);
 	} else {
-		mask = bus_space_read_4(&s3c2xx0_bs_tag,
+		mask = bus_space_read_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTMASK);
 		mask &= ~(1 << (irq - S3C24X0_EXTIRQ_MIN));
-		bus_space_write_4(&s3c2xx0_bs_tag,
+		bus_space_write_4(s3c2xx0_bs_tag,
 		    s3c2xx0_softc->sc_intctl_ioh, GPIO_EINTMASK, mask);
 	}
 }
diff --git a/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c b/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
deleted file mode 100644
index fe01d2b..0000000
--- a/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*	$NetBSD: s3c2xx0_space.c,v 1.7 2005/11/24 13:08:32 yamt Exp $ */
-
-/*
- * Copyright (c) 2002 Fujitsu Component Limited
- * Copyright (c) 2002 Genetec Corporation
- * All rights reserved.
- *
- * 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.
- * 3. Neither the name of The Fujitsu Component Limited nor the name of
- *    Genetec corporation may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY FUJITSU COMPONENT LIMITED AND GENETEC
- * CORPORATION ``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 FUJITSU COMPONENT LIMITED OR GENETEC
- * CORPORATION 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.
- */
-/* derived from sa11x0_io.c */
-
-/*
- * Copyright (c) 1997 Mark Brinicombe.
- * Copyright (c) 1997 Causality Limited.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Ichiro FUKUHARA.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Mark Brinicombe.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-/*
- * bus_space functions for Samsung S3C2800/2400/2410.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <vm/pmap.h>
-#include <vm/vm_page.h>
-#include <vm/vm_extern.h>
-
-#include <machine/bus.h>
-
-/* Prototypes for all the bus_space structure functions */
-bs_protos(generic);
-bs_protos(generic_armv4);
-
-struct bus_space s3c2xx0_bs_tag = {
-	/* cookie */
-	(void *) 0,
-
-	/* mapping/unmapping */
-	generic_bs_map,
-	generic_bs_unmap,
-	generic_bs_subregion,
-
-	/* allocation/deallocation */
-	generic_bs_alloc,	/* not implemented */
-	generic_bs_free,	/* not implemented */
-
-	/* barrier */
-	generic_bs_barrier,
-
-	/* read (single) */
-	generic_bs_r_1,
-	generic_armv4_bs_r_2,
-	generic_bs_r_4,
-	NULL,
-
-	/* read multiple */
-	generic_bs_rm_1,
-	generic_armv4_bs_rm_2,
-	generic_bs_rm_4,
-	NULL,
-
-	/* read region */
-	generic_bs_rr_1,
-	generic_armv4_bs_rr_2,
-	generic_bs_rr_4,
-	NULL,
-
-	/* write (single) */
-	generic_bs_w_1,
-	generic_armv4_bs_w_2,
-	generic_bs_w_4,
-	NULL,
-
-	/* write multiple */
-	generic_bs_wm_1,
-	generic_armv4_bs_wm_2,
-	generic_bs_wm_4,
-	NULL,
-
-	/* write region */
-	generic_bs_wr_1,
-	generic_armv4_bs_wr_2,
-	generic_bs_wr_4,
-	NULL,
-
-	/* set multiple */
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-
-	/* set region */
-	generic_bs_sr_1,
-	generic_armv4_bs_sr_2,
-	NULL,
-	NULL,
-
-	/* copy */
-	NULL,
-	generic_armv4_bs_c_2,
-	NULL,
-	NULL,
-};
-
diff --git a/sys/arm/samsung/s3c2xx0/s3c2xx0var.h b/sys/arm/samsung/s3c2xx0/s3c2xx0var.h
index fea0982..505c6b0 100644
--- a/sys/arm/samsung/s3c2xx0/s3c2xx0var.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2xx0var.h
@@ -74,7 +74,7 @@ struct s3c2xx0_ivar {
 
 typedef void *s3c2xx0_chipset_tag_t;
 
-extern struct bus_space s3c2xx0_bs_tag;
+extern bus_space_tag_t s3c2xx0_bs_tag;
 extern struct s3c2xx0_softc *s3c2xx0_softc;
 extern struct arm32_bus_dma_tag s3c2xx0_bus_dma;
 
diff --git a/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c b/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
index 37b668e..1beb12d 100644
--- a/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
+++ b/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
@@ -61,7 +61,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 
 	di->ops = uart_getops(&uart_s3c2410_class);
 	di->bas.chan = 0;
-	di->bas.bst = &s3c2xx0_bs_tag;
+	di->bas.bst = s3c2xx0_bs_tag;
 	di->bas.bsh = s3c2410_uart_vaddr;
 	di->bas.regshft = 0;
 	di->bas.rclk = s3c2410_pclk;
@@ -69,7 +69,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 	di->databits = 8;
 	di->stopbits = 1;
 	di->parity = UART_PARITY_NONE;
-	uart_bus_space_io = &s3c2xx0_bs_tag;
+	uart_bus_space_io = s3c2xx0_bs_tag;
 	uart_bus_space_mem = NULL;
 	
 	return (0);