Module Name:src
Committed By: martin
Date: Tue Jan 16 14:21:10 UTC 2018
Modified Files:
src/sys/arch/arm/broadcom [netbsd-8]: bcm2835_space.c
Log Message:
Pull up the following revisions, requested by skrll in #408:
sys/arch/arm/broadcom/bcm2835_space.c 1.12-1.13
Sync with armv7_generic_space.c
- big endian support (probably not needed)
- a4x subreagion/mmap support
- fix some a4x stream methods
- add UVM_KMF_COLORMATCH in bs_map when allocating KVA
- support BUS_SPACE_MAP_PREFETCHABLE
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.10.1 src/sys/arch/arm/broadcom/bcm2835_space.c
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/arm/broadcom/bcm2835_space.c
diff -u src/sys/arch/arm/broadcom/bcm2835_space.c:1.10 src/sys/arch/arm/broadcom/bcm2835_space.c:1.10.10.1
--- src/sys/arch/arm/broadcom/bcm2835_space.c:1.10 Tue Feb 2 13:55:50 2016
+++ src/sys/arch/arm/broadcom/bcm2835_space.c Tue Jan 16 14:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_space.c,v 1.10 2016/02/02 13:55:50 skrll Exp $ */
+/* $NetBSD: bcm2835_space.c,v 1.10.10.1 2018/01/16 14:21:10 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.10 2016/02/02 13:55:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.10.10.1 2018/01/16 14:21:10 martin Exp $");
#include
#include
@@ -51,6 +51,12 @@ bs_protos(generic_armv4);
bs_protos(a4x);
bs_protos(bs_notimpl);
+#if __ARMEB__
+#define NSWAP(n) n ## _swap
+#else
+#define NSWAP(n) n
+#endif
+
struct bus_space bcm2835_bs_tag = {
/* cookie */
(void *) 0,
@@ -75,38 +81,38 @@ struct bus_space bcm2835_bs_tag = {
/* read (single) */
generic_bs_r_1,
- generic_armv4_bs_r_2,
- generic_bs_r_4,
+ NSWAP(generic_armv4_bs_r_2),
+ NSWAP(generic_bs_r_4),
bs_notimpl_bs_r_8,
/* read multiple */
generic_bs_rm_1,
- generic_armv4_bs_rm_2,
- generic_bs_rm_4,
+ NSWAP(generic_armv4_bs_rm_2),
+ NSWAP(generic_bs_rm_4),
bs_notimpl_bs_rm_8,
/* read region */
generic_bs_rr_1,
- generic_armv4_bs_rr_2,
- generic_bs_rr_4,
+ NSWAP(generic_armv4_bs_rr_2),
+ NSWAP(generic_bs_rr_4),
bs_notimpl_bs_rr_8,
/* write (single) */
generic_bs_w_1,
- generic_armv4_bs_w_2,
- generic_bs_w_4,
+ NSWAP(generic_armv4_bs_w_2),
+ NSWAP(generic_bs_w_4),
bs_notimpl_bs_w_8,
/* write multiple */
generic_bs_wm_1,
- generic_armv4_bs_wm_2,
- generic_bs_wm_4,
+ NSWAP(generic_armv4_bs_wm_2),
+ NSWAP(generic_bs_wm_4),
bs_notimpl_bs_wm_8,
/* write region */
generic_bs_wr_1,
- generic_armv4_bs_wr_2,
- generic_bs_wr_4,
+ NSWAP(generic_armv4_bs_wr_2),
+ NSWAP(generic_bs_wr_4),
bs_notimpl_bs_wr_8,
/* set multiple */
@@ -117,8 +123,8 @@ struct bus_space bcm2835_bs_tag = {
/* set region */
generic_bs_sr_1,
- generic_armv4_bs_sr_2,
- bs_notimpl_bs_sr_4,
+ NSWAP(generic_armv4_bs_sr_2),
+ NSWAP(generic_bs_sr_4),
bs_notimpl_bs_sr_8,
/* copy */
@@ -130,38 +136,38 @@ struct bus_space bcm2835_bs_tag = {
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
/* read (single) */
generic_bs_r_1,
- generic_armv4_bs_r_2,
- generic_bs_r_4,
+ NSWAP(generic_armv4_bs_r_2),
+ NSWAP(generic_bs_r_4),
bs_notimpl_bs_r_8,
/* read multiple */
generic_bs_rm_1,
- generic_armv4_bs_rm_2,
- generic_bs_rm_4,
+ NSWAP(generic_armv4_bs_rm_2),
+ NSWAP(generic_bs_rm_4),
bs_notimpl_bs_rm_8,
/* read region */
generic_bs_rr_1,
- generic_armv4_bs_rr_2,
- generic_bs_rr_4,
+ NSWAP(generic_armv4_bs_rr_2),
+ NSWAP(generic_bs_rr_4),
bs_notimpl_bs_rr_8,
/* write (single) */
generic_bs_w_1,
- generic_armv4_bs_w_2,
- generic_bs_w_4,
+ NSWAP(generic_armv4_bs_w_2),
+ NSWAP(generic_bs_w_4),
bs_notimpl_bs_w_8,
/* write multiple */
generic_bs_wm_1,
- generic_armv4_bs_wm_2,
- generic_bs_wm_4,
+ NSWAP(generic_armv4_bs_wm_2),
+ NSWAP(generic_bs_wm_4),
bs_notimpl_bs_wm_8,
/* write region */
generic_bs_wr_1,
- generic_armv4_bs_wr_2,
- generic_bs_wr_4,
+ NSWAP(generic_armv4_bs_wr_2),
+ NSWAP(generic_bs_wr_4),
bs_notimpl_bs_wr_8,
#endif
};
@@ -173,7 +179,7 @@ struct bus_space bcm2835_a4x_bs_tag = {
/* mapping/unmapping */
bcm2835_bs_map,
bcm2835_bs_unmap,
- bcm2835_bs_subregion,
+ bcm2835_a4x_bs_subregion,
/* allocation/deallocation */
bcm2835_bs_alloc, /* not implemented */
@@ -183,21 +189,21 @@ struct bus_space bcm2835_a4x_bs_tag = {
bcm2835_bs_vaddr,
/* mmap */
- bs_notimpl_bs_mmap,
+ bcm2835_a4x_bs_mmap,
/* barrier */
bcm2835_bs_barrier,
/* read (single) */
a4x_bs_r_1,
- a4x_bs_r_2,
- a4x_bs_r_4,
+ NSWAP(a4x_bs_r_2),
+ NSWAP(a4x_bs_r_4),
bs_notimpl_bs_r_8,
/* read multiple */
a4x_bs_rm_1,
- a4x_bs_rm_2,
- a4x_bs_rm_4,
+ NSWAP(a4x_bs_rm_2),
+ NSWAP(a4x_bs_rm_4),
bs_notimpl_bs_rm_8,
/* read region */
@@ -208,15 +214,16 @@ struct bus_space bcm2835_a4x_bs_tag = {
/* write (single) */
a4x_bs_w_1,