 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_machdep.c,v 1.16 2019/12/31 11:42:46 jmcneill Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.17 2019/12/31 13:54:22 jmcneill Exp $ */
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jared McNeill <jmcneill@invisible.ca>.
+ *
  * 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.
 @@ -22,33 +22,34 @@
  * 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 "pci.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.16 2019/12/31 11:42:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.17 2019/12/31 13:54:22 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <uvm/uvm_extern.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpivar.h>
 #if NPCI > 0
 #include <dev/acpi/acpi_mcfg.h>
 #endif
 #include <arm/arm/efi_runtime.h>
 @@ -362,100 +363,135 @@ acpi_md_callback(struct acpi_softc *sc)
 		panic("Failed to map GTDT");
 	acpi_gtdt_walk(acpi_md_gtdt_probe, sc);
 	acpi_gtdt_unmap();
 	if (ACPI_SUCCESS(AcpiGetTable(ACPI_SIG_GTDT, 0, &hdrp)))
 		config_found_ia(sc->sc_dev, "acpisdtbus", hdrp, NULL);
+}
 static const char * const module_hid[] = {
 	"ACPI0004",	/* Module device */
 	NULL
 };
-static bus_dma_tag_t
+static ACPI_HANDLE
-arm_acpi_dma_tag_subregion(struct acpi_softc *sc, bus_dma_tag_t dmat,
+arm_acpi_dma_module(struct acpi_softc *sc, struct acpi_devnode *ad)
     ACPI_HANDLE handle)
 	ACPI_HANDLE tmp;
 	ACPI_STATUS rv;
 	/*
 	 * Search up the tree for a module device with a _DMA method.
 	 */
 	for (; ad != NULL; ad = ad->ad_parent) {
 		if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE)
 			continue;
 		if (!acpi_match_hid(ad->ad_devinfo, module_hid))
 			continue;
 		rv = AcpiGetHandle(ad->ad_handle, "_DMA", &tmp);
 		if (ACPI_SUCCESS(rv))
 			return ad->ad_handle;
+	}
 	return NULL;
+}
 static void
 arm_acpi_dma_init_ranges(struct acpi_softc *sc, struct acpi_devnode *ad,
     struct arm32_bus_dma_tag *dmat, uint32_t flags)
+{
 	struct acpi_resources res;
 	struct acpi_mem *mem;
-	bus_dma_tag_t newtag;
+	ACPI_HANDLE module;
 	ACPI_STATUS rv;
-	int error;
+	int n;
-	rv = acpi_resource_parse(sc->sc_dev, handle, "_DMA", &res,
+	module = arm_acpi_dma_module(sc, ad->ad_parent);
-	    &acpi_resource_parse_ops_quiet);
+	if (module == NULL) {
-	if (ACPI_FAILURE(rv))
+default_tag:
-		return dmat;	/* no translation required */
+		/* No translation required */
 		dmat->_nranges = 1;
 		dmat->_ranges = kmem_zalloc(sizeof(*dmat->_ranges), KM_SLEEP);
 		dmat->_ranges[0].dr_sysbase = 0;
 		dmat->_ranges[0].dr_busbase = 0;
 		dmat->_ranges[0].dr_len = UINTPTR_MAX;
 		dmat->_ranges[0].dr_flags = flags;
 		return;
+	}
-	mem = acpi_res_mem(&res, 0);
+	rv = acpi_resource_parse(sc->sc_dev, module, "_DMA", &res,
-	if (mem == NULL)
+	    &acpi_resource_parse_ops_quiet);
-		goto done;
+	if (ACPI_FAILURE(rv)) {
 	aprint_debug_dev(sc->sc_dev, "_DMA range %#lx-%#lx\n",
 	    mem->ar_base, mem->ar_base + mem->ar_length - 1);
 	error = bus_dmatag_subregion(dmat,
 	    mem->ar_base, mem->ar_base + mem->ar_length - 1,
 	    &newtag, BUS_DMA_WAITOK);
 	if (error != 0) {
 		aprint_error_dev(sc->sc_dev,
-		    "_DMA subregion failed: %d\n", error);
+		    "failed to parse _DMA on %s: %s\n",
-		goto done;
+		    acpi_name(module), AcpiFormatException(rv));
 		goto default_tag;
+	}
 	if (res.ar_nmem == 0) {
 		acpi_resource_cleanup(&res);
 		goto default_tag;
+	}
 	dmat = newtag;
-done:
+	dmat->_nranges = res.ar_nmem;
-	acpi_resource_cleanup(&res);
+	dmat->_ranges = kmem_zalloc(sizeof(*dmat->_ranges) * res.ar_nmem,
 	    KM_SLEEP);
 	for (n = 0; n < res.ar_nmem; n++) {
 		mem = acpi_res_mem(&res, n);
 		dmat->_ranges[n].dr_busbase = mem->ar_base;
 		dmat->_ranges[n].dr_sysbase = mem->ar_base;
 		if (mem->ar_decode == ACPI_POS_DECODE)
 		 	dmat->_ranges[n].dr_sysbase += mem->ar_offset;
 		else
 			dmat->_ranges[n].dr_sysbase -= mem->ar_offset;
 		dmat->_ranges[n].dr_len = mem->ar_length;
 		dmat->_ranges[n].dr_flags = flags;
 		aprint_debug_dev(sc->sc_dev,
 		    "%s: DMA sysbase %#lx busbase %#lx len %#lx%s\n",
 		    acpi_name(ad->ad_handle),
 		    dmat->_ranges[n].dr_sysbase,
 		    dmat->_ranges[n].dr_busbase,
 		    dmat->_ranges[n].dr_len,
 		    flags ? " (coherent)" : "");
+	}
-	return dmat;
+	acpi_resource_cleanup(&res);
+}
-static ACPI_HANDLE
+static uint32_t
-arm_acpi_dma_module(struct acpi_softc *sc, struct acpi_devnode *ad)
+arm_acpi_dma_flags(struct acpi_softc *sc, struct acpi_devnode *ad)
+{
-	ACPI_HANDLE tmp;
+	ACPI_INTEGER cca = 1;	/* default cache coherent */
 	ACPI_STATUS rv;
 	/*
 	 * Search up the tree for a module device with a _DMA method.
 	 */
 	for (; ad != NULL; ad = ad->ad_parent) {
 		if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE)
 			continue;
 		if (!acpi_match_hid(ad->ad_devinfo, module_hid))
-			continue;
+		rv = acpi_eval_integer(ad->ad_handle, "_CCA", &cca);
 		rv = AcpiGetHandle(ad->ad_handle, "_DMA", &tmp);
 		if (ACPI_SUCCESS(rv))
-			return ad->ad_handle;
+			break;
+	}
-	return NULL;
+	return cca ? _BUS_DMAMAP_COHERENT : 0;
+}
 bus_dma_tag_t
 arm_acpi_dma_tag(struct acpi_softc *sc, struct acpi_devnode *ad)
+{
-	ACPI_HANDLE module;
+	struct arm32_bus_dma_tag *dmat;
 	ACPI_INTEGER cca;
 	bus_dma_tag_t dmat;
-	if (ACPI_FAILURE(acpi_eval_integer(ad->ad_handle, "_CCA", &cca)))
+	if (ad->ad_dmat != NULL)
-		cca = 1;
+		return ad->ad_dmat;
 	dmat = kmem_alloc(sizeof(*dmat), KM_SLEEP);
 	*dmat = arm_generic_dma_tag;
-	if (cca)
+	const uint32_t flags = arm_acpi_dma_flags(sc, ad);
-		dmat = &acpi_coherent_dma_tag;
+	arm_acpi_dma_init_ranges(sc, ad, dmat, flags);
 	else
 		dmat = &arm_generic_dma_tag;
 	/*
 	 * If a parent device is a bus, it may define valid DMA ranges
 	 * and translations for child nodes.
 	 */
 	module = arm_acpi_dma_module(sc, ad);
 	if (module != NULL)
 		dmat = arm_acpi_dma_tag_subregion(sc, dmat, module);
 	return dmat;
+}
 __strong_alias(acpi_get_dma_tag,arm_acpi_dma_tag);
 __strong_alias(acpi_get_dma64_tag,arm_acpi_dma_tag);