 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_machdep.c,v 1.13 2019/12/28 17:19:43 jmcneill Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.14 2019/12/29 23:47:56 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,53 +22,57 @@
  * 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.13 2019/12/28 17:19:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.14 2019/12/29 23:47:56 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>
 #if NPCI > 0
 #include <dev/acpi/acpi_mcfg.h>
 #endif
 #include <arm/arm/efi_runtime.h>
 #include <arm/pic/picvar.h>
 #include <arm/locore.h>
 #include <machine/acpi_machdep.h>
 extern struct bus_space arm_generic_bs_tag;
 extern struct arm32_bus_dma_tag acpi_coherent_dma_tag;
 extern struct arm32_bus_dma_tag arm_generic_dma_tag;
 bus_dma_tag_t	arm_acpi_dma_tag(struct acpi_softc *, struct acpi_devnode *);
 static int
 acpi_md_pmapflags(paddr_t pa)
+{
 	int len;
 	const int chosen = OF_finddevice("/chosen");
 	if (chosen == -1)
 		return 0;
 	const uint32_t *map = fdtbus_get_prop(chosen, "netbsd,uefi-memmap", &len);
 	if (map == NULL)
 		return 0;
 @@ -352,13 +356,29 @@ acpi_md_callback(struct acpi_softc *sc)
 		panic("Failed to map MADT");
 	acpi_madt_walk(acpi_md_madt_probe_cpu, sc);
 	acpi_madt_walk(acpi_md_madt_probe_gic, sc);
 	acpi_madt_unmap();
 	if (acpi_gtdt_map() != AE_OK)
 		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);
+}
 bus_dma_tag_t
 arm_acpi_dma_tag(struct acpi_softc *sc, struct acpi_devnode *ad)
+{
 	ACPI_INTEGER cca;
 	if (ACPI_FAILURE(acpi_eval_integer(ad->ad_handle, "_CCA", &cca)))
 		cca = 1;
 	if (cca)
 		return &acpi_coherent_dma_tag;
 	else
 		return &arm_generic_dma_tag;
+}
 __strong_alias(acpi_get_dma_tag,arm_acpi_dma_tag);
 __strong_alias(acpi_get_dma64_tag,arm_acpi_dma_tag);

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpipchb.c,v 1.14 2019/12/28 17:19:43 jmcneill Exp $ */
+/* $NetBSD: acpipchb.c,v 1.15 2019/12/29 23:47:56 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.
 @@ -20,27 +20,27 @@
  * ``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 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.14 2019/12/28 17:19:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.15 2019/12/29 23:47:56 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/extent.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <machine/cpu.h>
 @@ -232,47 +232,42 @@ acpipchb_match(device_t parent, cfdata_t
 	if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
 		return 0;
 	return acpi_match_hid(aa->aa_node->ad_devinfo, compatible);
+}
 static void
 acpipchb_attach(device_t parent, device_t self, void *aux)
+{
 	struct acpipchb_softc * const sc = device_private(self);
 	struct acpi_attach_args *aa = aux;
 	struct pcibus_attach_args pba;
 	const struct acpipchb_quirk *q;
-	ACPI_INTEGER cca, seg;
+	ACPI_INTEGER seg;
 	sc->sc_dev = self;
 	sc->sc_memt = aa->aa_memt;
 	sc->sc_handle = aa->aa_node->ad_handle;
 	if (ACPI_FAILURE(acpi_eval_integer(sc->sc_handle, "_BBN", &sc->sc_bus)))
 		sc->sc_bus = 0;
 	if (ACPI_FAILURE(acpi_eval_integer(sc->sc_handle, "_SEG", &seg)))
 		seg = 0;
 	if (ACPI_FAILURE(acpi_eval_integer(sc->sc_handle, "_CCA", &cca)))
 		cca = 1;
 	aprint_naive("\n");
 	aprint_normal(": PCI Express Host Bridge\n");
 	sc->sc_dmat = *aa->aa_dmat;
 	if (cca == 0)
 		sc->sc_dmat._nranges = 0;
 	sc->sc_ap.ap_dev = self;
 	sc->sc_ap.ap_pc = *aa->aa_pc;
 	sc->sc_ap.ap_pc.pc_conf_v = &sc->sc_ap;
 	sc->sc_ap.ap_seg = seg;
 	sc->sc_ap.ap_handle = sc->sc_handle;
 	sc->sc_ap.ap_bus = sc->sc_bus;
 	sc->sc_ap.ap_bst = sc->sc_memt;
 	q = acpipchb_find_quirk();
 	if (q != NULL)
 		q->q_init(&sc->sc_ap);

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_fdt.c,v 1.12 2019/06/22 19:47:27 jmcneill Exp $ */
+/* $NetBSD: acpi_fdt.c,v 1.13 2019/12/29 23:47:56 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill@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.
 @@ -20,27 +20,27 @@
  * 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 "opt_efi.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_fdt.c,v 1.12 2019/06/22 19:47:27 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_fdt.c,v 1.13 2019/12/29 23:47:56 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <sys/kmem.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <dev/fdt/fdtvar.h>
 @@ -126,30 +126,28 @@ acpi_fdt_attach(device_t parent, device_
 	acpi_fdt_pci_context.ap_pc.pc_conf_v = &acpi_fdt_pci_context;
 	acpi_fdt_pci_context.ap_seg = 0;
 	aa.aa_pciflags =
 	    /*PCI_FLAGS_IO_OKAY |*/ PCI_FLAGS_MEM_OKAY |
 	    PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
 	    PCI_FLAGS_MWI_OKAY;
 #ifdef __HAVE_PCI_MSI_MSIX
 	aa.aa_pciflags |= PCI_FLAGS_MSI_OKAY | PCI_FLAGS_MSIX_OKAY;
 #endif
 	aa.aa_pc = &acpi_fdt_pci_context.ap_pc;
 #endif
 	aa.aa_memt = faa->faa_bst;
-	aa.aa_dmat = &acpi_coherent_dma_tag;
+	aa.aa_dmat = NULL;
-#ifdef _PCI_HAVE_DMA64
+	aa.aa_dmat64 = NULL;
 	aa.aa_dmat64 = &acpi_coherent_dma_tag;
 #endif
 	config_found_ia(self, "acpibus", &aa, 0);
 	acpi_fdt_sysctl_init();
+}
 static void
 acpi_fdt_poweroff(device_t dev)
+{
 	delay(500000);
 #ifdef EFI_RUNTIME
 	if (arm_efirt_reset(EFI_RESET_SHUTDOWN) == 0)
 		return;
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi.c,v 1.278 2018/10/21 13:41:15 jmcneill Exp $	*/
+/*	$NetBSD: acpi.c,v 1.279 2019/12/29 23:47:56 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.278 2018/10/21 13:41:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.279 2019/12/29 23:47:56 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>
 @@ -227,26 +227,29 @@ static int		sysctl_hw_acpi_sleepstates(S
 static bool		  acpi_is_scope(struct acpi_devnode *);
 static ACPI_TABLE_HEADER *acpi_map_rsdt(void);
 static void		  acpi_unmap_rsdt(ACPI_TABLE_HEADER *);
 void			acpi_print_verbose_stub(struct acpi_softc *);
 void			acpi_print_dev_stub(const char *);
 static void		acpi_activate_device(ACPI_HANDLE, ACPI_DEVICE_INFO **);
 ACPI_STATUS		acpi_allocate_resources(ACPI_HANDLE);
 void (*acpi_print_verbose)(struct acpi_softc *) = acpi_print_verbose_stub;
 void (*acpi_print_dev)(const char *) = acpi_print_dev_stub;
 bus_dma_tag_t		acpi_default_dma_tag(struct acpi_softc *, struct acpi_devnode *);
 bus_dma_tag_t		acpi_default_dma64_tag(struct acpi_softc *, struct acpi_devnode *);
 CFATTACH_DECL2_NEW(acpi, sizeof(struct acpi_softc),
     acpi_match, acpi_attach, acpi_detach, NULL, acpi_rescan, acpi_childdet);
 /*
  * Probe for ACPI support.
+ *
  * This is called by the machine-dependent ACPI front-end.
  * Note: this is not an autoconfiguration interface function.
  */
 int
 acpi_probe(void)
+{
 	ACPI_TABLE_HEADER *rsdt;
 @@ -798,26 +801,40 @@ acpi_make_name(struct acpi_devnode *ad,
 		if (clear == 0 && anu->Ascii[i] == '_')
 			ad->ad_name[i] = '\0';
 		else {
 			ad->ad_name[i] = anu->Ascii[i];
 			clear = 1;
+		}
+	}
 	if (ad->ad_name[0] == '\0')
 		ad->ad_name[0] = '_';
+}
 bus_dma_tag_t
 acpi_default_dma_tag(struct acpi_softc *sc, struct acpi_devnode *ad)
+{
 	return sc->sc_dmat;
+}
 __weak_alias(acpi_get_dma_tag,acpi_default_dma_tag);
 bus_dma_tag_t
 acpi_default_dma64_tag(struct acpi_softc *sc, struct acpi_devnode *ad)
+{
 	return sc->sc_dmat64;
+}
 __weak_alias(acpi_get_dma64_tag,acpi_default_dma64_tag);
 /*
  * Device attachment.
  */
 static int
 acpi_rescan(device_t self, const char *ifattr, const int *locators)
+{
 	struct acpi_softc *sc = device_private(self);
 	struct acpi_attach_args aa;
 	/*
 	 * Try to attach hpet(4) first via a specific table.
 	 */
 	aa.aa_memt = sc->sc_memt;
 @@ -867,28 +884,28 @@ acpi_rescan_early(struct acpi_softc *sc)
 		if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE)
 			continue;
 		if (acpi_match_hid(ad->ad_devinfo, acpi_early_ids) == 0)
 			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 = sc->sc_dmat;
+		aa.aa_dmat = acpi_get_dma_tag(sc, ad);
-		aa.aa_dmat64 = sc->sc_dmat64;
+		aa.aa_dmat64 = acpi_get_dma64_tag(sc, ad);
 		ad->ad_device = config_found_ia(sc->sc_dev,
 		    "acpinodebus", &aa, acpi_print);
+	}
+}
 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;
 @@ -929,28 +946,28 @@ acpi_rescan_nodes(struct acpi_softc *sc)
 		if (acpi_match_hid(di, acpi_ignored_ids) != 0)
 			continue;
 		if (acpi_match_hid(di, hpet_ids) != 0 && sc->sc_hpet != NULL)
 			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 = sc->sc_dmat;
+		aa.aa_dmat = acpi_get_dma_tag(sc, ad);
-		aa.aa_dmat64 = sc->sc_dmat64;
+		aa.aa_dmat64 = acpi_get_dma64_tag(sc, ad);
 		ad->ad_device = config_found_ia(sc->sc_dev,
 		    "acpinodebus", &aa, acpi_print);
+	}
+}
 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;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpivar.h,v 1.77 2018/10/25 10:38:57 jmcneill Exp $	*/
+/*	$NetBSD: acpivar.h,v 1.78 2019/12/29 23:47:56 jmcneill Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -374,23 +374,26 @@ struct acpi_quirk {
 #define ACPI_QUIRK_BADPCI	0x00000002	/* bad PCI hierarchy */
 #define ACPI_QUIRK_BADBBN	0x00000004	/* _BBN broken */
 #define ACPI_QUIRK_IRQ0		0x00000008	/* bad 0->2 irq override */
 #define ACPI_QUIRK_OLDBIOS	0x00000010	/* BIOS date blacklisted */
 int	acpi_find_quirks(void);
 int	acpi_quirks_osi_add(const char *);
 int	acpi_quirks_osi_del(const char *);
 #ifdef ACPI_DEBUG
 void	acpi_debug_init(void);
 #endif
 bus_dma_tag_t	acpi_get_dma_tag(struct acpi_softc *, struct acpi_devnode *);
 bus_dma_tag_t	acpi_get_dma64_tag(struct acpi_softc *, struct acpi_devnode *);
 /*
  * Misc routines with vectors updated by acpiverbose module.
  */
 extern void	(*acpi_print_verbose)(struct acpi_softc *);
 extern void	(*acpi_print_dev)(const char *);
 void		acpi_load_verbose(void);
 extern int	acpi_verbose_loaded;
 #endif	/* !_SYS_DEV_ACPI_ACPIVAR_H */