 @@ -1,17 +1,17 @@
-/* $NetBSD: acpi_i2c.c,v 1.10 2021/01/26 00:19:53 jmcneill Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.11 2021/01/26 01:23:08 thorpej Exp $ */
 /*-
- * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * Copyright (c) 2017, 2021 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.
  * 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,133 +20,38 @@
  * ``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: acpi_i2c.c,v 1.10 2021/01/26 00:19:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.11 2021/01/26 01:23:08 thorpej Exp $");
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_i2c.h>
 #include <dev/i2c/i2cvar.h>
 #include <sys/kmem.h>
 #define _COMPONENT	ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME	("acpi_i2c")
 static void
 acpi_enter_i2c_hid(struct acpi_devnode *devnode, prop_dictionary_t dev)
 	ACPI_OBJECT_LIST arg;
 	ACPI_OBJECT obj[4];
 	ACPI_OBJECT *osc;
 	ACPI_BUFFER buf;
 	ACPI_STATUS rv;
 	/* 3cdff6f7-4267-4555-ad05-b30a3d8938de */
 	static uint8_t i2c_hid_guid[] = {
 xF7, 0xF6, 0xDF, 0x3C, 0x67, 0x42, 0x55, 0x45,
 xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE,
 	};
 	arg.Count = 4;
 	arg.Pointer = obj;
 	obj[0].Type = ACPI_TYPE_BUFFER;
 	obj[0].Buffer.Length = sizeof(i2c_hid_guid);
 	obj[0].Buffer.Pointer = i2c_hid_guid;
 	/* rev */
 	obj[1].Type = ACPI_TYPE_INTEGER;
 	obj[1].Integer.Value = 1;
 	/* func */
 	obj[2].Type = ACPI_TYPE_INTEGER;
 	obj[2].Integer.Value = 1;
 	obj[3].Type = ACPI_TYPE_PACKAGE;
 	obj[3].Buffer.Length = 0;
 	buf.Pointer = NULL;
 	buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
 	rv = AcpiEvaluateObject(devnode->ad_handle, "_DSM", &arg, &buf);
 	if (ACPI_FAILURE(rv)) {
 		aprint_error("failed to evaluate _DSM for %s: %s\n",
 		    devnode->ad_name, AcpiFormatException(rv));
 		return;
 	osc = buf.Pointer;
 	if (osc->Type != ACPI_TYPE_INTEGER) {
 		aprint_error("bad _DSM return type %d for %s\n",
 		    osc->Type, devnode->ad_name);
 		return;
 	prop_dictionary_set_uint32(dev, "hid-descr-addr", osc->Integer.Value);
 struct acpi_i2c_id {
 	const char *id;
 	const char *compat;
 	const int compatlen;
 	void (*parse)(struct acpi_devnode *, prop_dictionary_t);
 };
 static const struct acpi_i2c_id acpi_i2c_ids[] = {
 		.id = "PNP0C50",
 		.compat = "hid-over-i2c",
 		.compatlen = 13,
 		.parse = acpi_enter_i2c_hid
 	},
 		.id = "ACPI0C50",
 		.compat = "hid-over-i2c",
 		.compatlen = 13,
 		.parse = acpi_enter_i2c_hid
 	},
 		.id = "NXP0002",
 		.compat = "nxp,pca9547",
 		.compatlen = 12,
 		.parse = NULL
 	},
 		.id = NULL,
 		.compat = NULL,
 		.compatlen = 0,
 		.parse = NULL
 };
 static const struct acpi_i2c_id *
 acpi_i2c_search(const char *name)
 	int i;
 	for (i = 0; acpi_i2c_ids[i].id != NULL; i++) {
 		if (strcmp(name, acpi_i2c_ids[i].id) == 0)
 			return &acpi_i2c_ids[i];
 	return NULL;
 struct acpi_i2c_context {
 	uint16_t i2c_addr;
 };
 static ACPI_STATUS
 acpi_i2c_resource_parse_callback(ACPI_RESOURCE *res, void *context)
+{
 	struct acpi_i2c_context *i2cc = context;
 	switch (res->Type) {
 	case ACPI_RESOURCE_TYPE_END_TAG:
 		break;
 	case ACPI_RESOURCE_TYPE_SERIAL_BUS:
 @@ -160,80 +65,69 @@ acpi_i2c_resource_parse_callback(ACPI_RE
 		break;
 	default:
 		printf("resource type 0x%x ignored\n", res->Type);
+	}
 	return_ACPI_STATUS(AE_OK);
+}
 static void
 acpi_enter_i2c_device(struct acpi_devnode *ad, prop_array_t array)
+{
 	prop_dictionary_t dev;
 	struct acpi_i2c_context i2cc;
 	ACPI_STATUS rv;
 	int cidi;
 	ACPI_PNP_DEVICE_ID_LIST *idlist;
 	const char *name;
-	static const struct acpi_i2c_id *i2c_id;
+	char *clist;
 	size_t clist_size;
 	memset(&i2cc, 0, sizeof(i2cc));
 	rv = AcpiWalkResources(ad->ad_handle, "_CRS",
 	     acpi_i2c_resource_parse_callback, &i2cc);
 	if (ACPI_FAILURE(rv)) {
 		aprint_error("ACPI: unable to get resources "
 		   "for %s: %s\n", ad->ad_name,
 		   AcpiFormatException(rv));
 		return;
+	}
 	if (i2cc.i2c_addr == 0)
 		return;
 	dev = prop_dictionary_create();
 	if (dev == NULL) {
 		aprint_error("ignoring device %s (no memory)\n",
 		    ad->ad_name);
 		return;
+	}
-	if ((ad->ad_devinfo->Valid &  ACPI_VALID_HID) == 0)
+	clist = acpi_pack_compat_list(ad->ad_devinfo, &clist_size);
 	if (clist == NULL) {
 		prop_object_release(dev);
 		aprint_error("ignoring device %s (no _HID or _CID)\n",
 		    ad->ad_name);
 		return;
+	}
 	if ((ad->ad_devinfo->Valid & ACPI_VALID_HID) == 0)
 		name = ad->ad_name;
 	else
 		name = ad->ad_devinfo->HardwareId.String;
 	prop_dictionary_set_string(dev, "name", name);
 	prop_dictionary_set_uint32(dev, "addr", i2cc.i2c_addr);
 	prop_dictionary_set_uint64(dev, "cookie", (uintptr_t)ad->ad_handle);
 	prop_dictionary_set_uint32(dev, "cookietype", I2C_COOKIE_ACPI);
-	/* first search by name, then by CID */
+	prop_dictionary_set_data(dev, "compatible", clist, clist_size);
-	i2c_id = acpi_i2c_search(name);
+	kmem_free(clist, clist_size);
 	idlist = &ad->ad_devinfo->CompatibleIdList;
 	for (cidi = 0;
 	    cidi < idlist->Count && i2c_id == NULL;
 	    cidi++) {
 		i2c_id = acpi_i2c_search(idlist->Ids[cidi].String);
 	if (i2c_id != NULL) {
 		if (i2c_id->compat != NULL) {
 			prop_data_t data;
 			data = prop_data_create_copy(i2c_id->compat,
 			    i2c_id->compatlen);
 			prop_dictionary_set(dev, "compatible", data);
 			prop_object_release(data);
 		if (i2c_id->parse != NULL)
 			i2c_id->parse(ad, dev);
 	prop_array_add(array, dev);
 	prop_object_release(dev);
+}
 prop_array_t
 acpi_enter_i2c_devs(device_t dev, struct acpi_devnode *devnode)
+{
 	struct acpi_devnode *ad;
 	prop_array_t array = prop_array_create();
 	if (array == NULL)
 		return NULL;
 	SIMPLEQ_FOREACH(ad, &devnode->ad_child_head, ad_child_list) {
 		if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE)
 			continue;
 		if (!acpi_device_present(ad->ad_handle))

 @@ -1,14 +1,14 @@
-/* $NetBSD: ihidev.c,v 1.15 2021/01/26 01:15:39 thorpej Exp $ */
+/* $NetBSD: ihidev.c,v 1.16 2021/01/26 01:23:08 thorpej Exp $ */
 /* $OpenBSD ihidev.c,v 1.13 2017/04/08 02:57:23 deraadt 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
 @@ -44,27 +44,27 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * HID-over-i2c driver
+ *
  * https://msdn.microsoft.com/en-us/library/windows/hardware/dn642101%28v=vs.85%29.aspx
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.15 2021/01/26 01:15:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.16 2021/01/26 01:23:08 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/ihidev.h>
 #include <dev/hid/hid.h>
 #if defined(__i386__) || defined(__amd64__)
 @@ -116,26 +116,28 @@ static void	ihiddev_intr_fini(struct ihi
 static bool	ihidev_suspend(device_t, const pmf_qual_t *);
 static bool	ihidev_resume(device_t, const pmf_qual_t *);
 static int	ihidev_hid_command(struct ihidev_softc *, int, void *, bool);
 static int	ihidev_intr(void *);
 static void	ihidev_softintr(void *);
 static int	ihidev_reset(struct ihidev_softc *, bool);
 static int	ihidev_hid_desc_parse(struct ihidev_softc *);
 static int	ihidev_maxrepid(void *, int);
 static int	ihidev_print(void *, const char *);
 static int	ihidev_submatch(device_t, cfdata_t, const int *, void *);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "PNP0C50" },
 	{ .compat = "ACPI0C50" },
 	{ .compat = "hid-over-i2c" },
 	{ }
 };
 static int
 ihidev_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct i2c_attach_args * const ia = aux;
 	int match_result;
 	if (iic_use_direct_match(ia, match, compat_data, &match_result))
 		return I2C_MATCH_DIRECT_COMPATIBLE;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcai2cmux.c,v 1.6 2021/01/25 12:18:18 jmcneill Exp $	*/
+/*	$NetBSD: pcai2cmux.c,v 1.7 2021/01/26 01:23:08 thorpej Exp $	*/
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -24,27 +24,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.
  */
 #if defined(__i386__) || defined(__amd64__) || defined(__aarch64__)
 #include "acpica.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcai2cmux.c,v 1.6 2021/01/25 12:18:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcai2cmux.c,v 1.7 2021/01/26 01:23:08 thorpej Exp $");
 /*
  * Driver for NXP PCA954x / PCA984x I2C switches and multiplexers.
+ *
  * There are two flavors of this device:
+ *
  * - Multiplexers, which connect the upstream bus to one downstream bus
  *   at a time.
+ *
  * - Switches, which can connect the upstream bus to one or more downstream
  *   busses at a time (which is useful when using an all-call address for
  *   a large array of PCA9685 LED controllers, for example).
+ *
 @@ -123,48 +123,50 @@ static const struct device_compatible_en
 	  .data = &mux4_type },
 	/* PCA9545 - 4 channel i2c switch with interrupts */
 	{ .compat = "nxp,pca9545",
 	  .data = &switch4_type },
 	/* PCA9546 - 4 channel i2c switch */
 	{ .compat = "nxp,pca9546",
 	  .data = &switch4_type },
 	/* PCA9547 - 8 channel i2c mux */
 	{ .compat = "nxp,pca9547",
 	  .data = &mux8_type },
 	{ .compat = "NXP0002",
 	  .data = &mux8_type },
 	/* PCA9548 - 8 channel i2c switch */
 	{ .compat = "nxp,pca9548",
 	  .data = &switch8_type },
 	/* PCA9846 - 4 channel i2c switch */
 	{ .compat = "nxp,pca9846",
 	  .data = &switch4_type },
 	/* PCA9847 - 8 channel i2c mux */
 	{ .compat = "nxp,pca9847",
 	  .data = &mux8_type },
 	/* PCA9848 - 8 channel i2c switch */
 	{ .compat = "nxp,pca9848",
 	  .data = &switch8_type },
 	/* PCA9849 - 4 channel i2c mux */
 	{ .compat = "nxp,pca9849",
 	  .data = &mux4_type },
-	{ 0 }
+	{ }
 };
 struct pcaiicmux_softc {
 	struct iicmux_softc	sc_iicmux;
 	i2c_addr_t		sc_addr;
 	int			sc_cur_value;
 	const struct pcaiicmux_type *sc_type;
 	struct fdtbus_gpio_pin *sc_reset_gpio;
 	bool			sc_idle_disconnect;