Module Name: src Committed By: ryo Date: Sat Mar 17 18:34:09 UTC 2018
Modified Files: src/sys/arch/arm/broadcom: bcm283x_platform.c files.bcm2835 src/sys/arch/arm/imx: files.imx51 files.imx6 files.imx7 imx51_axi.c imx51_ipuv3.c imx51_usb.c imx51var.h imx6_axi.c imx6_usb.c imx6var.h imx7_axi.c imx7_usb.c imx7var.h src/sys/arch/arm/nvidia: files.tegra tegra_platform.c src/sys/arch/arm/samsung: exynos_platform.c files.exynos src/sys/arch/arm/sunxi: files.sunxi sunxi_platform.c src/sys/arch/arm/ti: files.ti ti_platform.c src/sys/arch/arm/vexpress: files.vexpress vexpress_platform.c Added Files: src/sys/arch/arm/arm: arm_generic_dma.c Removed Files: src/sys/arch/arm/arm32: armv7_generic_dma.c Log Message: move from sys/arch/arm/arm32/armv7_generic_dma.c to sys/arch/arm/arm/arm_generic_dma.c, and change variable name from armv7_generic_dma_tag to arm_generic_dma_tag no functional change. (preliminary changes for merging aarch64) To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/arm/arm_generic_dma.c cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/arm32/armv7_generic_dma.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm283x_platform.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/broadcom/files.bcm2835 cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/imx/files.imx51 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/imx/files.imx6 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/files.imx7 \ src/sys/arch/arm/imx/imx51var.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/imx51_axi.c \ src/sys/arch/arm/imx/imx51_ipuv3.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx51_usb.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imx6_axi.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx6_usb.c \ src/sys/arch/arm/imx/imx7_axi.c src/sys/arch/arm/imx/imx7_usb.c \ src/sys/arch/arm/imx/imx7var.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/imx/imx6var.h cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/nvidia/files.tegra cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_platform.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/samsung/exynos_platform.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/samsung/files.exynos cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arm/sunxi/files.sunxi cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/sunxi/sunxi_platform.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/files.ti \ src/sys/arch/arm/ti/ti_platform.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/vexpress/files.vexpress cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/vexpress/vexpress_platform.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/bcm283x_platform.c diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.2 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.3 --- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.2 Wed Dec 20 14:35:12 2017 +++ src/sys/arch/arm/broadcom/bcm283x_platform.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm283x_platform.c,v 1.2 2017/12/20 14:35:12 skrll Exp $ */ +/* $NetBSD: bcm283x_platform.c,v 1.3 2018/03/17 18:34:09 ryo Exp $ */ /*- * Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.2 2017/12/20 14:35:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.3 2018/03/17 18:34:09 ryo Exp $"); #include "opt_arm_debug.h" #include "opt_bcm283x.h" @@ -118,7 +118,7 @@ static int rpi_ioctl(void *, void *, u_l 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 arm_generic_dma_tag; /* Prototypes for all the bus_space structure functions */ bs_protos(bcm2835); Index: src/sys/arch/arm/broadcom/files.bcm2835 diff -u src/sys/arch/arm/broadcom/files.bcm2835:1.29 src/sys/arch/arm/broadcom/files.bcm2835:1.30 --- src/sys/arch/arm/broadcom/files.bcm2835:1.29 Sun Dec 10 21:38:26 2017 +++ src/sys/arch/arm/broadcom/files.bcm2835 Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.bcm2835,v 1.29 2017/12/10 21:38:26 skrll Exp $ +# $NetBSD: files.bcm2835,v 1.30 2018/03/17 18:34:09 ryo Exp $ # # Configuration info for Broadcom BCM2835 ARM Peripherals # @@ -10,7 +10,7 @@ file arch/arm/arm32/arm32_kvminit.c file arch/arm/arm32/arm32_reboot.c file arch/arm/arm32/irq_dispatch.S file arch/arm/arm32/armv7_generic_space.c -file arch/arm/arm32/armv7_generic_dma.c +file arch/arm/arm/arm_generic_dma.c file arch/arm/arm/bus_space_a4x.S file arch/arm/broadcom/bcm2835_dma.c Index: src/sys/arch/arm/imx/files.imx51 diff -u src/sys/arch/arm/imx/files.imx51:1.17 src/sys/arch/arm/imx/files.imx51:1.18 --- src/sys/arch/arm/imx/files.imx51:1.17 Fri Sep 8 05:29:12 2017 +++ src/sys/arch/arm/imx/files.imx51 Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx51,v 1.17 2017/09/08 05:29:12 hkenken Exp $ +# $NetBSD: files.imx51,v 1.18 2018/03/17 18:34:09 ryo Exp $ # # Configuration info for the Freescale i.MX5x # @@ -16,7 +16,7 @@ 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 bus_dma_generic needs-flag +file arch/arm/arm/arm_generic_dma.c bus_dma_generic needs-flag file arch/arm/arm/bus_space_a4x.S # iMX51 AXI/AHB bus interface and SoC domains Index: src/sys/arch/arm/imx/files.imx6 diff -u src/sys/arch/arm/imx/files.imx6:1.12 src/sys/arch/arm/imx/files.imx6:1.13 --- src/sys/arch/arm/imx/files.imx6:1.12 Thu Nov 9 05:57:23 2017 +++ src/sys/arch/arm/imx/files.imx6 Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx6,v 1.12 2017/11/09 05:57:23 hkenken Exp $ +# $NetBSD: files.imx6,v 1.13 2018/03/17 18:34:09 ryo Exp $ # # Configuration info for the Freescale i.MX6 # @@ -16,7 +16,7 @@ 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 bus_dma_generic needs-flag +file arch/arm/arm/arm_generic_dma.c bus_dma_generic needs-flag file arch/arm/arm/bus_space_a4x.S file arch/arm/imx/imx6_board.c Index: src/sys/arch/arm/imx/files.imx7 diff -u src/sys/arch/arm/imx/files.imx7:1.5 src/sys/arch/arm/imx/files.imx7:1.6 --- src/sys/arch/arm/imx/files.imx7:1.5 Fri Sep 8 05:29:12 2017 +++ src/sys/arch/arm/imx/files.imx7 Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx7,v 1.5 2017/09/08 05:29:12 hkenken Exp $ +# $NetBSD: files.imx7,v 1.6 2018/03/17 18:34:09 ryo Exp $ # # Configuration info for the Freescale i.MX7 # @@ -17,7 +17,7 @@ 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 bus_dma_generic needs-flag +file arch/arm/arm/arm_generic_dma.c bus_dma_generic needs-flag file arch/arm/arm/bus_space_a4x.S file arch/arm/imx/imx7_board.c Index: src/sys/arch/arm/imx/imx51var.h diff -u src/sys/arch/arm/imx/imx51var.h:1.5 src/sys/arch/arm/imx/imx51var.h:1.6 --- src/sys/arch/arm/imx/imx51var.h:1.5 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx51var.h Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx51var.h,v 1.5 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx51var.h,v 1.6 2018/03/17 18:34:09 ryo Exp $ */ /* * Copyright (c) 2015 Genetec Corporation. All rights reserved. @@ -46,7 +46,7 @@ void imx_genfb_set_videomode(device_t, u 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 arm_generic_dma_tag; extern struct arm32_bus_dma_tag imx_bus_dma_tag; void gpio_set_direction(uint32_t, uint32_t); Index: src/sys/arch/arm/imx/imx51_axi.c diff -u src/sys/arch/arm/imx/imx51_axi.c:1.6 src/sys/arch/arm/imx/imx51_axi.c:1.7 --- src/sys/arch/arm/imx/imx51_axi.c:1.6 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx51_axi.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx51_axi.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx51_axi.c,v 1.7 2018/03/17 18:34:09 ryo Exp $ */ /*- * Copyright (c) 2010 SHIMIZU Ryo <r...@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.7 2018/03/17 18:34:09 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -78,7 +78,7 @@ axi_attach(device_t parent __unused, dev sc = device_private(self); sc->sc_iot = &armv7_generic_bs_tag; #if NBUS_DMA_GENERIC > 0 - sc->sc_dmat = &armv7_generic_dma_tag; + sc->sc_dmat = &arm_generic_dma_tag; #else sc->sc_dmat = 0; #endif Index: src/sys/arch/arm/imx/imx51_ipuv3.c diff -u src/sys/arch/arm/imx/imx51_ipuv3.c:1.6 src/sys/arch/arm/imx/imx51_ipuv3.c:1.7 --- src/sys/arch/arm/imx/imx51_ipuv3.c:1.6 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx51_ipuv3.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx51_ipuv3.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx51_ipuv3.c,v 1.7 2018/03/17 18:34:09 ryo 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.6 2017/08/17 09:11:04 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.7 2018/03/17 18:34:09 ryo Exp $"); #include "opt_imx51_ipuv3.h" @@ -579,7 +579,7 @@ imx51_ipuv3_attach_sub(struct imx51_ipuv LIST_INIT(&sc->screens); sc->iot = iot; - sc->dma_tag = &armv7_generic_dma_tag; + sc->dma_tag = &arm_generic_dma_tag; /* map controller registers */ error = bus_space_map(iot, IPU_CM_BASE, IPU_CM_SIZE, 0, &sc->cm_ioh); Index: src/sys/arch/arm/imx/imx51_usb.c diff -u src/sys/arch/arm/imx/imx51_usb.c:1.3 src/sys/arch/arm/imx/imx51_usb.c:1.4 --- src/sys/arch/arm/imx/imx51_usb.c:1.3 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx51_usb.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx51_usb.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx51_usb.c,v 1.4 2018/03/17 18:34:09 ryo 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.3 2017/08/17 09:11:04 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.4 2018/03/17 18:34:09 ryo Exp $"); #include "opt_imx.h" @@ -80,7 +80,7 @@ imxusbc_search(device_t parent, cfdata_t aa.aa_iot = sc->sc_iot; aa.aa_ioh = sc->sc_ioh; - aa.aa_dmat = &armv7_generic_dma_tag; + aa.aa_dmat = &arm_generic_dma_tag; aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT]; aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ]; Index: src/sys/arch/arm/imx/imx6_axi.c diff -u src/sys/arch/arm/imx/imx6_axi.c:1.4 src/sys/arch/arm/imx/imx6_axi.c:1.5 --- src/sys/arch/arm/imx/imx6_axi.c:1.4 Thu Nov 9 05:57:23 2017 +++ src/sys/arch/arm/imx/imx6_axi.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_axi.c,v 1.4 2017/11/09 05:57:23 hkenken Exp $ */ +/* $NetBSD: imx6_axi.c,v 1.5 2018/03/17 18:34:09 ryo Exp $ */ /* * Copyright (c) 2014 Ryo Shimizu <r...@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx6_axi.c,v 1.4 2017/11/09 05:57:23 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_axi.c,v 1.5 2018/03/17 18:34:09 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -78,7 +78,7 @@ axi_attach(device_t parent __unused, dev sc = device_private(self); sc->sc_iot = &armv7_generic_bs_tag; #if NBUS_DMA_GENERIC > 0 - sc->sc_dmat = &armv7_generic_dma_tag; + sc->sc_dmat = &arm_generic_dma_tag; #else sc->sc_dmat = 0; #endif Index: src/sys/arch/arm/imx/imx6_usb.c diff -u src/sys/arch/arm/imx/imx6_usb.c:1.2 src/sys/arch/arm/imx/imx6_usb.c:1.3 --- src/sys/arch/arm/imx/imx6_usb.c:1.2 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx6_usb.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx6_usb.c,v 1.3 2018/03/17 18:34:09 ryo 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.2 2017/08/17 09:11:04 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.3 2018/03/17 18:34:09 ryo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,7 +89,7 @@ imxusbc_search(device_t parent, cfdata_t sc = device_private(parent); aa.aa_iot = sc->sc_iot; aa.aa_ioh = sc->sc_ioh; - aa.aa_dmat = &armv7_generic_dma_tag; + aa.aa_dmat = &arm_generic_dma_tag; aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT]; aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ]; Index: src/sys/arch/arm/imx/imx7_axi.c diff -u src/sys/arch/arm/imx/imx7_axi.c:1.2 src/sys/arch/arm/imx/imx7_axi.c:1.3 --- src/sys/arch/arm/imx/imx7_axi.c:1.2 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx7_axi.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx7_axi.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx7_axi.c,v 1.3 2018/03/17 18:34:09 ryo Exp $ */ /* * Copyright (c) 2014 Ryo Shimizu <r...@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx7_axi.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx7_axi.c,v 1.3 2018/03/17 18:34:09 ryo Exp $"); #include "locators.h" @@ -76,7 +76,7 @@ axi_attach(device_t parent __unused, dev sc = device_private(self); sc->sc_iot = &armv7_generic_bs_tag; #if NBUS_DMA_GENERIC > 0 - sc->sc_dmat = &armv7_generic_dma_tag; + sc->sc_dmat = &arm_generic_dma_tag; #else sc->sc_dmat = 0; #endif Index: src/sys/arch/arm/imx/imx7_usb.c diff -u src/sys/arch/arm/imx/imx7_usb.c:1.2 src/sys/arch/arm/imx/imx7_usb.c:1.3 --- src/sys/arch/arm/imx/imx7_usb.c:1.2 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx7_usb.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx7_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx7_usb.c,v 1.3 2018/03/17 18:34:09 ryo Exp $ */ /* * Copyright (c) 2013 Genetec Corporation. All rights reserved. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx7_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx7_usb.c,v 1.3 2018/03/17 18:34:09 ryo Exp $"); #include "locators.h" @@ -93,7 +93,7 @@ imx7_usbc_search(device_t parent, cfdata sc = device_private(parent); aa.aa_iot = sc->sc_iot; aa.aa_ioh = sc->sc_ioh; - aa.aa_dmat = &armv7_generic_dma_tag;; + aa.aa_dmat = &arm_generic_dma_tag;; aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT]; aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ]; Index: src/sys/arch/arm/imx/imx7var.h diff -u src/sys/arch/arm/imx/imx7var.h:1.2 src/sys/arch/arm/imx/imx7var.h:1.3 --- src/sys/arch/arm/imx/imx7var.h:1.2 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx7var.h Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx7var.h,v 1.2 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx7var.h,v 1.3 2018/03/17 18:34:09 ryo Exp $ */ /* * Copyright (c) 2014 Ryo Shimizu <r...@nerv.org> @@ -42,7 +42,7 @@ struct axi_attach_args { }; extern struct bus_space armv7_generic_bs_tag; -extern struct arm32_bus_dma_tag armv7_generic_dma_tag; +extern struct arm32_bus_dma_tag arm_generic_dma_tag; extern bus_space_tag_t imx7_armcore_bst; extern bus_space_handle_t imx7_armcore_bsh; Index: src/sys/arch/arm/imx/imx6var.h diff -u src/sys/arch/arm/imx/imx6var.h:1.7 src/sys/arch/arm/imx/imx6var.h:1.8 --- src/sys/arch/arm/imx/imx6var.h:1.7 Thu Aug 17 09:11:04 2017 +++ src/sys/arch/arm/imx/imx6var.h Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6var.h,v 1.7 2017/08/17 09:11:04 hkenken Exp $ */ +/* $NetBSD: imx6var.h,v 1.8 2018/03/17 18:34:09 ryo Exp $ */ /* * Copyright (c) 2014 Ryo Shimizu <r...@nerv.org> @@ -42,7 +42,7 @@ struct axi_attach_args { }; extern struct bus_space armv7_generic_bs_tag; -extern struct arm32_bus_dma_tag armv7_generic_dma_tag; +extern struct arm32_bus_dma_tag arm_generic_dma_tag; extern bus_space_tag_t imx6_armcore_bst; extern bus_space_handle_t imx6_armcore_bsh; Index: src/sys/arch/arm/nvidia/files.tegra diff -u src/sys/arch/arm/nvidia/files.tegra:1.46 src/sys/arch/arm/nvidia/files.tegra:1.47 --- src/sys/arch/arm/nvidia/files.tegra:1.46 Tue Dec 26 14:54:52 2017 +++ src/sys/arch/arm/nvidia/files.tegra Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.tegra,v 1.46 2017/12/26 14:54:52 jmcneill Exp $ +# $NetBSD: files.tegra,v 1.47 2018/03/17 18:34:09 ryo Exp $ # # Configuration info for NVIDIA Tegra ARM Peripherals # @@ -11,7 +11,7 @@ file arch/arm/arm32/arm32_kvminit.c file arch/arm/arm32/arm32_reboot.c file arch/arm/arm32/irq_dispatch.S file arch/arm/arm32/armv7_generic_space.c -file arch/arm/arm32/armv7_generic_dma.c +file arch/arm/arm/arm_generic_dma.c file arch/arm/arm/bus_space_a4x.S file arch/arm/nvidia/tegra_platform.c Index: src/sys/arch/arm/nvidia/tegra_platform.c diff -u src/sys/arch/arm/nvidia/tegra_platform.c:1.9 src/sys/arch/arm/nvidia/tegra_platform.c:1.10 --- src/sys/arch/arm/nvidia/tegra_platform.c:1.9 Tue Dec 19 09:04:18 2017 +++ src/sys/arch/arm/nvidia/tegra_platform.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_platform.c,v 1.9 2017/12/19 09:04:18 skrll Exp $ */ +/* $NetBSD: tegra_platform.c,v 1.10 2018/03/17 18:34:09 ryo Exp $ */ /*- * Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca> @@ -33,7 +33,7 @@ #include "ukbd.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.9 2017/12/19 09:04:18 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.10 2018/03/17 18:34:09 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -105,11 +105,11 @@ tegra_platform_init_attach_args(struct f { 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 arm_generic_dma_tag; faa->faa_bst = &armv7_generic_bs_tag; faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag; - faa->faa_dmat = &armv7_generic_dma_tag; + faa->faa_dmat = &arm_generic_dma_tag; } static void Index: src/sys/arch/arm/samsung/exynos_platform.c diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.8 src/sys/arch/arm/samsung/exynos_platform.c:1.9 --- src/sys/arch/arm/samsung/exynos_platform.c:1.8 Tue Dec 19 09:04:19 2017 +++ src/sys/arch/arm/samsung/exynos_platform.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: exynos_platform.c,v 1.8 2017/12/19 09:04:19 skrll Exp $ */ +/* $NetBSD: exynos_platform.c,v 1.9 2018/03/17 18:34:09 ryo Exp $ */ /*- * Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca> @@ -33,7 +33,7 @@ #include "ukbd.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.8 2017/12/19 09:04:19 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.9 2018/03/17 18:34:09 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -90,11 +90,11 @@ exynos_platform_init_attach_args(struct { 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 arm_generic_dma_tag; faa->faa_bst = &armv7_generic_bs_tag; faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag; - faa->faa_dmat = &armv7_generic_dma_tag; + faa->faa_dmat = &arm_generic_dma_tag; } static void Index: src/sys/arch/arm/samsung/files.exynos diff -u src/sys/arch/arm/samsung/files.exynos:1.24 src/sys/arch/arm/samsung/files.exynos:1.25 --- src/sys/arch/arm/samsung/files.exynos:1.24 Tue Jun 20 13:21:45 2017 +++ src/sys/arch/arm/samsung/files.exynos Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.exynos,v 1.24 2017/06/20 13:21:45 jmcneill Exp $ +# $NetBSD: files.exynos,v 1.25 2018/03/17 18:34:09 ryo Exp $ # # Configuration info for Samsung Exynos SoC ARM Peripherals # @@ -13,7 +13,7 @@ file arch/arm/arm32/arm32_kvminit.c file arch/arm/arm32/arm32_reboot.c file arch/arm/arm32/irq_dispatch.S file arch/arm/arm32/armv7_generic_space.c -file arch/arm/arm32/armv7_generic_dma.c +file arch/arm/arm/arm_generic_dma.c file arch/arm/arm/bus_space_a4x.S file arch/arm/samsung/exynos_soc.c Index: src/sys/arch/arm/sunxi/files.sunxi diff -u src/sys/arch/arm/sunxi/files.sunxi:1.43 src/sys/arch/arm/sunxi/files.sunxi:1.44 --- src/sys/arch/arm/sunxi/files.sunxi:1.43 Wed Mar 7 20:55:31 2018 +++ src/sys/arch/arm/sunxi/files.sunxi Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.sunxi,v 1.43 2018/03/07 20:55:31 bouyer Exp $ +# $NetBSD: files.sunxi,v 1.44 2018/03/17 18:34:09 ryo Exp $ # # Configuration info for Allwinner sunxi family SoCs # @@ -12,7 +12,7 @@ file arch/arm/arm32/arm32_kvminit.c file arch/arm/arm32/arm32_reboot.c file arch/arm/arm32/irq_dispatch.S file arch/arm/arm32/armv7_generic_space.c -file arch/arm/arm32/armv7_generic_dma.c +file arch/arm/arm/arm_generic_dma.c file arch/arm/arm/bus_space_a4x.S file arch/arm/sunxi/sunxi_platform.c soc_sunxi Index: src/sys/arch/arm/sunxi/sunxi_platform.c diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.20 src/sys/arch/arm/sunxi/sunxi_platform.c:1.21 --- src/sys/arch/arm/sunxi/sunxi_platform.c:1.20 Sat Mar 3 01:19:46 2018 +++ src/sys/arch/arm/sunxi/sunxi_platform.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_platform.c,v 1.20 2018/03/03 01:19:46 jmcneill Exp $ */ +/* $NetBSD: sunxi_platform.c,v 1.21 2018/03/17 18:34:09 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -31,7 +31,7 @@ #include "opt_fdt_arm.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.20 2018/03/03 01:19:46 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.21 2018/03/17 18:34:09 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -104,7 +104,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_platfo 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 arm_generic_dma_tag; static const struct pmap_devmap * sunxi_platform_devmap(void) @@ -124,7 +124,7 @@ sunxi_platform_init_attach_args(struct f { faa->faa_bst = &armv7_generic_bs_tag; faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag; - faa->faa_dmat = &armv7_generic_dma_tag; + faa->faa_dmat = &arm_generic_dma_tag; } static void Index: src/sys/arch/arm/ti/files.ti diff -u src/sys/arch/arm/ti/files.ti:1.2 src/sys/arch/arm/ti/files.ti:1.3 --- src/sys/arch/arm/ti/files.ti:1.2 Thu Oct 26 23:28:15 2017 +++ src/sys/arch/arm/ti/files.ti Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.ti,v 1.2 2017/10/26 23:28:15 jmcneill Exp $ +# $NetBSD: files.ti,v 1.3 2018/03/17 18:34:09 ryo Exp $ # include arch/arm/pic/files.pic @@ -10,7 +10,7 @@ file arch/arm/arm32/arm32_reboot.c file arch/arm/arm32/irq_dispatch.S file arch/arm/arm32/armv7_generic_space.c -file arch/arm/arm32/armv7_generic_dma.c +file arch/arm/arm/arm_generic_dma.c file arch/arm/arm/bus_space_a4x.S file arch/arm/ti/ti_platform.c Index: src/sys/arch/arm/ti/ti_platform.c diff -u src/sys/arch/arm/ti/ti_platform.c:1.2 src/sys/arch/arm/ti/ti_platform.c:1.3 --- src/sys/arch/arm/ti/ti_platform.c:1.2 Tue Dec 19 09:15:23 2017 +++ src/sys/arch/arm/ti/ti_platform.c Sat Mar 17 18:34:09 2018 @@ -1,9 +1,9 @@ -/* $NetBSD: ti_platform.c,v 1.2 2017/12/19 09:15:23 skrll Exp $ */ +/* $NetBSD: ti_platform.c,v 1.3 2018/03/17 18:34:09 ryo Exp $ */ #include "opt_fdt_arm.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.2 2017/12/19 09:15:23 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.3 2018/03/17 18:34:09 ryo Exp $"); #include <sys/param.h> @@ -16,7 +16,7 @@ __KERNEL_RCSID(0, "$NetBSD: ti_platform. 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 arm_generic_dma_tag; static const struct pmap_devmap * am33xx_platform_devmap(void) @@ -36,7 +36,7 @@ am33xx_platform_init_attach_args(struct { faa->faa_bst = &armv7_generic_bs_tag; faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag; - faa->faa_dmat = &armv7_generic_dma_tag; + faa->faa_dmat = &arm_generic_dma_tag; } static void Index: src/sys/arch/arm/vexpress/files.vexpress diff -u src/sys/arch/arm/vexpress/files.vexpress:1.4 src/sys/arch/arm/vexpress/files.vexpress:1.5 --- src/sys/arch/arm/vexpress/files.vexpress:1.4 Mon Feb 19 16:10:42 2018 +++ src/sys/arch/arm/vexpress/files.vexpress Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.vexpress,v 1.4 2018/02/19 16:10:42 jmcneill Exp $ +# $NetBSD: files.vexpress,v 1.5 2018/03/17 18:34:09 ryo Exp $ # # Configuration info for ARM Ltd. Versatile Express peripherals # @@ -12,7 +12,7 @@ file arch/arm/arm32/arm32_kvminit.c file arch/arm/arm32/arm32_reboot.c file arch/arm/arm32/irq_dispatch.S file arch/arm/arm32/armv7_generic_space.c -file arch/arm/arm32/armv7_generic_dma.c +file arch/arm/arm/arm_generic_dma.c file arch/arm/arm/bus_space_a4x.S file arch/arm/vexpress/vexpress_platform.c Index: src/sys/arch/arm/vexpress/vexpress_platform.c diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.6 src/sys/arch/arm/vexpress/vexpress_platform.c:1.7 --- src/sys/arch/arm/vexpress/vexpress_platform.c:1.6 Tue Dec 19 09:04:19 2017 +++ src/sys/arch/arm/vexpress/vexpress_platform.c Sat Mar 17 18:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: vexpress_platform.c,v 1.6 2017/12/19 09:04:19 skrll Exp $ */ +/* $NetBSD: vexpress_platform.c,v 1.7 2018/03/17 18:34:09 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -30,7 +30,7 @@ #include "opt_fdt_arm.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.6 2017/12/19 09:04:19 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.7 2018/03/17 18:34:09 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: vexpress_pla 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 arm_generic_dma_tag; #define SYSREG_BASE 0x1c010000 #define SYSREG_SIZE 0x1000 @@ -172,7 +172,7 @@ vexpress_platform_init_attach_args(struc { faa->faa_bst = &armv7_generic_bs_tag; faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag; - faa->faa_dmat = &armv7_generic_dma_tag; + faa->faa_dmat = &arm_generic_dma_tag; } static void Added files: Index: src/sys/arch/arm/arm/arm_generic_dma.c diff -u /dev/null src/sys/arch/arm/arm/arm_generic_dma.c:1.1 --- /dev/null Sat Mar 17 18:34:10 2018 +++ src/sys/arch/arm/arm/arm_generic_dma.c Sat Mar 17 18:34:09 2018 @@ -0,0 +1,41 @@ +/* $NetBSD: arm_generic_dma.c,v 1.1 2018/03/17 18:34:09 ryo Exp $ */ + +/*- + * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> + * 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. + * + * 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 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: arm_generic_dma.c,v 1.1 2018/03/17 18:34:09 ryo Exp $"); + +#define _ARM32_BUS_DMA_PRIVATE + +#include <sys/param.h> +#include <sys/bus.h> + +struct arm32_bus_dma_tag arm_generic_dma_tag = { + _BUS_DMAMAP_FUNCS, + _BUS_DMAMEM_FUNCS, + _BUS_DMATAG_FUNCS, +};