 @@ -1,14 +1,14 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.52 2021/05/29 16:49:57 riastradh Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.53 2021/05/30 11:24:10 riastradh Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. 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.
 @@ -17,27 +17,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: thinkpad_acpi.c,v 1.52 2021/05/29 16:49:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.53 2021/05/30 11:24:10 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/sdt.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_ecvar.h>
 #include <dev/acpi/acpi_power.h>
 #include <dev/isa/isareg.h>
 @@ -45,26 +45,27 @@ __KERNEL_RCSID(0, "$NetBSD: thinkpad_acp
 #define _COMPONENT		ACPI_RESOURCE_COMPONENT
 ACPI_MODULE_NAME		("thinkpad_acpi")
 #define	THINKPAD_NTEMPSENSORS	8
 #define	THINKPAD_NFANSENSORS	1
 #define	THINKPAD_NSENSORS	(THINKPAD_NTEMPSENSORS + THINKPAD_NFANSENSORS)
 typedef struct thinkpad_softc {
 	device_t		sc_dev;
 	device_t		sc_ecdev;
 	struct acpi_devnode	*sc_node;
 	ACPI_HANDLE		sc_powhdl;
 	ACPI_HANDLE		sc_cmoshdl;
 	ACPI_INTEGER		sc_ver;
 #define	TP_PSW_SLEEP		0	/* FnF4 */
 #define	TP_PSW_HIBERNATE	1	/* FnF12 */
 #define	TP_PSW_DISPLAY_CYCLE	2	/* FnF7 */
 #define	TP_PSW_LOCK_SCREEN	3	/* FnF2 */
 #define	TP_PSW_BATTERY_INFO	4	/* FnF3 */
 #define	TP_PSW_EJECT_BUTTON	5	/* FnF9 */
 #define	TP_PSW_ZOOM_BUTTON	6	/* FnSPACE */
 #define	TP_PSW_VENDOR_BUTTON	7	/* ThinkVantage */
 #define	TP_PSW_FNF1_BUTTON	8	/* FnF1 */
 #define	TP_PSW_WIRELESS_BUTTON	9	/* FnF5 */
 #define	TP_PSW_WWAN_BUTTON	10	/* FnF6 */
 #define	TP_PSW_POINTER_BUTTON	11	/* FnF8 */
 @@ -231,33 +232,78 @@ thinkpad_attach(device_t parent, device_
 	for (curdev = deviter_first(&di, DEVITER_F_ROOT_FIRST);
 	     curdev != NULL; curdev = deviter_next(&di))
 		if (device_is_a(curdev, "acpiecdt") ||
 		    device_is_a(curdev, "acpiec")) {
 			sc->sc_ecdev = curdev;
 			break;
+		}
 	deviter_release(&di);
 	if (sc->sc_ecdev)
 		aprint_debug_dev(self, "using EC at %s\n",
 		    device_xname(sc->sc_ecdev));
-	/* Get the supported event mask */
+	/* Query the version number */
-	rv = acpi_eval_integer(sc->sc_node->ad_handle, "MHKA", &val);
+	rv = acpi_eval_integer(aa->aa_node->ad_handle, "MHKV", &sc->sc_ver);
 	if (ACPI_FAILURE(rv)) {
-		aprint_error_dev(self, "couldn't evaluate MHKA: %s\n",
+		aprint_error_dev(self, "couldn't evaluate MHKV: %s\n",
 		    AcpiFormatException(rv));
 		goto fail;
+	}
 	aprint_normal_dev(self, "version %04x\n", (unsigned)sc->sc_ver);
 	/* Get the supported event mask */
 	switch (sc->sc_ver) {
 	case THINKPAD_HKEY_VERSION_1:
 		rv = acpi_eval_integer(sc->sc_node->ad_handle, "MHKA", &val);
 		if (ACPI_FAILURE(rv)) {
 			aprint_error_dev(self, "couldn't evaluate MHKA: %s\n",
 			    AcpiFormatException(rv));
 			goto fail;
+		}
 		break;
 	case THINKPAD_HKEY_VERSION_2: {
 		ACPI_OBJECT args[1] = {
 			[0] = { .Integer = {
 				.Type = ACPI_TYPE_INTEGER,
 				.Value = 1, /* hotkey events */
 			} },
 		};
 		ACPI_OBJECT_LIST arglist = {
 			.Count = __arraycount(args),
 			.Pointer = args,
 		};
 		ACPI_OBJECT ret;
 		ACPI_BUFFER buf = { .Pointer = &ret, .Length = sizeof(ret) };
 		rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "MHKA",
 		    &arglist, &buf);
 		if (ACPI_FAILURE(rv)) {
 			aprint_error_dev(self, "couldn't evaluate MHKA(1):"
 			    " %s\n",
 			    AcpiFormatException(rv));
 			goto fail;
+		}
 		if (buf.Length == 0 || ret.Type != ACPI_TYPE_INTEGER) {
 			aprint_error_dev(self, "failed to evaluate MHKA(1)\n");
 			goto fail;
+		}
 		val = ret.Integer.Value;
 		break;
+	}
 	default:
 		panic("%s: invalid version %jd", device_xname(self),
 		    (intmax_t)sc->sc_ver);
+	}
 	/* Enable all supported events */
 	rv = thinkpad_mask_init(sc, val);
 	if (ACPI_FAILURE(rv)) {
 		aprint_error_dev(self, "couldn't set event mask: %s\n",
 		    AcpiFormatException(rv));
 		goto fail;
+	}
 	(void)acpi_register_notify(sc->sc_node, thinkpad_notify_handler);
 	/*
 	 * Obtain a handle for CMOS commands. This is used by T61.