Hi,
diff to get rid of bus_space_asm_generic.S, changing a4x bus space
to use armv7 bs, which might be considered a bug fix, since generic_
misses the v7 "dsb sy"s, and does add the six missing ones to a4x.
unfortunately some less useless bus_dma_tags&whitespace fixes snuck in.
-Artturi
diff --git a/sys/arch/arm/arm/bus_space_asm_generic.S
b/sys/arch/arm/arm/bus_space_asm_generic.S
deleted file mode 100644
index 97b71a5cecc..00000000000
--- a/sys/arch/arm/arm/bus_space_asm_generic.S
+++ /dev/null
@@ -1,336 +0,0 @@
-/* $OpenBSD: bus_space_asm_generic.S,v 1.5 2017/01/06 00:06:02 jsg Exp $
*/
-/* $NetBSD: bus_space_asm_generic.S,v 1.3 2003/03/27 19:46:14 mycroft Exp
$ */
-
-/*
- * Copyright (c) 1997 Causality Limited.
- * Copyright (c) 1997 Mark Brinicombe.
- * All rights reserved.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Mark Brinicombe
- * for the NetBSD Project.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 <arm/asm.h>
-#include <arm/cpuconf.h>
-
-/*
- * Generic bus_space functions.
- */
-
-/*
- * read single
- */
-
-ENTRY(generic_bs_r_1)
- ldrb r0, [r1, r2]
- mov pc, lr
-
-ENTRY(generic_armv4_bs_r_2)
- ldrh r0, [r1, r2]
- mov pc, lr
-
-ENTRY(generic_bs_r_4)
- ldr r0, [r1, r2]
- mov pc, lr
-
-/*
- * write single
- */
-
-ENTRY(generic_bs_w_1)
- strb r3, [r1, r2]
- mov pc, lr
-
-ENTRY(generic_armv4_bs_w_2)
- strh r3, [r1, r2]
- mov pc, lr
-
-ENTRY(generic_bs_w_4)
- str r3, [r1, r2]
- mov pc, lr
-
-/*
- * read multiple
- */
-
-ENTRY(generic_bs_rm_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrb r3, [r0]
- strb r3, [r1], #1
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_rm_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrh r3, [r0]
- strh r3, [r1], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_rm_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldr r3, [r0]
- str r3, [r1], #4
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * write multiple
- */
-
-ENTRY(generic_bs_wm_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrb r3, [r1], #1
- strb r3, [r0]
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_wm_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrh r3, [r1], #2
- strh r3, [r0]
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_wm_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldr r3, [r1], #4
- str r3, [r0]
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * read region
- */
-
-ENTRY(generic_bs_rr_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrb r3, [r0], #1
- strb r3, [r1], #1
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_rr_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrh r3, [r0], #2
- strh r3, [r1], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_rr_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldr r3, [r0], #4
- str r3, [r1], #4
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * write region.
- */
-
-ENTRY(generic_bs_wr_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrb r3, [r1], #1
- strb r3, [r0], #1
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_wr_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrh r3, [r1], #2
- strh r3, [r0], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_wr_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldr r3, [r1], #4
- str r3, [r0], #4
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * set region
- */
-
-ENTRY(generic_bs_sr_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: strb r1, [r0], #1
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_sr_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: strh r1, [r0], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_sr_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: str r1, [r0], #4
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * copy region
- */
-
-ENTRY(generic_armv4_bs_c_2)
- add r0, r1, r2
- ldr r2, [sp, #0]
- add r1, r2, r3
- ldr r2, [sp, #4]
- teq r2, #0
- moveq pc, lr
-
- cmp r0, r1
- blt 2f
-
-1: ldrh r3, [r0], #2
- strh r3, [r1], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-2: add r0, r0, r2, lsl #1
- add r1, r1, r2, lsl #1
- sub r0, r0, #2
- sub r1, r1, #2
-
-3: ldrh r3, [r0], #-2
- strh r3, [r1], #-2
- subs r2, r2, #1
- bne 3b
-
- mov pc, lr
diff --git a/sys/arch/arm/armv7/armv7_a4x_io.S
b/sys/arch/arm/armv7/armv7_a4x_io.S
index 3fa09faa4c2..b590a06e1a5 100644
--- a/sys/arch/arm/armv7/armv7_a4x_io.S
+++ b/sys/arch/arm/armv7/armv7_a4x_io.S
@@ -50,14 +50,17 @@
*/
ENTRY(a4x_bs_r_1)
+ dsb sy
ldr r0, [r1, r2, LSL #2]
mov pc, lr
ENTRY(a4x_bs_r_2)
+ dsb sy
ldr r0, [r1, r2, LSL #2]
mov pc, lr
ENTRY(a4x_bs_r_4)
+ dsb sy
ldr r0, [r1, r2, LSL #2]
mov pc, lr
@@ -67,14 +70,17 @@ ENTRY(a4x_bs_r_4)
ENTRY(a4x_bs_w_1)
str r3, [r1, r2, LSL #2]
+ dsb sy
mov pc, lr
ENTRY(a4x_bs_w_2)
str r3, [r1, r2, LSL #2]
+ dsb sy
mov pc, lr
ENTRY(a4x_bs_w_4)
str r3, [r1, r2, LSL #2]
+ dsb sy
mov pc, lr
/*
@@ -82,21 +88,19 @@ ENTRY(a4x_bs_w_4)
*/
ENTRY(a4x_bs_rm_1)
mov r2, r2, LSL #2
- b generic_bs_rm_1
+ b armv7_bs_rm_1
ENTRY(a4x_bs_rm_2)
mov r2, r2, LSL #2
- b generic_armv4_bs_rm_2
-
-
+ b armv7_bs_rm_2
/*
* write multiple
*/
ENTRY(a4x_bs_wm_1)
mov r2, r2, LSL #2
- b generic_bs_wm_1
+ b armv7_bs_wm_1
ENTRY(a4x_bs_wm_2)
mov r2, r2, LSL #2
- b generic_armv4_bs_wm_2
+ b armv7_bs_wm_2
diff --git a/sys/arch/arm/armv7/armv7_a4x_space.c
b/sys/arch/arm/armv7/armv7_a4x_space.c
index 845f7704d8d..a370bc315fd 100644
--- a/sys/arch/arm/armv7/armv7_a4x_space.c
+++ b/sys/arch/arm/armv7/armv7_a4x_space.c
@@ -49,8 +49,6 @@
/* Prototypes for all the bus_space structure functions */
bs_protos(armv7);
bs_protos(a4x);
-bs_protos(generic);
-bs_protos(generic_armv4);
bs_protos(bs_notimpl);
struct bus_space armv7_a4x_bs_tag = {
@@ -129,6 +127,3 @@ struct bus_space armv7_a4x_bs_tag = {
bs_notimpl_bs_c_4,
bs_notimpl_bs_c_8,
};
-
-
-
diff --git a/sys/arch/arm/armv7/armv7_space.c b/sys/arch/arm/armv7/armv7_space.c
index c7e9b686b8f..2dd97337637 100644
--- a/sys/arch/arm/armv7/armv7_space.c
+++ b/sys/arch/arm/armv7/armv7_space.c
@@ -84,7 +84,6 @@
/* Prototypes for all the bus_space structure functions */
bs_protos(armv7);
-bs_protos(generic);
bs_protos(bs_notimpl);
struct bus_space armv7_bs_tag = {
@@ -206,12 +205,10 @@ armv7_bs_unmap(void *t, bus_space_handle_t bsh,
bus_size_t size)
uvm_km_free(kernel_map, bsh, size);
}
-
int
armv7_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);
}
@@ -226,24 +223,19 @@ armv7_bs_barrier(void *t, bus_space_handle_t bsh,
bus_size_t offset,
void *
armv7_bs_vaddr(void *t, bus_space_handle_t bsh)
{
-
return ((void *)bsh);
}
-
int
armv7_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("armv7_io_bs_alloc(): not implemented");
+ panic("armv7_bs_alloc(): not implemented");
}
void
armv7_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
-
- panic("armv7_io_bs_free(): not implemented");
+ panic("armv7_bs_free(): not implemented");
}
-
diff --git a/sys/arch/arm/armv7/armv7reg.h b/sys/arch/arm/armv7/armv7reg.h
deleted file mode 100644
index ef901d1c284..00000000000
--- a/sys/arch/arm/armv7/armv7reg.h
+++ /dev/null
@@ -1 +0,0 @@
-#define MPHONE_INTCTL_BASE 0
diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index 9dae5a17689..713037c36a6 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -37,7 +37,6 @@ attach cpu at mainbus
# bus_space(9)
define bus_space_generic
-file arch/arm/arm/bus_space_asm_generic.S
file arch/arm/arm/bus_space_notimpl.S
file arch/arm/arm/arm_machdep.c
diff --git a/sys/arch/arm/cortex/cortex.c b/sys/arch/arm/cortex/cortex.c
index d2d6aa508b6..ec61887783a 100644
--- a/sys/arch/arm/cortex/cortex.c
+++ b/sys/arch/arm/cortex/cortex.c
@@ -46,32 +46,14 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#define _ARM32_BUS_DMA_PRIVATE
+
#include <machine/bus.h>
+
#include <arm/cpufunc.h>
#include <arm/armv7/armv7var.h>
#include <arm/cortex/cortex.h>
#include <arm/mainbus/mainbus.h>
-struct arm32_bus_dma_tag cortex_bus_dma_tag = {
- 0,
- 0,
- NULL,
- _bus_dmamap_create,
- _bus_dmamap_destroy,
- _bus_dmamap_load,
- _bus_dmamap_load_mbuf,
- _bus_dmamap_load_uio,
- _bus_dmamap_load_raw,
- _bus_dmamap_unload,
- _bus_dmamap_sync,
- _bus_dmamem_alloc,
- _bus_dmamem_free,
- _bus_dmamem_map,
- _bus_dmamem_unmap,
- _bus_dmamem_mmap,
-};
-
/* Prototypes for functions provided */
int cortexmatch(struct device *, void *, void *);
@@ -137,7 +119,7 @@ cortexsearch(struct device *parent, void *vcf, void *aux)
ca.ca_name = cf->cf_driver->cd_name;
ca.ca_iot = &armv7_bs_tag;
- ca.ca_dmat = &cortex_bus_dma_tag;
+ ca.ca_dmat = &mainbus_dma_tag;
ca.ca_periphbase = armv7_periphbase();
/* allow for devices to be disabled in UKC */
diff --git a/sys/arch/arm/mainbus/mainbus.h b/sys/arch/arm/mainbus/mainbus.h
index 059ca2550e8..7783791ce76 100644
--- a/sys/arch/arm/mainbus/mainbus.h
+++ b/sys/arch/arm/mainbus/mainbus.h
@@ -28,4 +28,6 @@ union mainbus_attach_args {
void mainbus_legacy_found(struct device *, char *);
+extern struct arm32_bus_dma_tag mainbus_dma_tag;
+
#endif /* __MAINBUS_H__ */
diff --git a/sys/arch/armv7/armv7/armv7.c b/sys/arch/armv7/armv7/armv7.c
index c57fb56738a..60fd243caf9 100644
--- a/sys/arch/armv7/armv7/armv7.c
+++ b/sys/arch/armv7/armv7/armv7.c
@@ -21,31 +21,13 @@
#include <sys/types.h>
#include <sys/malloc.h>
-#define _ARM32_BUS_DMA_PRIVATE
#include <machine/bus.h>
+
#include <arm/armv7/armv7var.h>
+#include <arm/mainbus/mainbus.h>
#include <armv7/armv7/armv7var.h>
#include <armv7/armv7/armv7_machdep.h>
-struct arm32_bus_dma_tag armv7_bus_dma_tag = {
- 0,
- 0,
- NULL,
- _bus_dmamap_create,
- _bus_dmamap_destroy,
- _bus_dmamap_load,
- _bus_dmamap_load_mbuf,
- _bus_dmamap_load_uio,
- _bus_dmamap_load_raw,
- _bus_dmamap_unload,
- _bus_dmamap_sync,
- _bus_dmamem_alloc,
- _bus_dmamem_free,
- _bus_dmamem_map,
- _bus_dmamem_unmap,
- _bus_dmamem_mmap,
-};
-
struct armv7_dev *armv7_devs = NULL;
#define DEVNAME(sc) (sc)->sc_dv.dv_xname
@@ -116,7 +98,7 @@ armv7_attach(struct device *parent, struct device *self,
void *aux)
memset(&aa, 0, sizeof(aa));
aa.aa_dev = ad;
aa.aa_iot = &armv7_bs_tag;
- aa.aa_dmat = &armv7_bus_dma_tag;
+ aa.aa_dmat = &mainbus_dma_tag;
if (config_found_sm(self, &aa, NULL, armv7_submatch) == NULL)
printf("%s: device %s unit %d not configured\n",
diff --git a/sys/arch/armv7/armv7/armv7_machdep.c
b/sys/arch/armv7/armv7/armv7_machdep.c
index aa1c549b29b..5cf1e6dbab4 100644
--- a/sys/arch/armv7/armv7/armv7_machdep.c
+++ b/sys/arch/armv7/armv7/armv7_machdep.c
@@ -204,8 +204,6 @@ int bootstrap_bs_map(void *, uint64_t, bus_size_t, int,
void process_kernel_args(char *);
void consinit(void);
-bs_protos(bs_notimpl);
-
#ifndef CONSPEED
#define CONSPEED B115200 /* What u-boot */
#endif
diff --git a/sys/arch/armv7/armv7/armv7var.h b/sys/arch/armv7/armv7/armv7var.h
index d006001b095..b48219f125d 100644
--- a/sys/arch/armv7/armv7/armv7var.h
+++ b/sys/arch/armv7/armv7/armv7var.h
@@ -83,4 +83,3 @@ int armv7_submatch(struct device *, void *, void *);
extern uint32_t board_id;
#endif /* __ARMV7VAR_H__ */
-