Module Name: src
Committed By: jmcneill
Date: Sun Nov 18 20:21:48 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: bus_space.c
src/sys/arch/arm/arm32: armv7_generic_space.c
src/sys/arch/arm/include: bus_defs.h
Log Message:
Add a "bs_base" field to struct bus_space. If present, use it to translate
mappings by appending the value to the pa passed to bus_space_map.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/aarch64/bus_space.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm32/armv7_generic_space.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/bus_defs.h
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/aarch64/aarch64/bus_space.c
diff -u src/sys/arch/aarch64/aarch64/bus_space.c:1.5 src/sys/arch/aarch64/aarch64/bus_space.c:1.6
--- src/sys/arch/aarch64/aarch64/bus_space.c:1.5 Sat Jun 16 13:53:45 2018
+++ src/sys/arch/aarch64/aarch64/bus_space.c Sun Nov 18 20:21:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.5 2018/06/16 13:53:45 jmcneill Exp $ */
+/* $NetBSD: bus_space.c,v 1.6 2018/11/18 20:21:48 jmcneill Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.5 2018/06/16 13:53:45 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.6 2018/11/18 20:21:48 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,6 +46,7 @@ bs_protos(generic_dsb)
struct bus_space arm_generic_bs_tag = {
.bs_cookie = &arm_generic_bs_tag,
+ .bs_base = 0,
.bs_stride = 0,
.bs_flags = 0,
@@ -168,6 +169,7 @@ struct bus_space arm_generic_bs_tag = {
struct bus_space aarch64_generic_dsb_bs_tag = {
.bs_cookie = &aarch64_generic_dsb_bs_tag,
+ .bs_base = 0,
.bs_stride = 0,
.bs_flags = 0,
@@ -290,6 +292,7 @@ struct bus_space aarch64_generic_dsb_bs_
struct bus_space arm_generic_a4x_bs_tag = {
.bs_cookie = &arm_generic_a4x_bs_tag,
+ .bs_base = 0,
.bs_stride = 2,
.bs_flags = 0,
@@ -412,6 +415,7 @@ struct bus_space arm_generic_a4x_bs_tag
struct bus_space aarch64_generic_a4x_dsb_bs_tag = {
.bs_cookie = &aarch64_generic_a4x_dsb_bs_tag,
+ .bs_base = 0,
.bs_stride = 2,
.bs_flags = 0,
@@ -535,11 +539,15 @@ int
generic_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
bus_space_handle_t *bshp)
{
+ const struct bus_space *bs = t;
const struct pmap_devmap *pd;
paddr_t startpa, endpa, pa;
vaddr_t va;
int pmapflags;
+ if (bs)
+ bpa += bs->bs_base;
+
if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
*bshp = pd->pd_va + (bpa - pd->pd_pa);
return 0;
Index: src/sys/arch/arm/arm32/armv7_generic_space.c
diff -u src/sys/arch/arm/arm32/armv7_generic_space.c:1.8 src/sys/arch/arm/arm32/armv7_generic_space.c:1.9
--- src/sys/arch/arm/arm32/armv7_generic_space.c:1.8 Sun Apr 1 04:35:03 2018
+++ src/sys/arch/arm/arm32/armv7_generic_space.c Sun Nov 18 20:21:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: armv7_generic_space.c,v 1.8 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: armv7_generic_space.c,v 1.9 2018/11/18 20:21:48 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armv7_generic_space.c,v 1.8 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armv7_generic_space.c,v 1.9 2018/11/18 20:21:48 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -291,11 +291,15 @@ int
armv7_generic_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
bus_space_handle_t *bshp)
{
+ const struct bus_space *bs = t;
u_long startpa, endpa, pa;
const struct pmap_devmap *pd;
int pmapflags;
vaddr_t va;
+ if (bs)
+ bpa += bs->bs_base;
+
if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
/* Device was statically mapped. */
*bshp = pd->pd_va + (bpa - pd->pd_pa);
Index: src/sys/arch/arm/include/bus_defs.h
diff -u src/sys/arch/arm/include/bus_defs.h:1.11 src/sys/arch/arm/include/bus_defs.h:1.12
--- src/sys/arch/arm/include/bus_defs.h:1.11 Sun Apr 1 04:35:04 2018
+++ src/sys/arch/arm/include/bus_defs.h Sun Nov 18 20:21:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.11 2018/04/01 04:35:04 ryo Exp $ */
+/* $NetBSD: bus_defs.h,v 1.12 2018/11/18 20:21:48 jmcneill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -102,6 +102,7 @@ struct bus_space {
void *bs_cookie;
/* used for aarch64. require ".bs_cookie = bus_space" */
+ bus_addr_t bs_base;
int bs_stride; /* offset <<= bs_stride (if needed) */
int bs_flags;
