 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm2835_obio.c,v 1.12 2013/01/25 00:04:06 jmcneill Exp $	*/
+/*	$NetBSD: bcm2835_obio.c,v 1.13 2013/01/26 08:01:49 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.12 2013/01/25 00:04:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.13 2013/01/26 08:01:49 skrll Exp $");
 #include "locators.h"
 #include "obio.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <arm/broadcom/bcm2835reg.h>
 #include <arm/broadcom/bcm_amba.h>
 @@ -171,27 +171,27 @@ obio_attach(device_t parent, device_t se
 	const struct ambadev_locators *ad = bcm2835_ambadev_locs;
 	struct amba_attach_args aaa;
 	int locs[OBIOCF_NLOCS];
 	if (obio_attached)
 		return;
 	obio_attached = true;
 	sc->sc_dev = self;
 	sc->sc_dmat = &bcm2835_bus_dma_tag;
 	sc->sc_dmarange.dr_sysbase = 0;
-	sc->sc_dmarange.dr_busbase = 0xc0000000;	/* 0x40000000 if L2 */
+	sc->sc_dmarange.dr_busbase = BCM2835_BUSADDR_CACHE_COHERENT;
 	sc->sc_dmarange.dr_len = physmem * PAGE_SIZE;
 	bcm2835_bus_dma_tag._ranges = &sc->sc_dmarange;
 	bcm2835_bus_dma_tag._nranges = 1;
 	aprint_normal("\n");
 	/* Set up the attach args. */
 	aaa.aaa_iot = &bcm2835_bs_tag;
 	aaa.aaa_dmat = sc->sc_dmat;
 	for (; ad->ad_name != NULL; ad++) {
 		aprint_debug("dev=%s[%u], addr=%lx:+%lx\n",
 		    ad->ad_name, ad->ad_instance, ad->ad_addr, ad->ad_size);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm2835_space.c,v 1.4 2013/01/23 16:51:14 macallan Exp $	*/
+/*	$NetBSD: bcm2835_space.c,v 1.5 2013/01/26 08:01:49 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -21,35 +21,37 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.4 2013/01/23 16:51:14 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.5 2013/01/26 08:01:49 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <arm/broadcom/bcm2835reg.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(bcm2835);
 bs_protos(bcm2835_a4x);
 bs_protos(generic);
 bs_protos(generic_armv4);
 bs_protos(a4x);
 bs_protos(bs_notimpl);
 struct bus_space bcm2835_bs_tag = {
 	/* cookie */
 	(void *) 0,
 	/* mapping/unmapping */
 @@ -270,51 +272,54 @@ struct bus_space bcm2835_a4x_bs_tag = {
 	bs_notimpl_bs_wm_8,
 	/* write region */
 	generic_bs_wr_1,
 	generic_armv4_bs_wr_2,
 	generic_bs_wr_4,
 	bs_notimpl_bs_wr_8,
 #endif
 };
 int
-bcm2835_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
+bcm2835_bs_map(void *t, bus_addr_t ba, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	u_long startpa, endpa, pa;
 	vaddr_t va;
 	const struct pmap_devmap *pd;
 	int pmap_flags;
-	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
+	pa = ba & ~BCM2835_BUSADDR_CACHE_MASK;
 	/* this does device addresses */
 	if ((pd = pmap_devmap_find_pa(pa, size)) != NULL) {
 		/* Device was statically mapped. */
-		*bshp = pd->pd_va + (bpa - pd->pd_pa);
+		*bshp = pd->pd_va + (pa - pd->pd_pa);
 		return 0;
+	}
-	startpa = trunc_page(bpa);
+	startpa = trunc_page(pa);
-	endpa = round_page(bpa + size);
+	endpa = round_page(pa + size);
 	/* XXX use extent manager to check duplicate mapping */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (!va)
 		return ENOMEM;
-	*bshp = (bus_space_handle_t)(va + (bpa - startpa));
+	*bshp = (bus_space_handle_t)(va + (pa - startpa));
 	pmap_flags = (flag & BUS_SPACE_MAP_CACHEABLE) ? 0 : PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
 		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE,
 		    pmap_flags);
+	}
 	pmap_update(pmap_kernel());
 	return 0;
+}
 void
 bcm2835_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
 @@ -358,34 +363,35 @@ bcm2835_bs_barrier(void *t, bus_space_ha
 		return;
+	}
+}
 void *
 bcm2835_bs_vaddr(void *t, bus_space_handle_t bsh)
+{
 	return (void *)bsh;
+}
 paddr_t
-bcm2835_bs_mmap(void *t, bus_addr_t paddr, off_t offset, int prot, int flags)
+bcm2835_bs_mmap(void *t, bus_addr_t ba, off_t offset, int prot, int flags)
+{
 	paddr_t pa = ba & ~BCM2835_BUSADDR_CACHE_MASK;
 	paddr_t bus_flags = 0;
 	if (flags & BUS_SPACE_MAP_PREFETCHABLE)
 		bus_flags |= ARM32_MMAP_WRITECOMBINE;
-	return (arm_btop(paddr + offset) | bus_flags);
+	return (arm_btop(pa + offset) | bus_flags);
+}
 int
 bcm2835_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
     bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
     bus_addr_t *bpap, bus_space_handle_t *bshp)
+{
 	panic("%s(): not implemented\n", __func__);
+}
 void
 bcm2835_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm2835reg.h,v 1.8 2013/01/25 00:04:06 jmcneill Exp $	*/
+/*	$NetBSD: bcm2835reg.h,v 1.9 2013/01/26 08:01:49 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -67,26 +67,32 @@
 #define	BCM2835_GPIO_SIZE	0x1000
 #define	BCM2835_UART0_SIZE	0x90
 #define	BCM2835_PCM_SIZE	0x1000
 #define	BCM2835_SPI0_SIZE	0x1000
 #define	BCM2835_BSC_SIZE	0x1000
 #define	BCM2835_AUX_SIZE	0x1000
 #define	BCM2835_EMMC_SIZE	0x1000
 #define	BCM2835_USB_SIZE	0x20000
 #define	BCM2835_DMA15_SIZE	0x100
 #define BCM2835_IOPHYSTOVIRT(a) \
     ((0xf0000000 | (((a) & 0xf0000000) >> 4)) + ((a) & ~0xf0000000))
 #define	BCM2835_BUSADDR_CACHE_MASK	0xc0000000
 #define	BCM2835_BUSADDR_CACHE_COHERENT	0x40000000
 #define	BCM2835_BUSADDR_CACHE_L1L2	0x00000000
 #define	BCM2835_BUSADDR_CACHE_L2ONLY	0x80000000
 #define	BCM2835_BUSADDR_CACHE_DIRECT	0xc0000000
 #define	BCM2835_PERIPHERALS_VBASE \
 	BCM2835_IOPHYSTOVIRT(BCM2835_PERIPHERALS_BASE)
 #define	BCM2835_STIMER_VBASE	BCM2835_IOPHYSTOVIRT(BCM2835_ST_BASE)
 #define	BCM2835_PM_VBASE	BCM2835_IOPHYSTOVIRT(BCM2835_PM_BASE)
 #define	BCM2835_UART0_VBASE	BCM2835_IOPHYSTOVIRT(BCM2835_UART0_BASE)
 #define	BCM2835_EMMC_VBASE	BCM2835_IOPHYSTOVIRT(BCM2835_EMMC_BASE)
 #define	BCM2835_ARMICU_BASE	(BCM2835_ARM_BASE + 0x0200)
 #define	BCM2835_ARMICU_SIZE	0x200
 #define	BCM2835_ARMMBOX_BASE	(BCM2835_ARM_BASE + 0x0880)
 #define	BCM2835_ARMMBOX_SIZE	0x40