summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Wawrzynczak <twawrzynczak@chromium.org>2021-07-14 15:56:57 -0600
committerTim Wawrzynczak <twawrzynczak@chromium.org>2021-09-10 19:39:09 +0000
commitd96f3a25b43aaa999fab5a905f027bc29e5d2d47 (patch)
treeaa55c9b5324ffe0d96ab5d365b33a142b9f6227f /src
parente2b8f30beeb1b63e1b94dccc1a96bed5c9a2c63e (diff)
acpigen: Add ability to auto-generate _DSM Function 0
Since the value returned by _DSM function 0 for a given UUID is trivial to calculate, add the ability to do so to the acpigen_write_dsm() functions. Change-Id: Id9be050442485b42202cf91649aa94e56f35032a Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/56459 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/acpi/acpigen.c49
-rw-r--r--src/include/acpi/acpigen.h5
2 files changed, 50 insertions, 4 deletions
diff --git a/src/acpi/acpigen.c b/src/acpi/acpigen.c
index 8320b6cacc..c8f14378c9 100644
--- a/src/acpi/acpigen.c
+++ b/src/acpi/acpigen.c
@@ -16,6 +16,7 @@
#include <string.h>
#include <acpi/acpigen.h>
#include <assert.h>
+#include <commonlib/helpers.h>
#include <console/console.h>
#include <device/device.h>
#include <device/soundwire.h>
@@ -1643,6 +1644,38 @@ void acpigen_write_dsm(const char *uuid, void (**callbacks)(void *),
acpigen_write_dsm_uuid_arr(&id, 1);
}
+/*
+ * Create a supported functions bitmask
+ * bit 0: other functions than 0 are supported
+ * bits 1-x: function x supported
+ */
+static void acpigen_dsm_uuid_enum_functions(const struct dsm_uuid *id)
+{
+ const size_t bytes = DIV_ROUND_UP(id->count, BITS_PER_BYTE);
+ uint8_t *buffer = alloca(bytes);
+ bool set = false;
+ size_t cb_idx = 0;
+
+ memset(buffer, 0, bytes);
+
+ for (size_t i = 0; i < bytes; i++) {
+ for (size_t j = 0; j < BITS_PER_BYTE; j++) {
+ if (cb_idx >= id->count)
+ break;
+
+ if (id->callbacks[cb_idx++]) {
+ set = true;
+ buffer[i] |= BIT(j);
+ }
+ }
+ }
+
+ if (set)
+ buffer[0] |= BIT(0);
+
+ acpigen_write_return_byte_buffer(buffer, bytes);
+}
+
static void acpigen_write_dsm_uuid(struct dsm_uuid *id)
{
size_t i;
@@ -1656,7 +1689,17 @@ static void acpigen_write_dsm_uuid(struct dsm_uuid *id)
/* ToInteger (Arg2, Local1) */
acpigen_write_to_integer(ARG2_OP, LOCAL1_OP);
- for (i = 0; i < id->count; i++) {
+ /* If (LEqual(Local1, 0)) */
+ {
+ acpigen_write_if_lequal_op_int(LOCAL1_OP, 0);
+ if (id->callbacks[0])
+ id->callbacks[0](id->arg);
+ else if (id->count)
+ acpigen_dsm_uuid_enum_functions(id);
+ acpigen_write_if_end();
+ }
+
+ for (i = 1; i < id->count; i++) {
/* If (LEqual (Local1, i)) */
acpigen_write_if_lequal_op_int(LOCAL1_OP, i);
@@ -1664,13 +1707,13 @@ static void acpigen_write_dsm_uuid(struct dsm_uuid *id)
if (id->callbacks[i])
id->callbacks[i](id->arg);
- acpigen_pop_len(); /* If */
+ acpigen_write_if_end(); /* If */
}
/* Default case: Return (Buffer (One) { 0x0 }) */
acpigen_write_return_singleton_buffer(0x0);
- acpigen_pop_len(); /* If (LEqual (Local0, ToUUID(uuid))) */
+ acpigen_write_if_end(); /* If (LEqual (Local0, ToUUID(uuid))) */
}
diff --git a/src/include/acpi/acpigen.h b/src/include/acpi/acpigen.h
index 09ec4bce61..c019130e28 100644
--- a/src/include/acpi/acpigen.h
+++ b/src/include/acpi/acpigen.h
@@ -441,11 +441,14 @@ void acpigen_write_create_qword_field(uint8_t op, size_t byte_offset, const char
* This function takes as input uuid for the device, set of callbacks and
* argument to pass into the callbacks. Callbacks should ensure that Local0 and
* Local1 are left untouched. Use of Local2-Local7 is permitted in callbacks.
+ * If the first callback is NULL, then a default implementation of Function 0
+ * will be autogenerated, returning a package of bits corresponding to the
+ * function callbacks that are non-NULL.
*/
void acpigen_write_dsm(const char *uuid, void (**callbacks)(void *),
size_t count, void *arg);
-void acpigen_write_dsm_uuid_arr(struct dsm_uuid *ids, size_t count);
+void acpigen_write_dsm_uuid_arr(struct dsm_uuid *ids, size_t count);
/*
* Generate ACPI AML code for _CPC (Continuous Performance Control).
* Execute the package function once to create a global table, then