[src/trunk]: src/sys/dev/acpi - Add a new routine, acpi_pack_compat_list(), t...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/53b367efe821
branches:  trunk
changeset: 949715:53b367efe821
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Jan 14 14:35:53 2021 +0000

description:
- Add a new routine, acpi_pack_compat_list(), that packs the _HID
  and _CID device ID strings into an OpenFirmware-like string list,
  analogous to how the "compatible" property is represented in
  OpenFirmware and the Device Tree specifications.
- Add generic routines for evaluating Device Specific Methods (_DSM).

diffstat:

 sys/dev/acpi/acpi_util.c |  144 +++++++++++++++++++++++++++++++++++++++++++++-
 sys/dev/acpi/acpi_util.h |   13 +++-
 2 files changed, 152 insertions(+), 5 deletions(-)

diffs (206 lines):

diff -r 75f1339f729b -r 53b367efe821 sys/dev/acpi/acpi_util.c
--- a/sys/dev/acpi/acpi_util.c  Thu Jan 14 08:22:51 2021 +0000
+++ b/sys/dev/acpi/acpi_util.c  Thu Jan 14 14:35:53 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: acpi_util.c,v 1.19 2020/10/23 10:59:37 jmcneill Exp $ */
+/*     $NetBSD: acpi_util.c,v 1.20 2021/01/14 14:35:53 thorpej Exp $ */
 
 /*-
- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
+ * Copyright (c) 2003, 2007, 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.19 2020/10/23 10:59:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.20 2021/01/14 14:35:53 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -306,6 +306,59 @@
 }
 
 /*
+ * Pack _HID and _CID ID strings into an OpenFirmware-like
+ * string list.
+ */
+char *
+acpi_pack_compat_list(ACPI_DEVICE_INFO *ad, size_t *sizep)
+{
+       KASSERT(sizep != NULL);
+
+       char *strlist, *cp;
+       size_t len = 0;
+       uint32_t i;
+
+       /*
+        * First calculate the total size required.
+        * N.B. PNP Device ID length includes terminating NUL.
+        */
+       if ((ad->Valid & ACPI_VALID_HID) != 0) {
+               len += ad->HardwareId.Length;
+       }
+
+       if ((ad->Valid & ACPI_VALID_CID) != 0) {
+               for (i = 0; i < ad->CompatibleIdList.Count; i++) {
+                       len += ad->CompatibleIdList.Ids[i].Length;
+               }
+       }
+
+       *sizep = len;
+       if (len == 0) {
+               return NULL;
+       }
+
+       cp = strlist = kmem_alloc(len, KM_SLEEP);
+
+       if ((ad->Valid & ACPI_VALID_HID) != 0) {
+               memcpy(cp, ad->HardwareId.String, ad->HardwareId.Length);
+               cp += ad->HardwareId.Length;
+       }
+
+       if ((ad->Valid & ACPI_VALID_CID) != 0) {
+               for (i = 0; i < ad->CompatibleIdList.Count; i++) {
+                       memcpy(cp, ad->CompatibleIdList.Ids[i].String,
+                           ad->CompatibleIdList.Ids[i].Length);
+                       cp += ad->CompatibleIdList.Ids[i].Length;
+               }
+       }
+
+       KASSERT((size_t)(cp - strlist) == len);
+
+       return strlist;
+}
+
+
+/*
  * Match given IDs against _HID and _CIDs.
  */
 int
@@ -636,7 +689,7 @@
 }
 
 /*
- * USB Device-Specific Data (_DSD) support
+ * Device-Specific Data (_DSD) support
  */
 
 static UINT8 acpi_dsd_uuid[ACPI_UUID_LENGTH] = {
@@ -728,3 +781,86 @@
                ACPI_FREE(buf.Pointer);
        return rv;
 }
+
+/*
+ * Device Specific Method (_DSM) support
+ */
+
+ACPI_STATUS
+acpi_dsm_typed(ACPI_HANDLE handle, uint8_t *uuid, ACPI_INTEGER rev,
+    ACPI_INTEGER func, const ACPI_OBJECT *arg3, ACPI_OBJECT_TYPE return_type,
+    ACPI_OBJECT **return_obj)
+{
+       ACPI_OBJECT_LIST arg;
+       ACPI_OBJECT obj[4];
+       ACPI_BUFFER buf;
+       ACPI_STATUS status;
+
+       arg.Count = 4;
+       arg.Pointer = obj;
+
+       obj[0].Type = ACPI_TYPE_BUFFER;
+       obj[0].Buffer.Length = ACPI_UUID_LENGTH;
+       obj[0].Buffer.Pointer = uuid;
+
+       obj[1].Type = ACPI_TYPE_INTEGER;
+       obj[1].Integer.Value = rev;
+
+       obj[2].Type = ACPI_TYPE_INTEGER;
+       obj[2].Integer.Value = func;
+
+       if (arg3 != NULL) {
+               obj[3] = *arg3;
+       } else {
+               obj[3].Type = ACPI_TYPE_PACKAGE;
+               obj[3].Package.Count = 0;
+               obj[3].Package.Elements = NULL;
+       }
+
+       buf.Pointer = NULL;
+       buf.Length = ACPI_ALLOCATE_BUFFER;
+
+       if (return_obj == NULL && return_type == ACPI_TYPE_ANY) {
+               status = AcpiEvaluateObject(handle, "_DSM", &arg, NULL);
+       } else {
+               *return_obj = NULL;
+               status = AcpiEvaluateObjectTyped(handle, "_DSM", &arg, &buf,
+                   return_type);
+       }
+       if (ACPI_FAILURE(status)) {
+               return status;
+       }
+       if (return_obj != NULL) {
+               *return_obj = buf.Pointer;
+       } else if (buf.Pointer != NULL) {
+               ACPI_FREE(buf.Pointer);
+       }
+       return AE_OK;
+}
+
+ACPI_STATUS
+acpi_dsm_integer(ACPI_HANDLE handle, uint8_t *uuid, ACPI_INTEGER rev,
+    ACPI_INTEGER func, const ACPI_OBJECT *arg3, ACPI_INTEGER *ret)
+{
+       ACPI_OBJECT *obj;
+       ACPI_STATUS status;
+
+       status = acpi_dsm_typed(handle, uuid, rev, func, arg3,
+           ACPI_TYPE_INTEGER, &obj);
+       if (ACPI_FAILURE(status)) {
+               return status;
+       }
+
+       *ret = obj->Integer.Value;
+       ACPI_FREE(obj);
+
+       return AE_OK;
+}
+
+ACPI_STATUS
+acpi_dsm(ACPI_HANDLE handle, uint8_t *uuid, ACPI_INTEGER rev,
+    ACPI_INTEGER func, const ACPI_OBJECT *arg3, ACPI_OBJECT **return_obj)
+{
+       return acpi_dsm_typed(handle, uuid, rev, func, arg3, ACPI_TYPE_ANY,
+           return_obj);
+}
diff -r 75f1339f729b -r 53b367efe821 sys/dev/acpi/acpi_util.h
--- a/sys/dev/acpi/acpi_util.h  Thu Jan 14 08:22:51 2021 +0000
+++ b/sys/dev/acpi/acpi_util.h  Thu Jan 14 14:35:53 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_util.h,v 1.8 2019/12/29 13:45:11 jmcneill Exp $ */
+/*     $NetBSD: acpi_util.h,v 1.9 2021/01/14 14:35:53 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -88,7 +88,18 @@
 ACPI_HANDLE     acpi_match_cpu_info(struct cpu_info *);
 struct cpu_info *acpi_match_cpu_handle(ACPI_HANDLE);
 
+char           *acpi_pack_compat_list(ACPI_DEVICE_INFO *, size_t *);
+
 ACPI_STATUS     acpi_dsd_integer(ACPI_HANDLE, const char *, ACPI_INTEGER *);
 ACPI_STATUS     acpi_dsd_string(ACPI_HANDLE, const char *, char **);
 
+ACPI_STATUS     acpi_dsm(ACPI_HANDLE, uint8_t *, ACPI_INTEGER,
+                       ACPI_INTEGER, const ACPI_OBJECT *, ACPI_OBJECT **);
+ACPI_STATUS     acpi_dsm_typed(ACPI_HANDLE, uint8_t *, ACPI_INTEGER,
+                       ACPI_INTEGER, const ACPI_OBJECT *,
+                       ACPI_OBJECT_TYPE, ACPI_OBJECT **);
+ACPI_STATUS     acpi_dsm_integer(ACPI_HANDLE, uint8_t *, ACPI_INTEGER,
+                       ACPI_INTEGER, const ACPI_OBJECT *,
+                       ACPI_INTEGER *);
+
 #endif /* !_SYS_DEV_ACPI_ACPI_UTIL_H */