[src/trunk]: src/sys/arch Use armv7_generic_[dma|bs]_tag.

[hkenken <hkenken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4747e3a761c1
branches:  trunk
changeset: 826158:4747e3a761c1
user:      hkenken <hkenken%NetBSD.org@localhost>
date:      Thu Aug 17 09:11:04 2017 +0000

description:
Use armv7_generic_[dma|bs]_tag.

diffstat:

 sys/arch/arm/imx/files.imx51        |  6 ++++--
 sys/arch/arm/imx/files.imx6         |  4 ++--
 sys/arch/arm/imx/files.imx7         |  8 ++++----
 sys/arch/arm/imx/imx51_axi.c        |  6 +++---
 sys/arch/arm/imx/imx51_ipuv3.c      |  6 +++---
 sys/arch/arm/imx/imx51_usb.c        |  6 +++---
 sys/arch/arm/imx/imx51var.h         |  3 ++-
 sys/arch/arm/imx/imx6_axi.c         |  6 +++---
 sys/arch/arm/imx/imx6_usb.c         |  6 +++---
 sys/arch/arm/imx/imx6var.h          |  4 ++--
 sys/arch/arm/imx/imx7_axi.c         |  9 ++++-----
 sys/arch/arm/imx/imx7_board.c       |  8 ++++----
 sys/arch/arm/imx/imx7_usb.c         |  6 +++---
 sys/arch/arm/imx/imx7var.h          |  6 +++---
 sys/arch/evbarm/imx7/imx7_machdep.c |  6 +++---
 15 files changed, 46 insertions(+), 44 deletions(-)

diffs (truncated from 373 to 300 lines):

diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/files.imx51
--- a/sys/arch/arm/imx/files.imx51      Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/files.imx51      Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.imx51,v 1.14 2015/12/21 04:26:28 hkenken Exp $
+#      $NetBSD: files.imx51,v 1.15 2017/08/17 09:11:04 hkenken Exp $
 #
 # Configuration info for the Freescale i.MX5x
 #
@@ -13,9 +13,11 @@
 file   arch/arm/arm32/arm32_kvminit.c
 file   arch/arm/arm32/arm32_reboot.c
 file   arch/arm/arm32/irq_dispatch.S
+
+define bus_dma_generic
 file   arch/arm/arm32/armv7_generic_space.c
+file   arch/arm/arm32/armv7_generic_dma.c
 file   arch/arm/arm/bus_space_a4x.S
-file   arch/arm/imx/imx_dma.c          bus_dma_generic needs-flag
 
 # iMX51 AXI/AHB bus interface and SoC domains
 device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/files.imx6
--- a/sys/arch/arm/imx/files.imx6       Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/files.imx6       Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.imx6,v 1.8 2016/11/24 12:06:43 hkenken Exp $
+#      $NetBSD: files.imx6,v 1.9 2017/08/17 09:11:04 hkenken Exp $
 #
 # Configuration info for the Freescale i.MX6
 #
@@ -16,8 +16,8 @@
 
 define bus_dma_generic
 file   arch/arm/arm32/armv7_generic_space.c
+file   arch/arm/arm32/armv7_generic_dma.c
 file   arch/arm/arm/bus_space_a4x.S
-file   arch/arm/imx/imx_dma.c                  bus_dma_generic needs-flag
 
 file   arch/arm/imx/imx6_board.c
 
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/files.imx7
--- a/sys/arch/arm/imx/files.imx7       Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/files.imx7       Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.imx7,v 1.2 2016/10/17 10:36:56 ryo Exp $
+#      $NetBSD: files.imx7,v 1.3 2017/08/17 09:11:04 hkenken Exp $
 #
 # Configuration info for the Freescale i.MX7
 #
@@ -16,12 +16,12 @@
 file   arch/arm/arm32/irq_dispatch.S
 
 define bus_dma_generic
+file   arch/arm/arm32/armv7_generic_space.c
+file   arch/arm/arm32/armv7_generic_dma.c
+file   arch/arm/arm/bus_space_a4x.S
 
-file   arch/arm/imx/imx_space.c
-file   arch/arm/imx/imx_dma.c                  bus_dma_generic needs-flag
 file   arch/arm/imx/imx7_board.c
 
-
 # iMX7 AXI/AHB bus interface and SoC domains
 device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
 attach axi at mainbus
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx51_axi.c
--- a/sys/arch/arm/imx/imx51_axi.c      Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx51_axi.c      Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx51_axi.c,v 1.5 2015/05/07 04:13:47 hkenken Exp $    */
+/*     $NetBSD: imx51_axi.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $    */
 
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.5 2015/05/07 04:13:47 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -78,7 +78,7 @@
        sc = device_private(self);
        sc->sc_iot = &armv7_generic_bs_tag;
 #if NBUS_DMA_GENERIC > 0
-       sc->sc_dmat = &imx_bus_dma_tag;
+       sc->sc_dmat = &armv7_generic_dma_tag;
 #else
        sc->sc_dmat = 0;
 #endif
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx51_ipuv3.c
--- a/sys/arch/arm/imx/imx51_ipuv3.c    Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx51_ipuv3.c    Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx51_ipuv3.c,v 1.5 2017/06/25 12:11:30 maxv Exp $     */
+/*     $NetBSD: imx51_ipuv3.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $  */
 
 /*
  * Copyright (c) 2011, 2012  Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.5 2017/06/25 12:11:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $");
 
 #include "opt_imx51_ipuv3.h"
 
@@ -579,7 +579,7 @@
        LIST_INIT(&sc->screens);
 
        sc->iot = iot;
-       sc->dma_tag = &imx_bus_dma_tag;
+       sc->dma_tag = &armv7_generic_dma_tag;
 
        /* map controller registers */
        error = bus_space_map(iot, IPU_CM_BASE, IPU_CM_SIZE, 0, &sc->cm_ioh);
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx51_usb.c
--- a/sys/arch/arm/imx/imx51_usb.c      Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx51_usb.c      Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx51_usb.c,v 1.2 2014/07/25 07:49:56 hkenken Exp $    */
+/*     $NetBSD: imx51_usb.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $    */
 /*
  * Copyright (c) 2010  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.2 2014/07/25 07:49:56 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $");
 
 #include "opt_imx.h"
 
@@ -80,7 +80,7 @@
 
         aa.aa_iot = sc->sc_iot;
        aa.aa_ioh = sc->sc_ioh;
-       aa.aa_dmat = &imx_bus_dma_tag;
+       aa.aa_dmat = &armv7_generic_dma_tag;
         aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT];
        aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ];
 
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx51var.h
--- a/sys/arch/arm/imx/imx51var.h       Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx51var.h       Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx51var.h,v 1.4 2015/12/21 04:26:28 hkenken Exp $ */
+/*     $NetBSD: imx51var.h,v 1.5 2017/08/17 09:11:04 hkenken Exp $ */
 
 /*
  * Copyright (c) 2015 Genetec Corporation.  All rights reserved.
@@ -46,6 +46,7 @@
 
 extern struct bus_space armv7_generic_bs_tag;
 extern struct bus_space armv7_generic_a4x_bs_tag;
+extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
 extern struct arm32_bus_dma_tag imx_bus_dma_tag;
 
 void gpio_set_direction(uint32_t, uint32_t);
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx6_axi.c
--- a/sys/arch/arm/imx/imx6_axi.c       Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx6_axi.c       Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_axi.c,v 1.2 2015/12/31 12:14:01 ryo Exp $ */
+/*     $NetBSD: imx6_axi.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $     */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_axi.c,v 1.2 2015/12/31 12:14:01 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_axi.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -78,7 +78,7 @@
        sc = device_private(self);
        sc->sc_iot = &armv7_generic_bs_tag;
 #if NBUS_DMA_GENERIC > 0
-       sc->sc_dmat = &imx_bus_dma_tag;
+       sc->sc_dmat = &armv7_generic_dma_tag;
 #else
        sc->sc_dmat = 0;
 #endif
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx6_usb.c
--- a/sys/arch/arm/imx/imx6_usb.c       Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx6_usb.c       Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_usb.c,v 1.1 2014/09/25 05:05:28 ryo Exp $ */
+/*     $NetBSD: imx6_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $     */
 
 /*
  * Copyright (c) 2012  Genetec Corporation.  All rights reserved.
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.1 2014/09/25 05:05:28 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,7 +89,7 @@
        sc = device_private(parent);
        aa.aa_iot = sc->sc_iot;
        aa.aa_ioh = sc->sc_ioh;
-       aa.aa_dmat = &imx_bus_dma_tag;
+       aa.aa_dmat = &armv7_generic_dma_tag;
        aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT];
        aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ];
 
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx6var.h
--- a/sys/arch/arm/imx/imx6var.h        Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx6var.h        Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6var.h,v 1.6 2017/06/09 18:14:59 ryo Exp $  */
+/*     $NetBSD: imx6var.h,v 1.7 2017/08/17 09:11:04 hkenken Exp $      */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -42,7 +42,7 @@
 };
 
 extern struct bus_space armv7_generic_bs_tag;
-extern struct arm32_bus_dma_tag imx_bus_dma_tag;
+extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
 extern bus_space_tag_t imx6_armcore_bst;
 extern bus_space_handle_t imx6_armcore_bsh;
 
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx7_axi.c
--- a/sys/arch/arm/imx/imx7_axi.c       Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx7_axi.c       Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx7_axi.c,v 1.1 2016/05/17 06:44:45 ryo Exp $ */
+/*     $NetBSD: imx7_axi.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $     */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,10 +27,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_axi.c,v 1.1 2016/05/17 06:44:45 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_axi.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $");
 
 #include "locators.h"
-#include "bus_dma_generic.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -75,9 +74,9 @@
        aprint_naive("\n");
 
        sc = device_private(self);
-       sc->sc_iot = &imx_bs_tag;
+       sc->sc_iot = &armv7_generic_bs_tag;
 #if NBUS_DMA_GENERIC > 0
-       sc->sc_dmat = &imx_bus_dma_tag;
+       sc->sc_dmat = &armv7_generic_dma_tag;
 #else
        sc->sc_dmat = 0;
 #endif
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx7_board.c
--- a/sys/arch/arm/imx/imx7_board.c     Thu Aug 17 09:06:21 2017 +0000
+++ b/sys/arch/arm/imx/imx7_board.c     Thu Aug 17 09:11:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx7_board.c,v 1.2 2016/10/20 09:53:07 skrll Exp $     */
+/*     $NetBSD: imx7_board.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $   */
 
 /*
  * Copyright (c) 2012  Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_board.c,v 1.2 2016/10/20 09:53:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_board.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $");
 
 #include "opt_imx.h"
 
@@ -48,9 +48,9 @@
 
 static void imx7_soc_init(void);
 
-bus_space_tag_t imx7_ioreg_bst = &imx_bs_tag;
+bus_space_tag_t imx7_ioreg_bst = &armv7_generic_bs_tag;
 bus_space_handle_t imx7_ioreg_bsh;
-bus_space_tag_t imx7_armcore_bst = &imx_bs_tag;
+bus_space_tag_t imx7_armcore_bst = &armv7_generic_bs_tag;
 bus_space_handle_t imx7_armcore_bsh;
 
 void
diff -r a9a19a663e0a -r 4747e3a761c1 sys/arch/arm/imx/imx7_usb.c