 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipmi.c,v 1.1 2018/12/25 11:56:13 mlelstv Exp $ */
+/*	$NetBSD: ipmi.c,v 1.2 2018/12/26 06:45:58 mlelstv Exp $ */
 /*
  * Copyright (c) 2006 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.
  * 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.
+ *
 @@ -42,27 +42,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 THE AUTHORS 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: ipmi.c,v 1.1 2018/12/25 11:56:13 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.2 2018/12/26 06:45:58 mlelstv Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/callout.h>
 #include <sys/envsys.h>
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 @@ -1841,27 +1841,27 @@ ipmi_map_regs(struct ipmi_softc *sc, str
 	if (ia->iaa_if_iotype == 'i')
 		sc->sc_iot = ia->iaa_iot;
 	else
 		sc->sc_iot = ia->iaa_memt;
 	sc->sc_if_rev = ia->iaa_if_rev;
 	sc->sc_if_iospacing = ia->iaa_if_iospacing;
 	if ((error = bus_space_map(sc->sc_iot, ia->iaa_if_iobase,
 	    sc->sc_if->nregs * sc->sc_if_iospacing, 0, &sc->sc_ioh)) != 0) {
 		const char *xname = sc->sc_dev ? device_xname(sc->sc_dev) :
 		    "ipmi0";
 		aprint_error("%s: %s:bus_space_map(..., %" PRIx64 ", %x"
 		    ", 0, %p) type %c failed %d\n",
-		    xname, __func__, ia->iaa_if_iobase,
+		    xname, __func__, (uint64_t)ia->iaa_if_iobase,
 		    sc->sc_if->nregs * sc->sc_if_iospacing, &sc->sc_ioh,
 		    ia->iaa_if_iotype, error);
 		return -1;
+	}
 #if 0
 	if (iaa->if_if_irq != -1)
 		sc->ih = isa_intr_establish(-1, iaa->if_if_irq,
 		    iaa->if_irqlvl, IPL_BIO, ipmi_intr, sc,
 		    device_xname(sc->sc_dev);
 #endif
 	return 0;
+}
 @@ -1990,27 +1990,28 @@ ipmi_thread(void *cookie)
 	if (sysmon_envsys_register(sc->sc_envsys)) {
 		aprint_error_dev(self, "unable to register with sysmon\n");
 		sysmon_envsys_destroy(sc->sc_envsys);
+	}
 	/* initialize sensor list for thread */
 	if (!SLIST_EMPTY(&ipmi_sensor_list))
 		sc->current_sensor = SLIST_FIRST(&ipmi_sensor_list);
 	aprint_verbose_dev(self, "version %d.%d interface %s %sbase "
 	    "0x%" PRIx64 "/%#x spacing %d\n",
 	    ia->iaa_if_rev >> 4, ia->iaa_if_rev & 0xF, sc->sc_if->name,
-	    ia->iaa_if_iotype == 'i' ? "io" : "mem", ia->iaa_if_iobase,
+	    ia->iaa_if_iotype == 'i' ? "io" : "mem",
 	    (uint64_t)ia->iaa_if_iobase,
 	    ia->iaa_if_iospacing * sc->sc_if->nregs, ia->iaa_if_iospacing);
 	if (ia->iaa_if_irq != -1)
 		aprint_verbose_dev(self, " irq %d\n", ia->iaa_if_irq);
 	/* setup flag to exclude iic */
 	ipmi_enabled = 1;
 	/* Setup Watchdog timer */
 	sc->sc_wdog.smw_name = device_xname(sc->sc_dev);
 	sc->sc_wdog.smw_cookie = sc;
 	sc->sc_wdog.smw_setmode = ipmi_watchdog_setmode;
 	sc->sc_wdog.smw_tickle = ipmi_watchdog_tickle;
 	sysmon_wdog_register(&sc->sc_wdog);

 @@ -1,14 +1,14 @@
-/* $NetBSD: ipmi_acpi.c,v 1.1 2018/12/25 11:56:14 mlelstv Exp $ */
+/* $NetBSD: ipmi_acpi.c,v 1.2 2018/12/26 06:45:58 mlelstv Exp $ */
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael van Elst
+ *
  * 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: ipmi_acpi.c,v 1.1 2018/12/25 11:56:14 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi_acpi.c,v 1.2 2018/12/26 06:45:58 mlelstv Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/ipmivar.h>
 #define _COMPONENT		ACPI_RESOURCE_COMPONENT
 ACPI_MODULE_NAME		("ipmi_acpi")
 @@ -82,26 +82,27 @@ ipmi_acpi_attach(device_t parent, device
+{
 	ipmi_acpi_softc_t *sc = device_private(self);
 	struct acpi_attach_args *aa = (struct acpi_attach_args *)opaque;
 	ACPI_STATUS rv;
 	ACPI_INTEGER itype, ivers, adr;
 	struct acpi_resources res;
 	struct acpi_io *io;
 	struct acpi_mem *mem;
 #if notyet
 	struct acpi_irq *irq;
 #endif
 	struct ipmi_attach_args IA, *ia = &IA;
 	bus_addr_t reg2;
 	uint16_t i2caddr;
 	sc->sc_dev = self;
 	aprint_naive("\n");
 	rv = acpi_eval_integer(aa->aa_node->ad_handle, "_IFT", &itype);
 	if (ACPI_FAILURE(rv)) {
 		aprint_error("no _IFT\n");
 		return;
+	}
 	rv = acpi_eval_integer(aa->aa_node->ad_handle, "_SRV", &ivers);
 	if (ACPI_FAILURE(rv)) {
 @@ -163,27 +164,34 @@ ipmi_acpi_attach(device_t parent, device
 		if (reg2 > ia->iaa_if_iobase)
 			ia->iaa_if_iospacing = reg2 - ia->iaa_if_iobase;
 		config_found_ia(self, "ipmibus", ia, 0);
 		break;
 	case IPMI_IF_SSIF:
 		rv = acpi_eval_integer(aa->aa_node->ad_handle, "_ADR", &adr);
 		if (ACPI_FAILURE(rv)) {
 			aprint_normal("\n");
 			aprint_error_dev(self, "no resources\n");
 			return;
+		}
-		aprint_normal(": i2c 0x%lx\n", adr);
+		if (adr > 65535) {
 			aprint_normal("\n");
 			aprint_error_dev(self, "i2c address out of range\n");
 			return;
+		}
 		i2caddr = adr;
 		aprint_normal(": i2c 0x%x\n", i2caddr);
 		break;
 	default:
 		aprint_normal("\n");
 		aprint_error_dev(self, "unknown interface type\n");
 		return;
+	}
 	sc->sc_init = true;
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}