 @@ -1,391 +1,395 @@
-/*	$NetBSD: bcm2835_space.c,v 1.3 2013/01/13 06:10:25 skrll Exp $	*/
+/*	$NetBSD: bcm2835_space.c,v 1.4 2013/01/23 16:51:14 macallan 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.
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.3 2013/01/13 06:10:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.4 2013/01/23 16:51:14 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.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 */
 	bcm2835_bs_map,
 	bcm2835_bs_unmap,
 	bcm2835_bs_subregion,
 	/* allocation/deallocation */
 	bcm2835_bs_alloc,	/* not implemented */
 	bcm2835_bs_free,	/* not implemented */
 	/* get kernel virtual address */
 	bcm2835_bs_vaddr,
 	/* mmap */
 	bcm2835_bs_mmap,
 	/* barrier */
 	bcm2835_bs_barrier,
 	/* read (single) */
 	generic_bs_r_1,
 	generic_armv4_bs_r_2,
 	generic_bs_r_4,
 	bs_notimpl_bs_r_8,
 	/* read multiple */
 	generic_bs_rm_1,
 	generic_armv4_bs_rm_2,
 	generic_bs_rm_4,
 	bs_notimpl_bs_rm_8,
 	/* read region */
 	generic_bs_rr_1,
 	generic_armv4_bs_rr_2,
 	generic_bs_rr_4,
 	bs_notimpl_bs_rr_8,
 	/* write (single) */
 	generic_bs_w_1,
 	generic_armv4_bs_w_2,
 	generic_bs_w_4,
 	bs_notimpl_bs_w_8,
 	/* write multiple */
 	generic_bs_wm_1,
 	generic_armv4_bs_wm_2,
 	generic_bs_wm_4,
 	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,
 	/* set multiple */
 	bs_notimpl_bs_sm_1,
 	bs_notimpl_bs_sm_2,
 	bs_notimpl_bs_sm_4,
 	bs_notimpl_bs_sm_8,
 	/* set region */
 	generic_bs_sr_1,
 	generic_armv4_bs_sr_2,
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	generic_armv4_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 #ifdef __BUS_SPACE_HAS_STREAM_METHODS
 	/* read (single) */
 	generic_bs_r_1,
 	generic_armv4_bs_r_2,
 	generic_bs_r_4,
 	bs_notimpl_bs_r_8,
 	/* read multiple */
 	generic_bs_rm_1,
 	generic_armv4_bs_rm_2,
 	generic_bs_rm_4,
 	bs_notimpl_bs_rm_8,
 	/* read region */
 	generic_bs_rr_1,
 	generic_armv4_bs_rr_2,
 	generic_bs_rr_4,
 	bs_notimpl_bs_rr_8,
 	/* write (single) */
 	generic_bs_w_1,
 	generic_armv4_bs_w_2,
 	generic_bs_w_4,
 	bs_notimpl_bs_w_8,
 	/* write multiple */
 	generic_bs_wm_1,
 	generic_armv4_bs_wm_2,
 	generic_bs_wm_4,
 	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
 };
 struct bus_space bcm2835_a4x_bs_tag = {
 	/* cookie */
 	(void *) 0,
 	/* mapping/unmapping */
 	bcm2835_bs_map,
 	bcm2835_bs_unmap,
 	bcm2835_bs_subregion,
 	/* allocation/deallocation */
 	bcm2835_bs_alloc,	/* not implemented */
 	bcm2835_bs_free,	/* not implemented */
 	/* get kernel virtual address */
 	bcm2835_bs_vaddr,
 	/* mmap */
 	bs_notimpl_bs_mmap,
 	/* barrier */
 	bcm2835_bs_barrier,
 	/* read (single) */
 	a4x_bs_r_1,
 	a4x_bs_r_2,
 	a4x_bs_r_4,
 	bs_notimpl_bs_r_8,
 	/* read multiple */
 	a4x_bs_rm_1,
 	a4x_bs_rm_2,
 	a4x_bs_rm_4,
 	bs_notimpl_bs_rm_8,
 	/* read region */
 	bs_notimpl_bs_rr_1,
 	bs_notimpl_bs_rr_2,
 	bs_notimpl_bs_rr_4,
 	bs_notimpl_bs_rr_8,
 	/* write (single) */
 	a4x_bs_w_1,
 	a4x_bs_w_2,
 	a4x_bs_w_4,
 	bs_notimpl_bs_w_8,
 	/* write multiple */
 	a4x_bs_wm_1,
 	a4x_bs_wm_2,
 	a4x_bs_wm_4,
 	bs_notimpl_bs_wm_8,
 	/* write region */
 	bs_notimpl_bs_wr_1,
 	bs_notimpl_bs_wr_2,
 	bs_notimpl_bs_wr_4,
 	bs_notimpl_bs_wr_8,
 	/* set multiple */
 	bs_notimpl_bs_sm_1,
 	bs_notimpl_bs_sm_2,
 	bs_notimpl_bs_sm_4,
 	bs_notimpl_bs_sm_8,
 	/* set region */
 	bs_notimpl_bs_sr_1,
 	bs_notimpl_bs_sr_2,
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	bs_notimpl_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 #ifdef __BUS_SPACE_HAS_STREAM_METHODS
 	/* read (single) */
 	generic_bs_r_1,
 	generic_armv4_bs_r_2,
 	generic_bs_r_4,
 	bs_notimpl_bs_r_8,
 	/* read multiple */
 	generic_bs_rm_1,
 	generic_armv4_bs_rm_2,
 	generic_bs_rm_4,
 	bs_notimpl_bs_rm_8,
 	/* read region */
 	generic_bs_rr_1,
 	generic_armv4_bs_rr_2,
 	generic_bs_rr_4,
 	bs_notimpl_bs_rr_8,
 	/* write (single) */
 	generic_bs_w_1,
 	generic_armv4_bs_w_2,
 	generic_bs_w_4,
 	bs_notimpl_bs_w_8,
 	/* write multiple */
 	generic_bs_wm_1,
 	generic_armv4_bs_wm_2,
 	generic_bs_wm_4,
 	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,
     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) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return 0;
+	}
 	startpa = trunc_page(bpa);
 	endpa = round_page(bpa + 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));
 	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)
+{
 	vaddr_t	va;
 	vsize_t	sz;
 	if (pmap_devmap_find_va(bsh, size) != NULL) {
 		/* Device was statically mapped; nothing to do. */
 		return;
+	}
 	va = trunc_page(bsh);
 	sz = round_page(bsh + size) - va;
 	pmap_kremove(va, sz);
 	pmap_update(pmap_kernel());
 	uvm_km_free(kernel_map, va, sz, UVM_KMF_VAONLY);
+}
 int
 bcm2835_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset,
     bus_size_t size, bus_space_handle_t *nbshp)
+{
 	*nbshp = bsh + offset;
 	return (0);
+}
 void
 bcm2835_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset,
     bus_size_t len, int flags)
+{
 	flags &= BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE;
 	if (flags) {
 		/* Issue an ARM11 Data Syncronisation Barrier (DSB) */
 		__asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)
 		    : "memory");
 		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)
+{
 	paddr_t bus_flags = 0;
-	return (arm_btop((paddr + offset)));
+	if (flags & BUS_SPACE_MAP_PREFETCHABLE)
 		bus_flags |= ARM32_MMAP_WRITECOMBINE;
 	return (arm_btop(paddr + 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)
+{
 	panic("%s(): not implemented\n", __func__);
+}