 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_machdep.c,v 1.10 2019/08/12 15:37:26 skrll Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.11 2019/12/22 15:57:06 thorpej 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.10 2019/08/12 15:37:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.11 2019/12/22 15:57:06 thorpej 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>
 @@ -247,26 +247,40 @@ acpi_md_OsEnableInterrupt(void)
 void
 acpi_md_OsDisableInterrupt(void)
+{
 	cpsid(I32_bit);
+}
 void *
 acpi_md_intr_establish(uint32_t irq, int ipl, int type, int (*handler)(void *), void *arg, bool mpsafe, const char *xname)
+{
 	return intr_establish_xname(irq, ipl, type | (mpsafe ? IST_MPSAFE : 0), handler, arg, xname);
+}
 void
 acpi_md_intr_mask(void *ih)
+{
 	/* XXX */
 	panic("acpi_md_intr_mask(%p): not implemented", ih);
+}
 void
 acpi_md_intr_unmask(void *ih)
+{
 	/* XXX */
 	panic("acpi_md_intr_unmask(%p): not implemented", ih);
+}
 void
 acpi_md_intr_disestablish(void *ih)
+{
 	intr_disestablish(ih);
+}
 int
 acpi_md_sleep(int state)
+{
 	printf("ERROR: ACPI sleep not implemented on this platform\n");
 	return -1;
+}
 uint32_t

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_machdep.h,v 1.2 2018/11/16 23:03:55 jmcneill Exp $ */
+/* $NetBSD: acpi_machdep.h,v 1.3 2019/12/22 15:57:06 thorpej 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.
 @@ -38,26 +38,28 @@ ACPI_STATUS		acpi_md_OsInitialize(void);
 ACPI_PHYSICAL_ADDRESS	acpi_md_OsGetRootPointer(void);
 ACPI_STATUS		acpi_md_OsInstallInterruptHandler(UINT32, ACPI_OSD_HANDLER,
 							  void *, void **, const char *);
 void			acpi_md_OsRemoveInterruptHandler(void *);
 ACPI_STATUS		acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS, UINT32, void **);
 void			acpi_md_OsUnmapMemory(void *, UINT32);
 ACPI_STATUS		acpi_md_OsGetPhysicalAddress(void *, ACPI_PHYSICAL_ADDRESS *);
 BOOLEAN			acpi_md_OsReadable(void *, UINT32);
 BOOLEAN			acpi_md_OsWritable(void *, UINT32);
 void			acpi_md_OsEnableInterrupt(void);
 void			acpi_md_OsDisableInterrupt(void);
 void *			acpi_md_intr_establish(uint32_t, int, int, int (*)(void *),
 					       void *, bool, const char *);
 void			acpi_md_intr_mask(void *);
 void			acpi_md_intr_unmask(void *);
 void			acpi_md_intr_disestablish(void *);
 int			acpi_md_sleep(int);
 uint32_t		acpi_md_pdc(void);
 uint32_t		acpi_md_ncpus(void);
 void			acpi_md_callback(struct acpi_softc *);
 static inline int
 _acpi_notimpl(const char *fn)
+{
 	printf("WARNING: ACPI function %s not implemented on this platform\n", fn);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_machdep.c,v 1.9 2018/11/17 20:53:35 scole Exp $	*/
+/*	$NetBSD: acpi_machdep.c,v 1.10 2019/12/22 15:57:06 thorpej Exp $	*/
 /*
  * Copyright (c) 2009 KIYOHARA Takashi
  * 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.
+ *
 @@ -18,27 +18,27 @@
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
  */
 /*
  * Machine-dependent routines for ACPICA.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.9 2018/11/17 20:53:35 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.10 2019/12/22 15:57:06 thorpej Exp $");
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 #include <machine/efi.h>
 #include <machine/intrdefs.h>
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpivar.h>
 #include <machine/acpi_machdep.h>
 @@ -116,26 +116,40 @@ acpi_md_OsRemoveInterruptHandler(void *c
 	intr_disestablish(cookie);
+}
 void *
 acpi_md_intr_establish(uint32_t irq, int ipl, int type, int (*handler)(void *),
     void *arg, bool mpsafe, const char *xname)
+{
 	const int vec = acpi_isa_irq_to_vector(irq);
 	return intr_establish(vec, type, ipl, handler, arg);
+}
 void
 acpi_md_intr_mask(void *ih)
+{
 	/* XXX */
 	panic("acpi_md_intr_mask(%p): not implemented", ih);
+}
 void
 acpi_md_intr_unmask(void *ih)
+{
 	/* XXX */
 	panic("acpi_md_intr_unmask(%p): not implemented", ih);
+}
 void
 acpi_md_intr_disestablish(void *ih)
+{
 	intr_disestablish(ih);
+}
 ACPI_STATUS
 acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, UINT32 Length,
 		    void **LogicalAddress)
+{
 	if (bus_space_map(IA64_BUS_SPACE_MEM, PhysicalAddress, Length,
 , (bus_space_handle_t *) LogicalAddress) == 0)
 		return AE_OK;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_machdep.h,v 1.8 2018/11/16 23:03:55 jmcneill Exp $	*/
+/*	$NetBSD: acpi_machdep.h,v 1.9 2019/12/22 15:57:07 thorpej Exp $	*/
 ACPI_STATUS		acpi_md_OsInitialize(void);
 ACPI_PHYSICAL_ADDRESS	acpi_md_OsGetRootPointer(void);
 #define acpi_md_OsIn8(x)	inb((x))
 #define acpi_md_OsIn16(x)	inw((x))
 #define acpi_md_OsIn32(x)	inl((x))
 #define acpi_md_OsOut8(x, v)	outb((x), (v))
 #define acpi_md_OsOut16(x, v)	outw((x), (v))
 #define acpi_md_OsOut32(x, v)	outl((x), (v))
 ACPI_STATUS acpi_md_OsInstallInterruptHandler(UINT32, ACPI_OSD_HANDLER,
 @@ -17,20 +17,22 @@ void acpi_md_OsRemoveInterruptHandler(vo
 ACPI_STATUS acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS, UINT32, void **);
 void acpi_md_OsUnmapMemory(void *, UINT32);
 ACPI_STATUS acpi_md_OsGetPhysicalAddress(void *LogicalAddress,
 					 ACPI_PHYSICAL_ADDRESS *PhysicalAddress);
 BOOLEAN		acpi_md_OsReadable(void *, UINT32);
 BOOLEAN		acpi_md_OsWritable(void *, UINT32);
 void		acpi_md_OsEnableInterrupt(void);
 void		acpi_md_OsDisableInterrupt(void);
 void *		acpi_md_intr_establish(uint32_t, int, int, int (*)(void *),
 				       void *, bool, const char *);
 void		acpi_md_intr_mask(void *);
 void		acpi_md_intr_unmask(void *);
 void		acpi_md_intr_disestablish(void *);
 int		acpi_md_sleep(int);
 uint32_t	acpi_md_pdc(void);
 uint32_t	acpi_md_ncpus(void);
 struct acpi_softc;
 void		acpi_md_callback(struct acpi_softc *);

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_machdep.c,v 1.28 2019/09/12 14:28:08 martin Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.29 2019/12/22 15:57:07 thorpej 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * Machine-dependent routines for ACPICA.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.28 2019/09/12 14:28:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.29 2019/12/22 15:57:07 thorpej 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 <machine/cpufunc.h>
 #include <machine/bootinfo.h>
 #include <machine/autoconf.h>
 @@ -343,26 +343,38 @@ acpi_md_intr_establish(uint32_t Interrup
 	ih = intr_establish_xname(irq, pic, pin, type, ipl,
 	    handler, arg, mpsafe, xname);
 #if NIOAPIC > 0
 	if (mipp) {
 		*mipp = NULL;
+	}
 #endif
 	return ih;
+}
 void
 acpi_md_intr_mask(void *ih)
+{
 	intr_mask(ih);
+}
 void
 acpi_md_intr_unmask(void *ih)
+{
 	intr_unmask(ih);
+}
 void
 acpi_md_intr_disestablish(void *ih)
+{
 	intr_disestablish(ih);
+}
 ACPI_STATUS
 acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress,
     uint32_t Length, void **LogicalAddress)
+{
 	int rv;
 	rv = _x86_memio_map(x86_bus_space_mem, PhysicalAddress,
 	    Length, 0, (bus_space_handle_t *)LogicalAddress);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_machdep.h,v 1.13 2018/11/16 23:03:55 jmcneill Exp $	*/
+/*	$NetBSD: acpi_machdep.h,v 1.14 2019/12/22 15:57:07 thorpej 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
 @@ -62,24 +62,26 @@ void		acpi_md_OsRemoveInterruptHandler(v
 ACPI_STATUS	acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS, UINT32, void **);
 void		acpi_md_OsUnmapMemory(void *, UINT32);
 ACPI_STATUS	acpi_md_OsGetPhysicalAddress(void *LogicalAddress,
 		    ACPI_PHYSICAL_ADDRESS *PhysicalAddress);
 BOOLEAN		acpi_md_OsReadable(void *, UINT32);
 BOOLEAN		acpi_md_OsWritable(void *, UINT32);
 void		acpi_md_OsDisableInterrupt(void);
 void		acpi_md_OsEnableInterrupt(void);
 void *		acpi_md_intr_establish(uint32_t, int, int, int (*)(void *),
 		    void *, bool, const char *);
 void		acpi_md_intr_mask(void *);
 void		acpi_md_intr_unmask(void *);
 void		acpi_md_intr_disestablish(void *);
 int		acpi_md_sleep(int);
 void		acpi_md_sleep_init(void);
 uint32_t	acpi_md_pdc(void);
 uint32_t	acpi_md_ncpus(void);
 struct acpi_softc;
 void		acpi_md_callback(struct acpi_softc *);
 #endif /* !_X86_ACPI_MACHDEP_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_intr.h,v 1.3 2018/11/16 23:05:50 jmcneill Exp $ */
+/* $NetBSD: acpi_intr.h,v 1.4 2019/12/22 15:57:07 thorpej Exp $ */
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * 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.
 @@ -18,17 +18,25 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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.
  */
 #ifndef _DEV_ACPI_ACPI_INTR_H_
 #define	_DEV_ACPI_ACPI_INTR_H_
 void *		acpi_intr_establish(device_t, uint64_t, int, bool,
 		    int (*intr)(void *), void *, const char *);
 void		acpi_intr_mask(void *);
 void		acpi_intr_unmask(void *);
 void 		acpi_intr_disestablish(void *);
 const char * 	acpi_intr_string(void *, char *, size_t len);
 #endif /* _DEV_ACPI_ACPI_INTR_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_util.c,v 1.15 2018/12/21 14:51:12 jmcneill Exp $ */
+/*	$NetBSD: acpi_util.c,v 1.16 2019/12/22 15:57:07 thorpej 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.
 @@ -55,27 +55,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_util.c,v 1.15 2018/12/21 14:51:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.16 2019/12/22 15:57:07 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/cpu.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_intr.h>
 #include <machine/acpi_machdep.h>
 #define _COMPONENT	ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME	("acpi_util")
 @@ -581,26 +581,42 @@ acpi_intr_establish(device_t dev, uint64
 		goto end;
 	aih = kmem_alloc(sizeof(struct acpi_irq_handler), KM_SLEEP);
 	aih->aih_hdl = hdl;
 	aih->aih_irq = irq->ar_irq;
 	aih->aih_ih = ih;
 end:
 	acpi_resource_cleanup(&res);
 	return aih;
+}
 void
 acpi_intr_mask(void *c)
+{
 	struct acpi_irq_handler * const aih = c;
 	acpi_md_intr_mask(aih->aih_ih);
+}
 void
 acpi_intr_unmask(void *c)
+{
 	struct acpi_irq_handler * const aih = c;
 	acpi_md_intr_unmask(aih->aih_ih);
+}
 void
 acpi_intr_disestablish(void *c)
+{
 	struct acpi_irq_handler *aih = c;
 	acpi_md_intr_disestablish(aih->aih_ih);
 	kmem_free(aih, sizeof(struct acpi_irq_handler));
+}
 const char *
 acpi_intr_string(void *c, char *buf, size_t size)
+{
 	struct acpi_irq_handler *aih = c;
 	intr_handle_t ih = aih->aih_irq;