 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofw_subr.c,v 1.46 2021/01/24 17:44:16 thorpej Exp $	*/
+/*	$NetBSD: ofw_subr.c,v 1.47 2021/01/24 19:38:37 thorpej Exp $	*/
 /*
  * Copyright 1998
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -24,27 +24,27 @@
  * 3) This software is provided "AS-IS" and any express or implied
  *    warranties, including but not limited to, any implied warranties
  *    of merchantability, fitness for a particular purpose, or
  *    non-infringement are disclaimed. In no event shall DIGITAL be
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.46 2021/01/24 17:44:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.47 2021/01/24 19:38:37 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <dev/ofw/openfirm.h>
 #define	OFW_MAX_STACK_BUF_SIZE	256
 #define	OFW_PATH_BUF_SIZE	512
 /*
  * int of_decode_int(p)
 @@ -91,80 +91,51 @@ of_decode_int(const unsigned char *p)
  *			indicates compatibility.
+ *
  * Return Value:
  *	-1 if none of the strings are found in phandle's "compatibility"
  *	property, or the reverse index of the matching string in the
  *	phandle's "compatibility" property.
+ *
  * Side Effects:
  *	None.
  */
 int
 of_compatible(int phandle, const char * const *strings)
+{
 	char *prop, propbuf[OFW_MAX_STACK_BUF_SIZE];
 	const char *cp;
 	int proplen, match, rv = -1;
-	int len, olen, allocated, nstr, cstr, rv;
+	proplen = OF_getproplen(phandle, "compatible");
-	char *buf, sbuf[OFW_MAX_STACK_BUF_SIZE];
+	if (proplen <= 0) {
-	const char *sp, *nsp;
+		return -1;
 	len = OF_getproplen(phandle, "compatible");
 	if (len <= 0)
 		return (-1);
 	if (len > sizeof(sbuf)) {
 		buf = malloc(len, M_TEMP, M_WAITOK);
 		allocated = 1;
 	} else {
 		buf = sbuf;
 		allocated = 0;
+	}
-	/* 'compatible' size should not change. */
+	prop = kmem_tmpbuf_alloc(proplen, propbuf, sizeof(propbuf), KM_SLEEP);
 	if (OF_getprop(phandle, "compatible", buf, len) != len) {
-		rv = -1;
+	if (OF_getprop(phandle, "compatible", prop, proplen) != proplen) {
 		goto out;
+	}
-	/* count 'compatible' strings */
+	for (; (cp = *strings) != NULL; strings++) {
-	sp = buf;
+		if ((match = strlist_match(prop, proplen, cp)) != 0) {
-	nstr = 0;
+			rv = match - 1;
-	olen = len;
+			break;
 	while (len && (nsp = memchr(sp, 0, len)) != NULL) {
 		nsp++;			/* skip over NUL char */
 		len -= (nsp - sp);
-		sp = nsp;
+ out:
-		nstr++;
+	kmem_tmpbuf_free(prop, proplen, propbuf);
 	return rv;
 	len = olen;
 	sp = buf;
 	rv = nstr;
 	while (len && (nsp = memchr(sp, 0, len)) != NULL) {
 		rv--;
 		/* look for a match among the strings provided */
 		for (cstr = 0; strings[cstr] != NULL; cstr++)
 			if (strcmp(sp, strings[cstr]) == 0)
 				goto out;
 		nsp++;			/* skip over NUL char */
 		len -= (nsp - sp);
 		sp = nsp;
 	rv = -1;
 out:
 	if (allocated)
 		free(buf, M_TEMP);
 	return (rv);
+}
 /*
  * int of_match_compatible(phandle, strings)
+ *
  * This routine checks an OFW node's "compatible" entry to see if
  * it matches any of the provided strings.
+ *
  * It should be used when determining whether a driver can drive
  * a particular device.
+ *
  * Arguments:
  *	phandle		OFW phandle of device to be checked for