[src/trunk]: src/sys/arch/arm Finish the job

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

details:   https://anonhg.NetBSD.org/src/rev/75940ebe6a1f
branches:  trunk
changeset: 452222:75940ebe6a1f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jun 22 19:47:27 2019 +0000

description:
Finish the job

diffstat:

 sys/arch/arm/acpi/acpi_platform.c |  30 ++++++++----------------------
 sys/arch/arm/fdt/acpi_fdt.c       |  10 +++++-----
 2 files changed, 13 insertions(+), 27 deletions(-)

diffs (104 lines):

diff -r 5233f4a5a829 -r 75940ebe6a1f sys/arch/arm/acpi/acpi_platform.c
--- a/sys/arch/arm/acpi/acpi_platform.c Sat Jun 22 19:35:40 2019 +0000
+++ b/sys/arch/arm/acpi/acpi_platform.c Sat Jun 22 19:47:27 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.13 2019/06/19 13:39:18 jmcneill Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.14 2019/06/22 19:47:27 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.13 2019/06/19 13:39:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.14 2019/06/22 19:47:27 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -94,18 +94,8 @@
 static struct plcom_instance plcom_console;
 #endif
 
-struct arm32_bus_dma_tag acpi_coherent32_dma_tag;
-static struct arm32_dma_range acpi_coherent32_ranges[] = {
-       [0] = {
-               .dr_sysbase = 0,
-               .dr_busbase = 0,
-               .dr_len = 0xffffffffU,
-               .dr_flags = _BUS_DMAMAP_COHERENT,
-       }
-};
-
-struct arm32_bus_dma_tag acpi_coherent64_dma_tag;
-static struct arm32_dma_range acpi_coherent64_ranges[] = {
+struct arm32_bus_dma_tag acpi_coherent_dma_tag;
+static struct arm32_dma_range acpi_coherent_ranges[] = {
        [0] = {
                .dr_sysbase = 0,
                .dr_busbase = 0,
@@ -129,13 +119,9 @@
 {
        extern struct arm32_bus_dma_tag arm_generic_dma_tag;
 
-       acpi_coherent32_dma_tag = arm_generic_dma_tag;
-       acpi_coherent32_dma_tag._ranges = acpi_coherent32_ranges;
-       acpi_coherent32_dma_tag._nranges = __arraycount(acpi_coherent32_ranges);
-
-       acpi_coherent64_dma_tag = arm_generic_dma_tag;
-       acpi_coherent64_dma_tag._ranges = acpi_coherent64_ranges;
-       acpi_coherent64_dma_tag._nranges = __arraycount(acpi_coherent64_ranges);
+       acpi_coherent_dma_tag = arm_generic_dma_tag;
+       acpi_coherent_dma_tag._ranges = acpi_coherent_ranges;
+       acpi_coherent_dma_tag._nranges = __arraycount(acpi_coherent_ranges);
 }
 
 static void
@@ -256,7 +242,7 @@
 
        faa->faa_bst = &arm_generic_bs_tag;
        faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
-       faa->faa_dmat = &acpi_coherent64_dma_tag;
+       faa->faa_dmat = &acpi_coherent_dma_tag;
 }
 
 static void
diff -r 5233f4a5a829 -r 75940ebe6a1f sys/arch/arm/fdt/acpi_fdt.c
--- a/sys/arch/arm/fdt/acpi_fdt.c       Sat Jun 22 19:35:40 2019 +0000
+++ b/sys/arch/arm/fdt/acpi_fdt.c       Sat Jun 22 19:47:27 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_fdt.c,v 1.11 2019/06/22 17:57:10 jakllsch Exp $ */
+/* $NetBSD: acpi_fdt.c,v 1.12 2019/06/22 19:47:27 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
 #include "opt_efi.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_fdt.c,v 1.11 2019/06/22 17:57:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_fdt.c,v 1.12 2019/06/22 19:47:27 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -70,7 +70,7 @@
 
 static void    acpi_fdt_sysctl_init(void);
 
-extern struct arm32_bus_dma_tag acpi_coherent64_dma_tag;
+extern struct arm32_bus_dma_tag acpi_coherent_dma_tag;
 
 #if NPCI > 0
 static struct acpi_pci_context acpi_fdt_pci_context;
@@ -136,9 +136,9 @@
 #endif
 
        aa.aa_memt = faa->faa_bst;
-       aa.aa_dmat = &acpi_coherent64_dma_tag;
+       aa.aa_dmat = &acpi_coherent_dma_tag;
 #ifdef _PCI_HAVE_DMA64
-       aa.aa_dmat64 = &acpi_coherent64_dma_tag;
+       aa.aa_dmat64 = &acpi_coherent_dma_tag;
 #endif
        config_found_ia(self, "acpibus", &aa, 0);