Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Use shared armv7_generic_space
details: https://anonhg.NetBSD.org/src/rev/739cbe6d2b72
branches: trunk
changeset: 807148:739cbe6d2b72
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Sun Mar 29 22:49:44 2015 +0000
description:
Use shared armv7_generic_space
diffstat:
sys/arch/arm/amlogic/amlogic_board.c | 14 +-
sys/arch/arm/amlogic/amlogic_cpufreq.c | 8 +-
sys/arch/arm/amlogic/amlogic_io.c | 8 +-
sys/arch/arm/amlogic/amlogic_space.c | 416 ----------------------------
sys/arch/arm/amlogic/amlogic_var.h | 6 +-
sys/arch/arm/amlogic/files.amlogic | 6 +-
sys/arch/arm/rockchip/files.rockchip | 7 +-
sys/arch/arm/rockchip/obio.c | 14 +-
sys/arch/arm/rockchip/rockchip_board.c | 30 +-
sys/arch/arm/rockchip/rockchip_cpufreq.c | 6 +-
sys/arch/arm/rockchip/rockchip_space.c | 416 ----------------------------
sys/arch/arm/rockchip/rockchip_var.h | 6 +-
sys/arch/evbarm/amlogic/amlogic_machdep.c | 22 +-
sys/arch/evbarm/rockchip/rockchip_machdep.c | 26 +-
14 files changed, 76 insertions(+), 909 deletions(-)
diffs (truncated from 1446 to 300 lines):
diff -r e978a3155b2e -r 739cbe6d2b72 sys/arch/arm/amlogic/amlogic_board.c
--- a/sys/arch/arm/amlogic/amlogic_board.c Sun Mar 29 22:27:04 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_board.c Sun Mar 29 22:49:44 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_board.c,v 1.9 2015/03/08 12:44:55 jmcneill Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.10 2015/03/29 22:49:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
#include "opt_amlogic.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.9 2015/03/08 12:44:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.10 2015/03/29 22:49:44 jmcneill Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -55,14 +55,14 @@
};
#define CBUS_READ(x) \
- bus_space_read_4(&amlogic_bs_tag, amlogic_core_bsh, \
+ bus_space_read_4(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x))
#define CBUS_WRITE(x, v) \
- bus_space_write_4(&amlogic_bs_tag, amlogic_core_bsh, \
+ bus_space_write_4(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x), (v))
#define CBUS_SET_CLEAR(x, s, c) \
- amlogic_reg_set_clear(&amlogic_bs_tag, amlogic_core_bsh, \
+ amlogic_reg_set_clear(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x), (s), (c))
void
@@ -70,7 +70,7 @@
{
int error;
- error = bus_space_map(&amlogic_bs_tag, AMLOGIC_CORE_BASE,
+ error = bus_space_map(&armv7_generic_bs_tag, AMLOGIC_CORE_BASE,
AMLOGIC_CORE_SIZE, 0, &amlogic_core_bsh);
if (error)
panic("%s: failed to map CORE registers: %d", __func__, error);
@@ -260,7 +260,7 @@
void
amlogic_usbphy_init(int port)
{
- bus_space_tag_t bst = &amlogic_bs_tag;
+ bus_space_tag_t bst = &armv7_generic_bs_tag;
bus_space_handle_t bsh = amlogic_core_bsh;
bus_size_t ctrl_reg, cfg_reg, adp_bc_reg, gpioao_reg;
uint32_t ctrl, cfg, adp_bc, gpioao;
diff -r e978a3155b2e -r 739cbe6d2b72 sys/arch/arm/amlogic/amlogic_cpufreq.c
--- a/sys/arch/arm/amlogic/amlogic_cpufreq.c Sun Mar 29 22:27:04 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_cpufreq.c Sun Mar 29 22:49:44 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_cpufreq.c,v 1.2 2015/03/17 22:29:40 jmcneill Exp $ */
+/* $NetBSD: amlogic_cpufreq.c,v 1.3 2015/03/29 22:49:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
#include "opt_amlogic.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_cpufreq.c,v 1.2 2015/03/17 22:29:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_cpufreq.c,v 1.3 2015/03/29 22:49:44 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -68,10 +68,10 @@
static size_t meson8b_cpu_get_available(u_int *, size_t);
#define CBUS_READ(x) \
- bus_space_read_4(&amlogic_bs_tag, amlogic_core_bsh, \
+ bus_space_read_4(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x))
#define CBUS_WRITE(x, v) \
- bus_space_write_4(&amlogic_bs_tag, amlogic_core_bsh, \
+ bus_space_write_4(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x), (v))
void
diff -r e978a3155b2e -r 739cbe6d2b72 sys/arch/arm/amlogic/amlogic_io.c
--- a/sys/arch/arm/amlogic/amlogic_io.c Sun Mar 29 22:27:04 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_io.c Sun Mar 29 22:49:44 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_io.c,v 1.8 2015/03/22 17:28:22 jmcneill Exp $ */
+/* $NetBSD: amlogic_io.c,v 1.9 2015/03/29 22:49:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
#include "opt_amlogic.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_io.c,v 1.8 2015/03/22 17:28:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_io.c,v 1.9 2015/03/29 22:49:44 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,8 +107,8 @@
loc++) {
struct amlogicio_attach_args aio = {
.aio_loc = *loc,
- .aio_core_bst = &amlogic_bs_tag,
- .aio_core_a4x_bst = &amlogic_a4x_bs_tag,
+ .aio_core_bst = &armv7_generic_bs_tag,
+ .aio_core_a4x_bst = &armv7_generic_a4x_bs_tag,
.aio_bsh = amlogic_core_bsh,
.aio_dmat = &amlogic_dma_tag,
};
diff -r e978a3155b2e -r 739cbe6d2b72 sys/arch/arm/amlogic/amlogic_space.c
--- a/sys/arch/arm/amlogic/amlogic_space.c Sun Mar 29 22:27:04 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,416 +0,0 @@
-/* $NetBSD: amlogic_space.c,v 1.2 2015/02/25 13:52:42 joerg 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: amlogic_space.c,v 1.2 2015/02/25 13:52:42 joerg 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(amlogic);
-bs_protos(amlogic_a4x);
-bs_protos(a4x);
-bs_protos(bs_notimpl);
-bs_protos(generic);
-bs_protos(generic_armv4);
-
-#if __ARMEB__
-#define NSWAP(n) n ## _swap
-#else
-#define NSWAP(n) n
-#endif
-
-struct bus_space amlogic_bs_tag = {
- /* cookie */
- (void *) 0,
-
- /* mapping/unmapping */
- amlogic_bs_map,
- amlogic_bs_unmap,
- amlogic_bs_subregion,
-
- /* allocation/deallocation */
- amlogic_bs_alloc, /* not implemented */
- amlogic_bs_free, /* not implemented */
-
- /* get kernel virtual address */
- amlogic_bs_vaddr,
-
- /* mmap */
- amlogic_bs_mmap,
-
- /* barrier */
- amlogic_bs_barrier,
-
- /* read (single) */
- generic_bs_r_1,
- NSWAP(generic_armv4_bs_r_2),
- NSWAP(generic_bs_r_4),
- bs_notimpl_bs_r_8,
-
- /* read multiple */
- generic_bs_rm_1,
- NSWAP(generic_armv4_bs_rm_2),
- NSWAP(generic_bs_rm_4),
- bs_notimpl_bs_rm_8,
-
- /* read region */
- generic_bs_rr_1,
- NSWAP(generic_armv4_bs_rr_2),
- NSWAP(generic_bs_rr_4),
- bs_notimpl_bs_rr_8,
-
- /* write (single) */
- generic_bs_w_1,
- NSWAP(generic_armv4_bs_w_2),
- NSWAP(generic_bs_w_4),
- bs_notimpl_bs_w_8,
-
- /* write multiple */
- generic_bs_wm_1,
- NSWAP(generic_armv4_bs_wm_2),
- NSWAP(generic_bs_wm_4),
- bs_notimpl_bs_wm_8,
-
- /* write region */
- generic_bs_wr_1,
- NSWAP(generic_armv4_bs_wr_2),
- NSWAP(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,
- NSWAP(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,
- NSWAP(generic_armv4_bs_r_2),
- NSWAP(generic_bs_r_4),
- bs_notimpl_bs_r_8,
-
- /* read multiple */
- generic_bs_rm_1,
- NSWAP(generic_armv4_bs_rm_2),
- NSWAP(generic_bs_rm_4),
- bs_notimpl_bs_rm_8,
-
- /* read region */
- generic_bs_rr_1,
- NSWAP(generic_armv4_bs_rr_2),
- NSWAP(generic_bs_rr_4),
- bs_notimpl_bs_rr_8,
-
- /* write (single) */
- generic_bs_w_1,
- NSWAP(generic_armv4_bs_w_2),
- NSWAP(generic_bs_w_4),
- bs_notimpl_bs_w_8,
-
- /* write multiple */
- generic_bs_wm_1,
- NSWAP(generic_armv4_bs_wm_2),
- NSWAP(generic_bs_wm_4),
- bs_notimpl_bs_wm_8,
-
- /* write region */
- generic_bs_wr_1,
- NSWAP(generic_armv4_bs_wr_2),
- NSWAP(generic_bs_wr_4),
- bs_notimpl_bs_wr_8,
-#endif
-};
-
-struct bus_space amlogic_a4x_bs_tag = {
- /* cookie */
- (void *) 0,
-
- /* mapping/unmapping */
- amlogic_bs_map,
- amlogic_bs_unmap,
- amlogic_a4x_bs_subregion,
-
- /* allocation/deallocation */
- amlogic_bs_alloc, /* not implemented */
Home |
Main Index |
Thread Index |
Old Index