@@ -206,12 +206,12 @@
compatible = "denx,u-boot-devres-test";
};
- acpi-test {
+ acpi_test1: acpi-test {
compatible = "denx,u-boot-acpi-test";
acpi-ssdt-test-data = "ab";
};
- acpi-test2 {
+ acpi_test2: acpi-test2 {
compatible = "denx,u-boot-acpi-test";
acpi-ssdt-test-data = "cd";
};
@@ -822,6 +822,7 @@
chosen {
#address-cells = <1>;
#size-cells = <1>;
+ u-boot,acpi-ssdt-order = <&acpi_test2 &acpi_test1>;
chosen-test {
compatible = "denx,u-boot-fdt-test";
reg = <9 1>;
@@ -134,3 +134,12 @@ Example
phandlepart = <&mmc 1>;
};
};
+
+u-boot,acpi-ssdt-order
+----------------------
+
+This provides the ordering to use when writing device data to the ACPI SSDT
+(Secondary System Descriptor Table). Each cell is a phandle pointer to a device
+node to add. The ACPI information is written in this order.
+
+If the ordering does not include all nodes, an error is generated.
@@ -95,6 +95,63 @@ static int acpi_add_item(struct acpi_ctx *ctx, struct udevice *dev,
return 0;
}
+struct acpi_item *find_item(const char *devname)
+{
+ int i;
+
+ for (i = 0; i < item_count; i++) {
+ struct acpi_item *item = &acpi_item[i];
+
+ if (!strcmp(devname, item->dev->name))
+ return item;
+ }
+
+ return NULL;
+}
+
+static int build_type(struct acpi_ctx *ctx, void *start, enum gen_type_t type)
+{
+ const u32 *order;
+ int size;
+ int count;
+ void *ptr;
+ void *end = ctx->current;
+
+ ptr = start;
+ order = ofnode_get_chosen_prop("u-boot,acpi-ssdt-order", &size);
+ if (!order) {
+ log_warning("Failed to find ordering, leaving as is\n");
+ return 0;
+ }
+
+ count = size / sizeof(u32);
+ while (count--) {
+ struct acpi_item *item;
+ const char *name;
+ ofnode node;
+
+ node = ofnode_get_by_phandle(fdt32_to_cpu(*order++));
+ name = ofnode_get_name(node);
+ item = find_item(name);
+ if (!item) {
+ log_err("Failed to find item '%s'\n", name);
+ return log_msg_ret("find", -ENOENT);
+ }
+ if (item->type == type) {
+ log_debug(" - add %s\n", item->dev->name);
+ memcpy(ptr, item->buf, item->size);
+ ptr += item->size;
+ }
+ }
+
+ if (ptr != end) {
+ log_warning("*** Missing bytes: ptr=%p, end=%p\n", ptr, end);
+ return -ENXIO;
+ }
+
+ return 0;
+}
+
int _acpi_fill_ssdt(struct acpi_ctx *ctx, struct udevice *parent)
{
struct acpi_ops *aops;
@@ -130,11 +187,15 @@ int _acpi_fill_ssdt(struct acpi_ctx *ctx, struct udevice *parent)
int acpi_fill_ssdt(struct acpi_ctx *ctx)
{
+ void *start = ctx->current;
int ret;
log_debug("Writing SSDT tables\n");
ret = _acpi_fill_ssdt(ctx, dm_root());
log_debug("Writing SSDT finished, err=%d\n", ret);
+ ret = build_type(ctx, start, TYPE_SSDT);
+ if (ret)
+ return log_msg_ret("build", ret);
return ret;
}
@@ -336,16 +336,19 @@ static int dm_test_acpi_fill_ssdt(struct unit_test_state *uts)
ut_assertnonnull(buf);
ctx.current = buf;
- buf[4] = 'z'; /* sentinal */
+ buf[4] = 'z'; /* sentinel */
ut_assertok(acpi_fill_ssdt(&ctx));
- /* These values come from acpi-test's acpi-ssdt-test-data property */
- ut_asserteq('a', buf[0]);
- ut_asserteq('b', buf[1]);
+ /*
+ * These values come from acpi-test2's acpi-ssdt-test-data property.
+ * This device comes first because of u-boot,acpi-ssdt-order
+ */
+ ut_asserteq('c', buf[0]);
+ ut_asserteq('d', buf[1]);
- /* These values come from acpi-test2's acpi-ssdt-test-data property */
- ut_asserteq('c', buf[2]);
- ut_asserteq('d', buf[3]);
+ /* These values come from acpi-test's acpi-ssdt-test-data property */
+ ut_asserteq('a', buf[2]);
+ ut_asserteq('b', buf[3]);
ut_asserteq('z', buf[4]);
Add a /chosen property to control the order in which the data appears in the SSDT. This allows matching up U-Boot's output from a dump of the known-good data obtained from within Linux. Signed-off-by: Simon Glass <sjg at chromium.org> --- arch/sandbox/dts/test.dts | 5 ++- doc/device-tree-bindings/chosen.txt | 9 +++++ drivers/core/acpi.c | 61 +++++++++++++++++++++++++++++ test/dm/acpi.c | 17 ++++---- 4 files changed, 83 insertions(+), 9 deletions(-)