Mon Dec 30 19:49:38 2019 UTC ()

MD code may allocate a new dma tag for attach args, so destroy it if the device node is not claimed


(jmcneill)

diff -r1.279 -r1.280 src/sys/dev/acpi/acpi.c

--- src/sys/dev/acpi/acpi.c 2019/12/29 23:47:56	1.279
+++ src/sys/dev/acpi/acpi.c 2019/12/30 19:49:38	1.280

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi.c,v 1.279 2019/12/29 23:47:56 jmcneill Exp $	*/
+/*	$NetBSD: acpi.c,v 1.280 2019/12/30 19:49:38 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum of By Noon Software, Inc.
+ *
  * 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.
 @@ -90,27 +90,27 @@
  * 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 WASABI SYSTEMS, INC
  * 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: acpi.c,v 1.279 2019/12/29 23:47:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.280 2019/12/30 19:49:38 jmcneill Exp $");
 #include "pci.h"
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 @@ -889,26 +889,33 @@ acpi_rescan_early(struct acpi_softc *sc)
 			continue;
 		aa.aa_node = ad;
 		aa.aa_iot = sc->sc_iot;
 		aa.aa_memt = sc->sc_memt;
 		aa.aa_pc = sc->sc_pc;
 		aa.aa_pciflags = sc->sc_pciflags;
 		aa.aa_ic = sc->sc_ic;
 		aa.aa_dmat = acpi_get_dma_tag(sc, ad);
 		aa.aa_dmat64 = acpi_get_dma64_tag(sc, ad);
 		ad->ad_device = config_found_ia(sc->sc_dev,
 		    "acpinodebus", &aa, acpi_print);
 		if (ad->ad_device == NULL) {
 			if (aa.aa_dmat != NULL)
 				bus_dmatag_destroy(aa.aa_dmat);
 			if (aa.aa_dmat64 != NULL)
 				bus_dmatag_destroy(aa.aa_dmat64);
+		}
+	}
+}
 static void
 acpi_rescan_nodes(struct acpi_softc *sc)
+{
 	const char * const hpet_ids[] = { "PNP0103", NULL };
 	struct acpi_attach_args aa;
 	struct acpi_devnode *ad;
 	ACPI_DEVICE_INFO *di;
 	SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
 @@ -951,26 +958,33 @@ acpi_rescan_nodes(struct acpi_softc *sc)
 			continue;
 		aa.aa_node = ad;
 		aa.aa_iot = sc->sc_iot;
 		aa.aa_memt = sc->sc_memt;
 		aa.aa_pc = sc->sc_pc;
 		aa.aa_pciflags = sc->sc_pciflags;
 		aa.aa_ic = sc->sc_ic;
 		aa.aa_dmat = acpi_get_dma_tag(sc, ad);
 		aa.aa_dmat64 = acpi_get_dma64_tag(sc, ad);
 		ad->ad_device = config_found_ia(sc->sc_dev,
 		    "acpinodebus", &aa, acpi_print);
 		if (ad->ad_device == NULL) {
 			if (aa.aa_dmat != NULL)
 				bus_dmatag_destroy(aa.aa_dmat);
 			if (aa.aa_dmat64 != NULL)
 				bus_dmatag_destroy(aa.aa_dmat64);
+		}
+	}
+}
 static void
 acpi_rescan_capabilities(device_t self)
+{
 	struct acpi_softc *sc = device_private(self);
 	struct acpi_devnode *ad;
 	ACPI_HANDLE tmp;
 	ACPI_STATUS rv;
 	SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {