提交 55089fa2 编写于 作者: I Igor Mammedov 提交者: Michael S. Tsirkin

tests: acpi: fetch X_DSDT if pointer to DSDT is 0

that way it would be possible to test a DSDT pointed by
64bit X_DSDT field in FADT.

PS:
it will allow to enable testing arm/virt board, which sets
only newer X_DSDT field.
Signed-off-by: NIgor Mammedov <imammedo@redhat.com>
Message-Id: <1556808723-226478-6-git-send-email-imammedo@redhat.com>
Reviewed-by: NWei Yang <richardw.yang@linux.intel.com>
Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
上级 9c041885
...@@ -140,6 +140,9 @@ static void test_acpi_fadt_table(test_data *data) ...@@ -140,6 +140,9 @@ static void test_acpi_fadt_table(test_data *data)
AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0); AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0);
uint8_t *fadt_aml = table.aml; uint8_t *fadt_aml = table.aml;
uint32_t fadt_len = table.aml_len; uint32_t fadt_len = table.aml_len;
uint32_t val;
int dsdt_offset = 40 /* DSDT */;
int dsdt_entry_size = 4;
g_assert(compare_signature(&table, "FACP")); g_assert(compare_signature(&table, "FACP"));
...@@ -148,8 +151,14 @@ static void test_acpi_fadt_table(test_data *data) ...@@ -148,8 +151,14 @@ static void test_acpi_fadt_table(test_data *data)
fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false); fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false);
g_array_append_val(data->tables, table); g_array_append_val(data->tables, table);
memcpy(&val, fadt_aml + dsdt_offset, 4);
val = le32_to_cpu(val);
if (!val) {
dsdt_offset = 140 /* X_DSDT */;
dsdt_entry_size = 8;
}
acpi_fetch_table(data->qts, &table.aml, &table.aml_len, acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
fadt_aml + 40 /* DSDT */, 4, "DSDT", true); fadt_aml + dsdt_offset, dsdt_entry_size, "DSDT", true);
g_array_append_val(data->tables, table); g_array_append_val(data->tables, table);
memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册