Tue Dec 31 11:42:46 2019 UTC ()

The DMA restrictions may not be defined in the direct parent of a device,
so search up the tree for a module device.


(jmcneill)

diff -r1.15 -r1.16 src/sys/arch/arm/acpi/acpi_machdep.c

--- src/sys/arch/arm/acpi/acpi_machdep.c 2019/12/30 19:50:29	1.15
+++ src/sys/arch/arm/acpi/acpi_machdep.c 2019/12/31 11:42:46	1.16

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_machdep.c,v 1.15 2019/12/30 19:50:29 jmcneill Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.16 2019/12/31 11:42:46 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,27 +22,27 @@
  * 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.15 2019/12/30 19:50:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.16 2019/12/31 11:42:46 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpivar.h>
 @@ -400,41 +400,62 @@ arm_acpi_dma_tag_subregion(struct acpi_s
 	if (error != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "_DMA subregion failed: %d\n", error);
 		goto done;
+	}
 	dmat = newtag;
 done:
 	acpi_resource_cleanup(&res);
 	return dmat;
+}
 static ACPI_HANDLE
 arm_acpi_dma_module(struct acpi_softc *sc, struct acpi_devnode *ad)
+{
 	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;
+}
 bus_dma_tag_t
 arm_acpi_dma_tag(struct acpi_softc *sc, struct acpi_devnode *ad)
+{
 	ACPI_HANDLE module;
 	ACPI_INTEGER cca;
 	bus_dma_tag_t dmat;
 	if (ACPI_FAILURE(acpi_eval_integer(ad->ad_handle, "_CCA", &cca)))
 		cca = 1;
 	if (cca)
 		dmat = &acpi_coherent_dma_tag;
 	else
 		dmat = &arm_generic_dma_tag;
 	/*
-	 * If the parent device is a bus, it may define valid DMA ranges
+	 * If a parent device is a bus, it may define valid DMA ranges
 	 * and translations for child nodes.
 	 */
-	if (ad->ad_parent != NULL &&
+	module = arm_acpi_dma_module(sc, ad);
-	    acpi_match_hid(ad->ad_parent->ad_devinfo, module_hid)) {
+	if (module != NULL)
-		dmat = arm_acpi_dma_tag_subregion(sc, dmat,
+		dmat = arm_acpi_dma_tag_subregion(sc, dmat, module);
 		    ad->ad_parent->ad_handle);
 	return dmat;
+}
 __strong_alias(acpi_get_dma_tag,arm_acpi_dma_tag);
 __strong_alias(acpi_get_dma64_tag,arm_acpi_dma_tag);