 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_util.c,v 1.16 2019/12/22 15:57:07 thorpej Exp $ */
+/*	$NetBSD: acpi_util.c,v 1.17 2019/12/29 13:45:11 jmcneill 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.16 2019/12/22 15:57:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.17 2019/12/29 13:45:11 jmcneill 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")
 @@ -623,67 +623,95 @@ acpi_intr_string(void *c, char *buf, siz
 	return intr_string(ih, buf, size);
+}
 /*
  * USB Device-Specific Data (_DSD) support
  */
 static UINT8 acpi_dsd_uuid[ACPI_UUID_LENGTH] = {
 x14, 0xd8, 0xff, 0xda, 0xba, 0x6e, 0x8c, 0x4d,
 x8a, 0x91, 0xbc, 0x9b, 0xbf, 0x4a, 0xa3, 0x01
 };
-ACPI_STATUS
+static ACPI_STATUS
-acpi_dsd_integer(ACPI_HANDLE handle, const char *prop, ACPI_INTEGER *val)
+acpi_dsd_property(ACPI_HANDLE handle, const char *prop, ACPI_BUFFER *pbuf, ACPI_OBJECT_TYPE type, ACPI_OBJECT **ret)
+{
 	ACPI_OBJECT *obj, *uuid, *props, *pobj, *propkey, *propval;
 	ACPI_STATUS rv;
 	ACPI_BUFFER buf;
 	int n;
-	buf.Pointer = NULL;
+	rv = AcpiEvaluateObjectTyped(handle, "_DSD", NULL, pbuf, ACPI_TYPE_PACKAGE);
 	buf.Length = ACPI_ALLOCATE_BUFFER;
 	rv = AcpiEvaluateObjectTyped(handle, "_DSD", NULL, &buf, ACPI_TYPE_PACKAGE);
 	if (ACPI_FAILURE(rv))
 		return rv;
 	props = NULL;
-	obj = (ACPI_OBJECT *)buf.Pointer;
+	obj = (ACPI_OBJECT *)pbuf->Pointer;
 	for (n = 0; (n + 1) < obj->Package.Count; n += 2) {
 		uuid = &obj->Package.Elements[n];
 		if (uuid->Buffer.Length == ACPI_UUID_LENGTH &&
 		    memcmp(uuid->Buffer.Pointer, acpi_dsd_uuid, ACPI_UUID_LENGTH) == 0) {
 			props = &obj->Package.Elements[n + 1];
 			break;
+		}
+	}
-	if (props == NULL) {
+	if (props == NULL)
-		rv = AE_NOT_FOUND;
+		return AE_NOT_FOUND;
 		goto done;
 	for (n = 0; n < props->Package.Count; n++) {
 		pobj = &props->Package.Elements[n];
 		if (pobj->Type != ACPI_TYPE_PACKAGE || pobj->Package.Count != 2)
 			continue;
 		propkey = (ACPI_OBJECT *)&pobj->Package.Elements[0];
 		propval = (ACPI_OBJECT *)&pobj->Package.Elements[1];
 		if (propkey->Type != ACPI_TYPE_STRING)
 			continue;
 		if (strcmp(propkey->String.Pointer, prop) != 0)
 			continue;
-		if (propval->Type != ACPI_TYPE_INTEGER) {
+		if (propval->Type != type) {
-			rv = AE_TYPE;
+			return AE_TYPE;
 		} else {
-			*val = propval->Integer.Value;
+			*ret = propval;
-			rv = AE_OK;
+			return AE_OK;
+		}
 		break;
+	}
-done:
+	return AE_NOT_FOUND;
+}
 ACPI_STATUS
 acpi_dsd_integer(ACPI_HANDLE handle, const char *prop, ACPI_INTEGER *val)
+{
 	ACPI_OBJECT *propval;
 	ACPI_STATUS rv;
 	ACPI_BUFFER buf;
 	buf.Pointer = NULL;
 	buf.Length = ACPI_ALLOCATE_BUFFER;
 	rv = acpi_dsd_property(handle, prop, &buf, ACPI_TYPE_INTEGER, &propval);
 	if (ACPI_SUCCESS(rv))
 		*val = propval->Integer.Value;
 	ACPI_FREE(buf.Pointer);
 	return rv;
+}
 ACPI_STATUS
 acpi_dsd_string(ACPI_HANDLE handle, const char *prop, char **val)
+{
 	ACPI_OBJECT *propval;
 	ACPI_STATUS rv;
 	ACPI_BUFFER buf;
 	buf.Pointer = NULL;
 	buf.Length = ACPI_ALLOCATE_BUFFER;
 	rv = acpi_dsd_property(handle, prop, &buf, ACPI_TYPE_STRING, &propval);
 	if (ACPI_SUCCESS(rv))
 		*val = kmem_strdup(propval->String.Pointer, KM_SLEEP);
 	ACPI_FREE(buf.Pointer);
 	return rv;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_util.h,v 1.7 2018/12/21 14:51:12 jmcneill Exp $ */
+/*	$NetBSD: acpi_util.h,v 1.8 2019/12/29 13:45:11 jmcneill 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.
 @@ -79,15 +79,16 @@ ACPI_STATUS	acpi_foreach_package_object(
 ACPI_STATUS	acpi_get(ACPI_HANDLE, ACPI_BUFFER *,
 			ACPI_STATUS (*)(ACPI_HANDLE, ACPI_BUFFER *));
 struct acpi_devnode *acpi_match_node(ACPI_HANDLE handle);
 void		     acpi_match_node_init(struct acpi_devnode *ad);
 const char	*acpi_name(ACPI_HANDLE);
 int		 acpi_match_hid(ACPI_DEVICE_INFO *, const char * const *);
 int		 acpi_match_class(ACPI_HANDLE, uint8_t, uint8_t, uint8_t);
 ACPI_HANDLE	 acpi_match_cpu_info(struct cpu_info *);
 struct cpu_info *acpi_match_cpu_handle(ACPI_HANDLE);
 ACPI_STATUS	 acpi_dsd_integer(ACPI_HANDLE, const char *, ACPI_INTEGER *);
 ACPI_STATUS	 acpi_dsd_string(ACPI_HANDLE, const char *, char **);
 #endif	/* !_SYS_DEV_ACPI_ACPI_UTIL_H */