2013-10-18 05:52:18 +08:00
|
|
|
/*
|
|
|
|
* Boot order test cases.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013 Red Hat Inc.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Michael S. Tsirkin <mst@redhat.com>,
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
|
* See the COPYING file in the top-level directory.
|
|
|
|
*/
|
|
|
|
|
2016-02-09 02:08:51 +08:00
|
|
|
#include "qemu/osdep.h"
|
2013-12-26 22:54:25 +08:00
|
|
|
#include <glib/gstdio.h>
|
2013-11-13 00:32:24 +08:00
|
|
|
#include "qemu-common.h"
|
2018-12-12 00:34:06 +08:00
|
|
|
#include "hw/firmware/smbios.h"
|
2014-05-28 03:03:15 +08:00
|
|
|
#include "qemu/bitmap.h"
|
2017-02-17 07:15:38 +08:00
|
|
|
#include "acpi-utils.h"
|
2016-02-15 00:59:27 +08:00
|
|
|
#include "boot-sector.h"
|
2013-10-18 05:52:18 +08:00
|
|
|
|
2013-12-26 22:54:21 +08:00
|
|
|
#define MACHINE_PC "pc"
|
|
|
|
#define MACHINE_Q35 "q35"
|
|
|
|
|
2013-12-26 22:54:25 +08:00
|
|
|
#define ACPI_REBUILD_EXPECTED_AML "TEST_ACPI_REBUILD_AML"
|
|
|
|
|
2013-11-13 00:32:24 +08:00
|
|
|
typedef struct {
|
2013-12-26 22:54:21 +08:00
|
|
|
const char *machine;
|
2015-02-21 02:22:14 +08:00
|
|
|
const char *variant;
|
2013-11-13 00:32:24 +08:00
|
|
|
uint32_t rsdp_addr;
|
2018-12-20 23:02:55 +08:00
|
|
|
uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
|
2014-01-16 23:50:46 +08:00
|
|
|
GArray *tables;
|
2014-05-28 03:03:15 +08:00
|
|
|
uint32_t smbios_ep_addr;
|
2015-09-07 17:39:28 +08:00
|
|
|
struct smbios_21_entry_point smbios_ep_table;
|
2016-06-10 17:15:43 +08:00
|
|
|
uint8_t *required_struct_types;
|
|
|
|
int required_struct_types_len;
|
2017-09-12 01:20:08 +08:00
|
|
|
QTestState *qts;
|
2013-11-13 00:32:24 +08:00
|
|
|
} test_data;
|
2013-10-18 05:52:18 +08:00
|
|
|
|
2016-10-11 23:19:36 +08:00
|
|
|
static char disk[] = "tests/acpi-test-disk-XXXXXX";
|
tests: Move tests/acpi-test-data/ to tests/data/acpi/
Currently tests/acpi-test-data contains data files used by the
bios-tables-test, and configure individually symlinks those
data files into the build directory using a wildcard.
Using a wildcard like this is a bad idea, because if a new
data file is added, nothing causes configure to be rerun,
and so no symlink is added for the new file. This can cause
tests to spuriously fail when they can't find their data.
Instead, it's better to symlink an entire directory of
data files. We already have such a directory: tests/data.
Move the data files from tests/acpi-test-data/ to
tests/data/acpi/, and remove the unnecessary symlinking.
We can remove entirely the note in rebuild-expected-aml.sh
about copying any new data files, because now they will
be in the source directory, not the build directory, and
no copying is required.
(We can't just change the existing tests/acpi-test-data/
to being a symlinked directory, because if we did that and
a developer switched git branches from one after that change
to one before it then configure would end up trashing all
the test files by making them symlinks to themselves.
Changing their path avoids this annoyance.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2018-11-02 19:52:36 +08:00
|
|
|
static const char *data_dir = "tests/data/acpi";
|
2013-12-26 22:54:23 +08:00
|
|
|
#ifdef CONFIG_IASL
|
|
|
|
static const char *iasl = stringify(CONFIG_IASL);
|
|
|
|
#else
|
|
|
|
static const char *iasl;
|
|
|
|
#endif
|
2013-10-18 05:52:18 +08:00
|
|
|
|
2018-12-27 22:13:29 +08:00
|
|
|
static void cleanup_table_descriptor(AcpiSdtTable *table)
|
|
|
|
{
|
|
|
|
g_free(table->aml);
|
|
|
|
if (table->aml_file &&
|
|
|
|
!table->tmp_files_retain &&
|
|
|
|
g_strstr_len(table->aml_file, -1, "aml-")) {
|
|
|
|
unlink(table->aml_file);
|
|
|
|
}
|
|
|
|
g_free(table->aml_file);
|
|
|
|
g_free(table->asl);
|
|
|
|
if (table->asl_file &&
|
|
|
|
!table->tmp_files_retain) {
|
|
|
|
unlink(table->asl_file);
|
|
|
|
}
|
|
|
|
g_free(table->asl_file);
|
|
|
|
}
|
|
|
|
|
2013-11-22 03:33:22 +08:00
|
|
|
static void free_test_data(test_data *data)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2014-01-16 23:50:46 +08:00
|
|
|
for (i = 0; i < data->tables->len; ++i) {
|
2018-12-27 22:13:29 +08:00
|
|
|
cleanup_table_descriptor(&g_array_index(data->tables, AcpiSdtTable, i));
|
2013-11-22 03:33:22 +08:00
|
|
|
}
|
2013-12-26 22:54:21 +08:00
|
|
|
|
2017-02-05 18:48:20 +08:00
|
|
|
g_array_free(data->tables, true);
|
2013-11-22 03:33:22 +08:00
|
|
|
}
|
|
|
|
|
2018-12-27 22:13:29 +08:00
|
|
|
/** fetch_table
|
2018-12-27 22:13:30 +08:00
|
|
|
* load ACPI table at @addr_ptr offset pointer into table descriptor
|
|
|
|
* @sdt_table and check that signature/checksum matches actual one.
|
2018-12-27 22:13:29 +08:00
|
|
|
*/
|
2018-12-27 22:13:30 +08:00
|
|
|
static void fetch_table(QTestState *qts, AcpiSdtTable *sdt_table,
|
|
|
|
uint8_t *addr_ptr, const char *sig,
|
|
|
|
bool verify_checksum)
|
2018-12-27 22:13:29 +08:00
|
|
|
{
|
2018-12-27 22:13:30 +08:00
|
|
|
uint32_t addr;
|
|
|
|
|
|
|
|
memcpy(&addr, addr_ptr , sizeof(addr));
|
|
|
|
addr = le32_to_cpu(addr);
|
|
|
|
|
2018-12-27 22:13:29 +08:00
|
|
|
qtest_memread(qts, addr + 4 /* Length of ACPI table */,
|
|
|
|
&sdt_table->aml_len, 4);
|
|
|
|
sdt_table->aml_len = le32_to_cpu(sdt_table->aml_len);
|
|
|
|
sdt_table->aml = g_malloc0(sdt_table->aml_len);
|
|
|
|
/* get whole table */
|
|
|
|
qtest_memread(qts, addr, sdt_table->aml, sdt_table->aml_len);
|
|
|
|
|
2018-12-27 22:13:30 +08:00
|
|
|
if (sig) {
|
|
|
|
ACPI_ASSERT_CMP(sdt_table->header->signature, sig);
|
|
|
|
}
|
|
|
|
if (verify_checksum) {
|
|
|
|
g_assert(!acpi_calc_checksum(sdt_table->aml, sdt_table->aml_len));
|
|
|
|
}
|
2018-12-27 22:13:29 +08:00
|
|
|
}
|
|
|
|
|
2013-11-13 00:32:24 +08:00
|
|
|
static void test_acpi_rsdp_address(test_data *data)
|
|
|
|
{
|
2017-09-12 01:20:08 +08:00
|
|
|
uint32_t off = acpi_find_rsdp_address(data->qts);
|
2013-11-13 00:32:24 +08:00
|
|
|
g_assert_cmphex(off, <, 0x100000);
|
|
|
|
data->rsdp_addr = off;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_acpi_rsdp_table(test_data *data)
|
|
|
|
{
|
2018-12-20 23:02:55 +08:00
|
|
|
uint8_t *rsdp_table = data->rsdp_table, revision;
|
2013-11-13 00:32:24 +08:00
|
|
|
uint32_t addr = data->rsdp_addr;
|
|
|
|
|
2017-09-12 01:20:08 +08:00
|
|
|
acpi_parse_rsdp_table(data->qts, addr, rsdp_table);
|
2018-12-20 23:02:55 +08:00
|
|
|
revision = rsdp_table[15 /* Revision offset */];
|
|
|
|
|
|
|
|
switch (revision) {
|
|
|
|
case 0: /* ACPI 1.0 RSDP */
|
|
|
|
/* With rev 1, checksum is only for the first 20 bytes */
|
|
|
|
g_assert(!acpi_calc_checksum(rsdp_table, 20));
|
|
|
|
break;
|
|
|
|
case 2: /* ACPI 2.0+ RSDP */
|
|
|
|
/* With revision 2, we have 2 checksums */
|
|
|
|
g_assert(!acpi_calc_checksum(rsdp_table, 20));
|
|
|
|
g_assert(!acpi_calc_checksum(rsdp_table, 36));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_assert_not_reached();
|
|
|
|
}
|
2013-11-13 00:32:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void test_acpi_rsdt_table(test_data *data)
|
|
|
|
{
|
2018-12-27 22:13:29 +08:00
|
|
|
const int entry_size = 4 /* 32-bit Entry size */;
|
|
|
|
const int tables_off = 36 /* 1st Entry */;
|
|
|
|
AcpiSdtTable rsdt = {};
|
|
|
|
int i, table_len, table_nr;
|
|
|
|
|
2018-12-27 22:13:30 +08:00
|
|
|
fetch_table(data->qts, &rsdt, &data->rsdp_table[16 /* RsdtAddress */],
|
|
|
|
"RSDT", true);
|
2018-12-27 22:13:29 +08:00
|
|
|
|
|
|
|
/* Load all tables and add to test list directly RSDT referenced tables */
|
|
|
|
table_len = le32_to_cpu(rsdt.header->length);
|
|
|
|
table_nr = (table_len - tables_off) / entry_size;
|
|
|
|
for (i = 0; i < table_nr; i++) {
|
|
|
|
AcpiSdtTable ssdt_table = {};
|
|
|
|
|
2018-12-27 22:13:30 +08:00
|
|
|
fetch_table(data->qts, &ssdt_table,
|
|
|
|
rsdt.aml + tables_off + i * entry_size, NULL, true);
|
2018-12-27 22:13:29 +08:00
|
|
|
|
|
|
|
/* Add table to ASL test tables list */
|
|
|
|
g_array_append_val(data->tables, ssdt_table);
|
|
|
|
}
|
|
|
|
cleanup_table_descriptor(&rsdt);
|
2013-11-13 00:32:24 +08:00
|
|
|
}
|
|
|
|
|
2018-12-27 22:13:28 +08:00
|
|
|
static void test_acpi_fadt_table(test_data *data)
|
2013-11-13 00:32:24 +08:00
|
|
|
{
|
2018-12-27 22:13:28 +08:00
|
|
|
/* FADT table is 1st */
|
2018-12-27 22:13:30 +08:00
|
|
|
AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0);
|
|
|
|
uint8_t *fadt_aml = table.aml;
|
2013-11-13 00:32:24 +08:00
|
|
|
|
2018-12-27 22:13:30 +08:00
|
|
|
ACPI_ASSERT_CMP(table.header->signature, "FACP");
|
2018-02-28 22:23:55 +08:00
|
|
|
|
2018-12-27 22:13:30 +08:00
|
|
|
/* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */
|
|
|
|
fetch_table(data->qts, &table, fadt_aml + 36 /* FIRMWARE_CTRL */,
|
|
|
|
"FACS", false);
|
|
|
|
g_array_append_val(data->tables, table);
|
|
|
|
|
|
|
|
fetch_table(data->qts, &table, fadt_aml + 40 /* DSDT */, "DSDT", true);
|
|
|
|
g_array_append_val(data->tables, table);
|
2013-11-13 00:32:24 +08:00
|
|
|
}
|
|
|
|
|
2018-01-16 23:30:26 +08:00
|
|
|
static void sanitize_fadt_ptrs(test_data *data)
|
|
|
|
{
|
|
|
|
/* fixup pointers in FADT */
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < data->tables->len; i++) {
|
|
|
|
AcpiSdtTable *sdt = &g_array_index(data->tables, AcpiSdtTable, i);
|
|
|
|
|
2018-12-27 22:13:27 +08:00
|
|
|
if (memcmp(&sdt->header->signature, "FACP", 4)) {
|
2018-01-16 23:30:26 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2018-02-28 22:23:55 +08:00
|
|
|
/* check original FADT checksum before sanitizing table */
|
2018-12-27 22:13:27 +08:00
|
|
|
g_assert(!acpi_calc_checksum(sdt->aml, sdt->aml_len));
|
|
|
|
|
|
|
|
memset(sdt->aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */
|
|
|
|
memset(sdt->aml + 40, 0, 4); /* sanitize DSDT ptr */
|
|
|
|
if (sdt->header->revision >= 3) {
|
|
|
|
memset(sdt->aml + 132, 0, 8); /* sanitize X_FIRMWARE_CTRL ptr */
|
|
|
|
memset(sdt->aml + 140, 0, 8); /* sanitize X_DSDT ptr */
|
2018-01-16 23:30:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* update checksum */
|
2018-12-27 22:13:27 +08:00
|
|
|
sdt->header->checksum = 0;
|
|
|
|
sdt->header->checksum -= acpi_calc_checksum(sdt->aml, sdt->aml_len);
|
2018-01-16 23:30:26 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-26 22:54:25 +08:00
|
|
|
static void dump_aml_files(test_data *data, bool rebuild)
|
2013-12-26 22:54:21 +08:00
|
|
|
{
|
|
|
|
AcpiSdtTable *sdt;
|
|
|
|
GError *error = NULL;
|
2013-12-26 22:54:25 +08:00
|
|
|
gchar *aml_file = NULL;
|
2013-12-26 22:54:21 +08:00
|
|
|
gint fd;
|
|
|
|
ssize_t ret;
|
|
|
|
int i;
|
|
|
|
|
2014-01-16 23:50:46 +08:00
|
|
|
for (i = 0; i < data->tables->len; ++i) {
|
2015-02-21 02:22:14 +08:00
|
|
|
const char *ext = data->variant ? data->variant : "";
|
2014-01-16 23:50:46 +08:00
|
|
|
sdt = &g_array_index(data->tables, AcpiSdtTable, i);
|
2013-12-26 22:54:21 +08:00
|
|
|
g_assert(sdt->aml);
|
|
|
|
|
2013-12-26 22:54:25 +08:00
|
|
|
if (rebuild) {
|
2015-02-21 02:22:14 +08:00
|
|
|
aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
|
2018-12-27 22:13:27 +08:00
|
|
|
(gchar *)&sdt->header->signature, ext);
|
2013-12-26 22:54:25 +08:00
|
|
|
fd = g_open(aml_file, O_WRONLY|O_TRUNC|O_CREAT,
|
|
|
|
S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
|
|
|
|
} else {
|
|
|
|
fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error);
|
|
|
|
g_assert_no_error(error);
|
|
|
|
}
|
|
|
|
g_assert(fd >= 0);
|
2013-12-26 22:54:21 +08:00
|
|
|
|
|
|
|
ret = qemu_write_full(fd, sdt->aml, sdt->aml_len);
|
|
|
|
g_assert(ret == sdt->aml_len);
|
|
|
|
|
|
|
|
close(fd);
|
2013-12-26 22:54:25 +08:00
|
|
|
|
2015-08-26 19:17:18 +08:00
|
|
|
g_free(aml_file);
|
2013-12-26 22:54:21 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-18 22:42:05 +08:00
|
|
|
static bool compare_signature(AcpiSdtTable *sdt, const char *signature)
|
2014-01-16 23:50:47 +08:00
|
|
|
{
|
2018-12-27 22:13:27 +08:00
|
|
|
return !memcmp(&sdt->header->signature, signature, 4);
|
2014-01-16 23:50:47 +08:00
|
|
|
}
|
|
|
|
|
2014-02-27 22:17:32 +08:00
|
|
|
static bool load_asl(GArray *sdts, AcpiSdtTable *sdt)
|
2013-12-26 22:54:21 +08:00
|
|
|
{
|
|
|
|
AcpiSdtTable *temp;
|
|
|
|
GError *error = NULL;
|
2013-12-26 22:54:23 +08:00
|
|
|
GString *command_line = g_string_new(iasl);
|
2013-12-26 22:54:21 +08:00
|
|
|
gint fd;
|
|
|
|
gchar *out, *out_err;
|
|
|
|
gboolean ret;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
fd = g_file_open_tmp("asl-XXXXXX.dsl", &sdt->asl_file, &error);
|
|
|
|
g_assert_no_error(error);
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
/* build command line */
|
2013-12-26 22:54:23 +08:00
|
|
|
g_string_append_printf(command_line, " -p %s ", sdt->asl_file);
|
2014-03-18 22:42:05 +08:00
|
|
|
if (compare_signature(sdt, "DSDT") ||
|
|
|
|
compare_signature(sdt, "SSDT")) {
|
2014-01-16 23:50:47 +08:00
|
|
|
for (i = 0; i < sdts->len; ++i) {
|
|
|
|
temp = &g_array_index(sdts, AcpiSdtTable, i);
|
2014-03-18 22:42:05 +08:00
|
|
|
if (compare_signature(temp, "DSDT") ||
|
|
|
|
compare_signature(temp, "SSDT")) {
|
2014-01-16 23:50:47 +08:00
|
|
|
g_string_append_printf(command_line, "-e %s ", temp->aml_file);
|
|
|
|
}
|
|
|
|
}
|
2013-12-26 22:54:21 +08:00
|
|
|
}
|
|
|
|
g_string_append_printf(command_line, "-d %s", sdt->aml_file);
|
|
|
|
|
|
|
|
/* pass 'out' and 'out_err' in order to be redirected */
|
2014-02-27 22:17:32 +08:00
|
|
|
ret = g_spawn_command_line_sync(command_line->str, &out, &out_err, NULL, &error);
|
2013-12-26 22:54:21 +08:00
|
|
|
g_assert_no_error(error);
|
2014-02-27 22:17:32 +08:00
|
|
|
if (ret) {
|
2018-07-05 23:58:08 +08:00
|
|
|
ret = g_file_get_contents(sdt->asl_file, &sdt->asl,
|
2014-02-27 22:17:32 +08:00
|
|
|
&sdt->asl_len, &error);
|
|
|
|
g_assert(ret);
|
|
|
|
g_assert_no_error(error);
|
2014-03-24 18:02:33 +08:00
|
|
|
ret = (sdt->asl_len > 0);
|
2014-02-27 22:17:32 +08:00
|
|
|
}
|
2013-12-26 22:54:21 +08:00
|
|
|
|
|
|
|
g_free(out);
|
|
|
|
g_free(out_err);
|
|
|
|
g_string_free(command_line, true);
|
2014-02-27 22:17:32 +08:00
|
|
|
|
|
|
|
return !ret;
|
2013-12-26 22:54:21 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#define COMMENT_END "*/"
|
|
|
|
#define DEF_BLOCK "DefinitionBlock ("
|
2016-04-05 01:00:57 +08:00
|
|
|
#define BLOCK_NAME_END ","
|
2013-12-26 22:54:21 +08:00
|
|
|
|
|
|
|
static GString *normalize_asl(gchar *asl_code)
|
|
|
|
{
|
|
|
|
GString *asl = g_string_new(asl_code);
|
|
|
|
gchar *comment, *block_name;
|
|
|
|
|
|
|
|
/* strip comments (different generation days) */
|
|
|
|
comment = g_strstr_len(asl->str, asl->len, COMMENT_END);
|
|
|
|
if (comment) {
|
2014-07-28 23:34:17 +08:00
|
|
|
comment += strlen(COMMENT_END);
|
|
|
|
while (*comment == '\n') {
|
|
|
|
comment++;
|
|
|
|
}
|
|
|
|
asl = g_string_erase(asl, 0, comment - asl->str);
|
2013-12-26 22:54:21 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* strip def block name (it has file path in it) */
|
|
|
|
if (g_str_has_prefix(asl->str, DEF_BLOCK)) {
|
|
|
|
block_name = g_strstr_len(asl->str, asl->len, BLOCK_NAME_END);
|
|
|
|
g_assert(block_name);
|
|
|
|
asl = g_string_erase(asl, 0,
|
|
|
|
block_name + sizeof(BLOCK_NAME_END) - asl->str);
|
|
|
|
}
|
|
|
|
|
|
|
|
return asl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GArray *load_expected_aml(test_data *data)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
AcpiSdtTable *sdt;
|
|
|
|
GError *error = NULL;
|
|
|
|
gboolean ret;
|
|
|
|
|
2014-01-16 23:50:46 +08:00
|
|
|
GArray *exp_tables = g_array_new(false, true, sizeof(AcpiSdtTable));
|
2018-10-30 08:18:40 +08:00
|
|
|
if (getenv("V")) {
|
|
|
|
fputc('\n', stderr);
|
|
|
|
}
|
2014-01-16 23:50:46 +08:00
|
|
|
for (i = 0; i < data->tables->len; ++i) {
|
2013-12-26 22:54:21 +08:00
|
|
|
AcpiSdtTable exp_sdt;
|
2016-05-26 17:46:45 +08:00
|
|
|
gchar *aml_file = NULL;
|
2015-02-21 02:22:14 +08:00
|
|
|
const char *ext = data->variant ? data->variant : "";
|
2014-03-18 22:42:05 +08:00
|
|
|
|
2014-01-16 23:50:46 +08:00
|
|
|
sdt = &g_array_index(data->tables, AcpiSdtTable, i);
|
2013-12-26 22:54:21 +08:00
|
|
|
|
|
|
|
memset(&exp_sdt, 0, sizeof(exp_sdt));
|
|
|
|
|
2015-02-21 02:22:14 +08:00
|
|
|
try_again:
|
|
|
|
aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
|
2018-12-27 22:13:27 +08:00
|
|
|
(gchar *)&sdt->header->signature, ext);
|
2016-05-26 17:46:45 +08:00
|
|
|
if (getenv("V")) {
|
2018-10-30 08:18:40 +08:00
|
|
|
fprintf(stderr, "Looking for expected file '%s'\n", aml_file);
|
2016-05-26 17:46:45 +08:00
|
|
|
}
|
|
|
|
if (g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
|
|
|
|
exp_sdt.aml_file = aml_file;
|
|
|
|
} else if (*ext != '\0') {
|
2018-07-13 13:47:55 +08:00
|
|
|
/* try fallback to generic (extension less) expected file */
|
2015-02-21 02:22:14 +08:00
|
|
|
ext = "";
|
2016-05-26 17:46:45 +08:00
|
|
|
g_free(aml_file);
|
2015-02-21 02:22:14 +08:00
|
|
|
goto try_again;
|
|
|
|
}
|
2016-05-26 17:46:45 +08:00
|
|
|
g_assert(exp_sdt.aml_file);
|
|
|
|
if (getenv("V")) {
|
2018-10-30 08:18:40 +08:00
|
|
|
fprintf(stderr, "Using expected file '%s'\n", aml_file);
|
2016-05-26 17:46:45 +08:00
|
|
|
}
|
2018-12-27 22:13:27 +08:00
|
|
|
ret = g_file_get_contents(aml_file, (gchar **)&exp_sdt.aml,
|
2013-12-26 22:54:21 +08:00
|
|
|
&exp_sdt.aml_len, &error);
|
|
|
|
g_assert(ret);
|
|
|
|
g_assert_no_error(error);
|
|
|
|
g_assert(exp_sdt.aml);
|
|
|
|
g_assert(exp_sdt.aml_len);
|
|
|
|
|
2014-01-16 23:50:46 +08:00
|
|
|
g_array_append_val(exp_tables, exp_sdt);
|
2013-12-26 22:54:21 +08:00
|
|
|
}
|
|
|
|
|
2014-01-16 23:50:46 +08:00
|
|
|
return exp_tables;
|
2013-12-26 22:54:21 +08:00
|
|
|
}
|
|
|
|
|
2017-12-29 23:16:41 +08:00
|
|
|
/* test the list of tables in @data->tables against reference tables */
|
2013-12-26 22:54:21 +08:00
|
|
|
static void test_acpi_asl(test_data *data)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
AcpiSdtTable *sdt, *exp_sdt;
|
|
|
|
test_data exp_data;
|
2014-02-27 22:17:32 +08:00
|
|
|
gboolean exp_err, err;
|
2013-12-26 22:54:21 +08:00
|
|
|
|
|
|
|
memset(&exp_data, 0, sizeof(exp_data));
|
2014-01-16 23:50:46 +08:00
|
|
|
exp_data.tables = load_expected_aml(data);
|
2013-12-26 22:54:25 +08:00
|
|
|
dump_aml_files(data, false);
|
2014-01-16 23:50:46 +08:00
|
|
|
for (i = 0; i < data->tables->len; ++i) {
|
2013-12-26 22:54:21 +08:00
|
|
|
GString *asl, *exp_asl;
|
|
|
|
|
2014-01-16 23:50:46 +08:00
|
|
|
sdt = &g_array_index(data->tables, AcpiSdtTable, i);
|
|
|
|
exp_sdt = &g_array_index(exp_data.tables, AcpiSdtTable, i);
|
2013-12-26 22:54:21 +08:00
|
|
|
|
2014-02-27 22:17:32 +08:00
|
|
|
err = load_asl(data->tables, sdt);
|
2013-12-26 22:54:21 +08:00
|
|
|
asl = normalize_asl(sdt->asl);
|
|
|
|
|
2014-02-27 22:17:32 +08:00
|
|
|
exp_err = load_asl(exp_data.tables, exp_sdt);
|
2013-12-26 22:54:21 +08:00
|
|
|
exp_asl = normalize_asl(exp_sdt->asl);
|
|
|
|
|
2014-02-27 22:17:32 +08:00
|
|
|
/* TODO: check for warnings */
|
|
|
|
g_assert(!err || exp_err);
|
|
|
|
|
2014-01-16 23:50:48 +08:00
|
|
|
if (g_strcmp0(asl->str, exp_asl->str)) {
|
2014-03-24 18:02:33 +08:00
|
|
|
if (exp_err) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"Warning! iasl couldn't parse the expected aml\n");
|
|
|
|
} else {
|
2018-12-27 22:13:27 +08:00
|
|
|
uint32_t signature = cpu_to_le32(exp_sdt->header->signature);
|
2014-03-24 18:02:33 +08:00
|
|
|
sdt->tmp_files_retain = true;
|
|
|
|
exp_sdt->tmp_files_retain = true;
|
|
|
|
fprintf(stderr,
|
|
|
|
"acpi-test: Warning! %.4s mismatch. "
|
|
|
|
"Actual [asl:%s, aml:%s], Expected [asl:%s, aml:%s].\n",
|
|
|
|
(gchar *)&signature,
|
|
|
|
sdt->asl_file, sdt->aml_file,
|
|
|
|
exp_sdt->asl_file, exp_sdt->aml_file);
|
2015-12-29 01:02:08 +08:00
|
|
|
if (getenv("V")) {
|
|
|
|
const char *diff_cmd = getenv("DIFF");
|
|
|
|
if (diff_cmd) {
|
|
|
|
int ret G_GNUC_UNUSED;
|
|
|
|
char *diff = g_strdup_printf("%s %s %s", diff_cmd,
|
|
|
|
exp_sdt->asl_file, sdt->asl_file);
|
|
|
|
ret = system(diff) ;
|
|
|
|
g_free(diff);
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "acpi-test: Warning. not showing "
|
|
|
|
"difference since no diff utility is specified. "
|
|
|
|
"Set 'DIFF' environment variable to a preferred "
|
|
|
|
"diff utility and run 'make V=1 check' again to "
|
|
|
|
"see ASL difference.");
|
|
|
|
}
|
|
|
|
}
|
2014-03-24 18:02:33 +08:00
|
|
|
}
|
2014-01-16 23:50:48 +08:00
|
|
|
}
|
2013-12-26 22:54:21 +08:00
|
|
|
g_string_free(asl, true);
|
|
|
|
g_string_free(exp_asl, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
free_test_data(&exp_data);
|
2013-11-13 00:32:24 +08:00
|
|
|
}
|
|
|
|
|
2015-05-18 20:47:24 +08:00
|
|
|
static bool smbios_ep_table_ok(test_data *data)
|
2014-05-28 03:03:15 +08:00
|
|
|
{
|
2015-09-07 17:39:28 +08:00
|
|
|
struct smbios_21_entry_point *ep_table = &data->smbios_ep_table;
|
2014-05-28 03:03:15 +08:00
|
|
|
uint32_t addr = data->smbios_ep_addr;
|
|
|
|
|
2017-09-12 01:20:08 +08:00
|
|
|
ACPI_READ_ARRAY(data->qts, ep_table->anchor_string, addr);
|
2015-05-18 20:47:24 +08:00
|
|
|
if (memcmp(ep_table->anchor_string, "_SM_", 4)) {
|
|
|
|
return false;
|
|
|
|
}
|
2017-09-12 01:20:08 +08:00
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->checksum, addr);
|
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->length, addr);
|
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->smbios_major_version, addr);
|
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->smbios_minor_version, addr);
|
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->max_structure_size, addr);
|
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->entry_point_revision, addr);
|
|
|
|
ACPI_READ_ARRAY(data->qts, ep_table->formatted_area, addr);
|
|
|
|
ACPI_READ_ARRAY(data->qts, ep_table->intermediate_anchor_string, addr);
|
2015-05-18 20:47:24 +08:00
|
|
|
if (memcmp(ep_table->intermediate_anchor_string, "_DMI_", 5)) {
|
|
|
|
return false;
|
|
|
|
}
|
2017-09-12 01:20:08 +08:00
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->intermediate_checksum, addr);
|
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->structure_table_length, addr);
|
2015-05-18 20:47:24 +08:00
|
|
|
if (ep_table->structure_table_length == 0) {
|
|
|
|
return false;
|
|
|
|
}
|
2017-09-12 01:20:08 +08:00
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->structure_table_address, addr);
|
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->number_of_structures, addr);
|
2015-05-18 20:47:24 +08:00
|
|
|
if (ep_table->number_of_structures == 0) {
|
|
|
|
return false;
|
|
|
|
}
|
2017-09-12 01:20:08 +08:00
|
|
|
ACPI_READ_FIELD(data->qts, ep_table->smbios_bcd_revision, addr);
|
2017-02-17 07:15:38 +08:00
|
|
|
if (acpi_calc_checksum((uint8_t *)ep_table, sizeof *ep_table) ||
|
|
|
|
acpi_calc_checksum((uint8_t *)ep_table + 0x10,
|
|
|
|
sizeof *ep_table - 0x10)) {
|
2015-05-18 20:47:24 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_smbios_entry_point(test_data *data)
|
|
|
|
{
|
|
|
|
uint32_t off;
|
|
|
|
|
|
|
|
/* find smbios entry point structure */
|
|
|
|
for (off = 0xf0000; off < 0x100000; off += 0x10) {
|
|
|
|
uint8_t sig[] = "_SM_";
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < sizeof sig - 1; ++i) {
|
2017-09-12 01:20:08 +08:00
|
|
|
sig[i] = qtest_readb(data->qts, off + i);
|
2015-05-18 20:47:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!memcmp(sig, "_SM_", sizeof sig)) {
|
|
|
|
/* signature match, but is this a valid entry point? */
|
|
|
|
data->smbios_ep_addr = off;
|
|
|
|
if (smbios_ep_table_ok(data)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_cmphex(off, <, 0x100000);
|
2014-05-28 03:03:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool smbios_single_instance(uint8_t type)
|
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case 0:
|
|
|
|
case 1:
|
|
|
|
case 2:
|
|
|
|
case 3:
|
|
|
|
case 16:
|
|
|
|
case 32:
|
|
|
|
case 127:
|
|
|
|
return true;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_smbios_structs(test_data *data)
|
|
|
|
{
|
|
|
|
DECLARE_BITMAP(struct_bitmap, SMBIOS_MAX_TYPE+1) = { 0 };
|
2015-09-07 17:39:28 +08:00
|
|
|
struct smbios_21_entry_point *ep_table = &data->smbios_ep_table;
|
2017-11-16 20:17:02 +08:00
|
|
|
uint32_t addr = le32_to_cpu(ep_table->structure_table_address);
|
2014-05-28 03:03:15 +08:00
|
|
|
int i, len, max_len = 0;
|
|
|
|
uint8_t type, prv, crt;
|
|
|
|
|
|
|
|
/* walk the smbios tables */
|
2017-11-16 20:17:02 +08:00
|
|
|
for (i = 0; i < le16_to_cpu(ep_table->number_of_structures); i++) {
|
2014-05-28 03:03:15 +08:00
|
|
|
|
|
|
|
/* grab type and formatted area length from struct header */
|
2017-09-12 01:20:08 +08:00
|
|
|
type = qtest_readb(data->qts, addr);
|
2014-05-28 03:03:15 +08:00
|
|
|
g_assert_cmpuint(type, <=, SMBIOS_MAX_TYPE);
|
2017-09-12 01:20:08 +08:00
|
|
|
len = qtest_readb(data->qts, addr + 1);
|
2014-05-28 03:03:15 +08:00
|
|
|
|
|
|
|
/* single-instance structs must not have been encountered before */
|
|
|
|
if (smbios_single_instance(type)) {
|
|
|
|
g_assert(!test_bit(type, struct_bitmap));
|
|
|
|
}
|
|
|
|
set_bit(type, struct_bitmap);
|
|
|
|
|
|
|
|
/* seek to end of unformatted string area of this struct ("\0\0") */
|
|
|
|
prv = crt = 1;
|
|
|
|
while (prv || crt) {
|
|
|
|
prv = crt;
|
2017-09-12 01:20:08 +08:00
|
|
|
crt = qtest_readb(data->qts, addr + len);
|
2014-05-28 03:03:15 +08:00
|
|
|
len++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* keep track of max. struct size */
|
|
|
|
if (max_len < len) {
|
|
|
|
max_len = len;
|
|
|
|
g_assert_cmpuint(max_len, <=, ep_table->max_structure_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* start of next structure */
|
|
|
|
addr += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* total table length and max struct size must match entry point values */
|
2017-11-16 20:17:02 +08:00
|
|
|
g_assert_cmpuint(le16_to_cpu(ep_table->structure_table_length), ==,
|
|
|
|
addr - le32_to_cpu(ep_table->structure_table_address));
|
|
|
|
g_assert_cmpuint(le16_to_cpu(ep_table->max_structure_size), ==, max_len);
|
2014-05-28 03:03:15 +08:00
|
|
|
|
|
|
|
/* required struct types must all be present */
|
2016-06-10 17:15:43 +08:00
|
|
|
for (i = 0; i < data->required_struct_types_len; i++) {
|
|
|
|
g_assert(test_bit(data->required_struct_types[i], struct_bitmap));
|
2014-05-28 03:03:15 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-22 03:33:22 +08:00
|
|
|
static void test_acpi_one(const char *params, test_data *data)
|
2013-10-18 05:52:18 +08:00
|
|
|
{
|
|
|
|
char *args;
|
|
|
|
|
2016-09-07 03:19:22 +08:00
|
|
|
/* Disable kernel irqchip to be able to override apic irq0. */
|
|
|
|
args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
|
|
|
|
"-net none -display none %s "
|
2014-11-20 23:27:09 +08:00
|
|
|
"-drive id=hd0,if=none,file=%s,format=raw "
|
2014-10-02 02:19:28 +08:00
|
|
|
"-device ide-hd,drive=hd0 ",
|
2016-09-07 03:19:22 +08:00
|
|
|
data->machine, "kvm:tcg",
|
2014-10-02 02:19:28 +08:00
|
|
|
params ? params : "", disk);
|
2013-12-26 22:54:21 +08:00
|
|
|
|
2017-09-12 01:20:08 +08:00
|
|
|
data->qts = qtest_init(args);
|
2013-10-18 05:52:18 +08:00
|
|
|
|
2017-09-12 01:20:08 +08:00
|
|
|
boot_sector_test(data->qts);
|
2013-10-18 05:52:18 +08:00
|
|
|
|
2017-12-29 23:16:38 +08:00
|
|
|
data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));
|
2013-11-22 03:33:22 +08:00
|
|
|
test_acpi_rsdp_address(data);
|
|
|
|
test_acpi_rsdp_table(data);
|
|
|
|
test_acpi_rsdt_table(data);
|
2018-12-27 22:13:28 +08:00
|
|
|
test_acpi_fadt_table(data);
|
2013-10-18 05:52:18 +08:00
|
|
|
|
2018-01-16 23:30:26 +08:00
|
|
|
sanitize_fadt_ptrs(data);
|
|
|
|
|
2013-12-26 22:54:23 +08:00
|
|
|
if (iasl) {
|
2013-12-26 22:54:25 +08:00
|
|
|
if (getenv(ACPI_REBUILD_EXPECTED_AML)) {
|
|
|
|
dump_aml_files(data, true);
|
|
|
|
} else {
|
|
|
|
test_acpi_asl(data);
|
|
|
|
}
|
2013-12-26 22:54:21 +08:00
|
|
|
}
|
|
|
|
|
2015-05-18 20:47:24 +08:00
|
|
|
test_smbios_entry_point(data);
|
2014-05-28 03:03:15 +08:00
|
|
|
test_smbios_structs(data);
|
|
|
|
|
2017-09-12 01:20:08 +08:00
|
|
|
assert(!global_qtest);
|
|
|
|
qtest_quit(data->qts);
|
2013-10-18 05:52:18 +08:00
|
|
|
g_free(args);
|
|
|
|
}
|
|
|
|
|
2016-06-10 17:15:43 +08:00
|
|
|
static uint8_t base_required_struct_types[] = {
|
|
|
|
0, 1, 3, 4, 16, 17, 19, 32, 127
|
|
|
|
};
|
|
|
|
|
2015-01-20 00:50:38 +08:00
|
|
|
static void test_acpi_piix4_tcg(void)
|
2013-10-18 05:52:18 +08:00
|
|
|
{
|
2013-11-22 03:33:22 +08:00
|
|
|
test_data data;
|
|
|
|
|
2013-10-18 05:52:18 +08:00
|
|
|
/* Supplying -machine accel argument overrides the default (qtest).
|
|
|
|
* This is to make guest actually run.
|
|
|
|
*/
|
2013-12-26 22:54:21 +08:00
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_PC;
|
2016-06-10 17:15:43 +08:00
|
|
|
data.required_struct_types = base_required_struct_types;
|
|
|
|
data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
|
2016-09-07 03:19:22 +08:00
|
|
|
test_acpi_one(NULL, &data);
|
2013-12-26 22:54:21 +08:00
|
|
|
free_test_data(&data);
|
2015-01-20 00:50:38 +08:00
|
|
|
}
|
|
|
|
|
2015-02-21 02:22:14 +08:00
|
|
|
static void test_acpi_piix4_tcg_bridge(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_PC;
|
|
|
|
data.variant = ".bridge";
|
2016-06-10 17:15:43 +08:00
|
|
|
data.required_struct_types = base_required_struct_types;
|
|
|
|
data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
|
2016-09-07 03:19:22 +08:00
|
|
|
test_acpi_one("-device pci-bridge,chassis_nr=1", &data);
|
2015-02-21 02:22:14 +08:00
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
2015-01-20 00:50:38 +08:00
|
|
|
static void test_acpi_q35_tcg(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
2013-11-22 03:33:22 +08:00
|
|
|
|
2013-12-26 22:54:21 +08:00
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_Q35;
|
2016-06-10 17:15:43 +08:00
|
|
|
data.required_struct_types = base_required_struct_types;
|
|
|
|
data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
|
2016-09-07 03:19:22 +08:00
|
|
|
test_acpi_one(NULL, &data);
|
2013-11-22 03:33:22 +08:00
|
|
|
free_test_data(&data);
|
2013-10-18 05:52:18 +08:00
|
|
|
}
|
|
|
|
|
2015-02-21 02:22:14 +08:00
|
|
|
static void test_acpi_q35_tcg_bridge(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_Q35;
|
|
|
|
data.variant = ".bridge";
|
2016-06-10 17:15:43 +08:00
|
|
|
data.required_struct_types = base_required_struct_types;
|
|
|
|
data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
|
2016-09-07 03:19:22 +08:00
|
|
|
test_acpi_one("-device pci-bridge,chassis_nr=1",
|
2015-02-21 02:22:14 +08:00
|
|
|
&data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
tests/bios-tables-test: add 64-bit PCI MMIO aperture round-up test on Q35
In commit 9fa99d2519cb ("hw/pci-host: Fix x86 Host Bridges 64bit PCI
hole", 2017-11-16), we meant to expose such a 64-bit PCI MMIO aperture in
the ACPI DSDT that would be at least as large as the new "pci-hole64-size"
property (2GB on i440fx, 32GB on q35). The goal was to offer "enough"
64-bit MMIO aperture to the guest OS for hotplug purposes.
Previous patch fixed the issue that the aperture is extended relative to
a possibly incorrect base. This may result in an aperture size that is
smaller than the intent of commit 9fa99d2519cb.
This patch adds a test to make sure it won't happen again.
In the test case being added:
- use 128 MB initial RAM size,
- ask for one DIMM hotplug slot,
- ask for 2 GB maximum RAM size,
- use a pci-testdev with a 64-bit BAR of 2 GB size.
Consequences:
(1) In pc_memory_init() [hw/i386/pc.c], the DIMM hotplug area size is
initially set to 2048-128 = 1920 MB. (Maximum RAM size minus initial
RAM size.)
(2) The DIMM area base is set to 4096 MB (because the initial RAM is only
128 MB -- there is no initial "high RAM").
(3) Due to commit 085f8e88ba73 ("pc: count in 1Gb hugepage alignment when
sizing hotplug-memory container", 2014-11-24), we add 1 GB for the one
DIMM hotplug slot that was specified. This sets the DIMM area size to
1920+1024 = 2944 MB.
(4) The reserved-memory-end address (exclusive) is set to 4096 + 2944 =
7040 MB (DIMM area base plus DIMM area size).
(5) The reserved-memory-end address is rounded up to GB alignment,
yielding 7 GB (7168 MB).
(6) Given the 2 GB BAR size of pci-testdev, SeaBIOS allocates said 64-bit
BAR in 64-bit address space.
(7) Because reserved-memory-end is at 7 GB, it is unaligned for the 2 GB
BAR. Therefore SeaBIOS allocates the BAR at 8 GB. QEMU then
(correctly) assigns the root bridge aperture base this BAR address, to
be exposed in \_SB.PCI0._CRS.
(8) The intent of commit 9fa99d2519cb dictates that QEMU extend the
aperture size to 32 GB, implying a 40 GB end address. However, QEMU
performs the extension relative to reserved-memory-end (7 GB), not
relative to the bridge aperture base that was correctly deduced from
SeaBIOS's BAR programming (8 GB). Therefore we see 39 GB as the
aperture end address in \_SB.PCI0._CRS:
> QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
> 0x0000000000000000, // Granularity
> 0x0000000200000000, // Range Minimum
> 0x00000009BFFFFFFF, // Range Maximum
> 0x0000000000000000, // Translation Offset
> 0x00000007C0000000, // Length
> ,, , AddressRangeMemory, TypeStatic)
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2018-09-28 05:24:36 +08:00
|
|
|
static void test_acpi_q35_tcg_mmio64(void)
|
|
|
|
{
|
|
|
|
test_data data = {
|
|
|
|
.machine = MACHINE_Q35,
|
|
|
|
.variant = ".mmio64",
|
|
|
|
.required_struct_types = base_required_struct_types,
|
|
|
|
.required_struct_types_len = ARRAY_SIZE(base_required_struct_types)
|
|
|
|
};
|
|
|
|
|
|
|
|
test_acpi_one("-m 128M,slots=1,maxmem=2G "
|
|
|
|
"-device pci-testdev,membar=2G",
|
|
|
|
&data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
2016-07-01 19:50:22 +08:00
|
|
|
static void test_acpi_piix4_tcg_cphp(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_PC;
|
|
|
|
data.variant = ".cphp";
|
2016-10-05 23:51:25 +08:00
|
|
|
test_acpi_one("-smp 2,cores=3,sockets=2,maxcpus=6"
|
2017-05-03 17:17:16 +08:00
|
|
|
" -numa node -numa node"
|
|
|
|
" -numa dist,src=0,dst=1,val=21",
|
2016-07-01 19:50:22 +08:00
|
|
|
&data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_acpi_q35_tcg_cphp(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_Q35;
|
|
|
|
data.variant = ".cphp";
|
2016-10-05 23:51:25 +08:00
|
|
|
test_acpi_one(" -smp 2,cores=3,sockets=2,maxcpus=6"
|
2017-05-03 17:17:16 +08:00
|
|
|
" -numa node -numa node"
|
|
|
|
" -numa dist,src=0,dst=1,val=21",
|
2016-07-01 19:50:22 +08:00
|
|
|
&data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
2016-06-10 17:15:43 +08:00
|
|
|
static uint8_t ipmi_required_struct_types[] = {
|
|
|
|
0, 1, 3, 4, 16, 17, 19, 32, 38, 127
|
|
|
|
};
|
|
|
|
|
|
|
|
static void test_acpi_q35_tcg_ipmi(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_Q35;
|
|
|
|
data.variant = ".ipmibt";
|
|
|
|
data.required_struct_types = ipmi_required_struct_types;
|
|
|
|
data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types);
|
2016-09-07 03:19:22 +08:00
|
|
|
test_acpi_one("-device ipmi-bmc-sim,id=bmc0"
|
2016-06-10 17:15:43 +08:00
|
|
|
" -device isa-ipmi-bt,bmc=bmc0",
|
|
|
|
&data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_acpi_piix4_tcg_ipmi(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
/* Supplying -machine accel argument overrides the default (qtest).
|
|
|
|
* This is to make guest actually run.
|
|
|
|
*/
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_PC;
|
|
|
|
data.variant = ".ipmikcs";
|
|
|
|
data.required_struct_types = ipmi_required_struct_types;
|
|
|
|
data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types);
|
2016-09-07 03:19:22 +08:00
|
|
|
test_acpi_one("-device ipmi-bmc-sim,id=bmc0"
|
2016-06-10 17:15:43 +08:00
|
|
|
" -device isa-ipmi-kcs,irq=0,bmc=bmc0",
|
|
|
|
&data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
2016-12-06 07:32:20 +08:00
|
|
|
static void test_acpi_q35_tcg_memhp(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_Q35;
|
|
|
|
data.variant = ".memhp";
|
2017-05-03 17:17:16 +08:00
|
|
|
test_acpi_one(" -m 128,slots=3,maxmem=1G"
|
|
|
|
" -numa node -numa node"
|
|
|
|
" -numa dist,src=0,dst=1,val=21",
|
|
|
|
&data);
|
2016-12-06 07:32:20 +08:00
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_acpi_piix4_tcg_memhp(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_PC;
|
|
|
|
data.variant = ".memhp";
|
2017-05-03 17:17:16 +08:00
|
|
|
test_acpi_one(" -m 128,slots=3,maxmem=1G"
|
|
|
|
" -numa node -numa node"
|
|
|
|
" -numa dist,src=0,dst=1,val=21",
|
|
|
|
&data);
|
2016-12-06 07:32:20 +08:00
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
2017-12-14 12:08:54 +08:00
|
|
|
static void test_acpi_q35_tcg_numamem(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_Q35;
|
|
|
|
data.variant = ".numamem";
|
|
|
|
test_acpi_one(" -numa node -numa node,mem=128", &data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_acpi_piix4_tcg_numamem(void)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = MACHINE_PC;
|
|
|
|
data.variant = ".numamem";
|
|
|
|
test_acpi_one(" -numa node -numa node,mem=128", &data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
2018-03-11 11:02:14 +08:00
|
|
|
static void test_acpi_tcg_dimm_pxm(const char *machine)
|
|
|
|
{
|
|
|
|
test_data data;
|
|
|
|
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.machine = machine;
|
|
|
|
data.variant = ".dimmpxm";
|
2018-06-08 06:31:11 +08:00
|
|
|
test_acpi_one(" -machine nvdimm=on,nvdimm-persistence=cpu"
|
2018-03-11 11:02:14 +08:00
|
|
|
" -smp 4,sockets=4"
|
|
|
|
" -m 128M,slots=3,maxmem=1G"
|
|
|
|
" -numa node,mem=32M,nodeid=0"
|
|
|
|
" -numa node,mem=32M,nodeid=1"
|
|
|
|
" -numa node,mem=32M,nodeid=2"
|
|
|
|
" -numa node,mem=32M,nodeid=3"
|
|
|
|
" -numa cpu,node-id=0,socket-id=0"
|
|
|
|
" -numa cpu,node-id=1,socket-id=1"
|
|
|
|
" -numa cpu,node-id=2,socket-id=2"
|
|
|
|
" -numa cpu,node-id=3,socket-id=3"
|
|
|
|
" -object memory-backend-ram,id=ram0,size=128M"
|
|
|
|
" -object memory-backend-ram,id=nvm0,size=128M"
|
|
|
|
" -device pc-dimm,id=dimm0,memdev=ram0,node=1"
|
|
|
|
" -device nvdimm,id=dimm1,memdev=nvm0,node=2",
|
|
|
|
&data);
|
|
|
|
free_test_data(&data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_acpi_q35_tcg_dimm_pxm(void)
|
|
|
|
{
|
|
|
|
test_acpi_tcg_dimm_pxm(MACHINE_Q35);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_acpi_piix4_tcg_dimm_pxm(void)
|
|
|
|
{
|
|
|
|
test_acpi_tcg_dimm_pxm(MACHINE_PC);
|
|
|
|
}
|
|
|
|
|
2013-10-18 05:52:18 +08:00
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
const char *arch = qtest_get_arch();
|
2013-12-26 12:53:39 +08:00
|
|
|
int ret;
|
2014-08-18 15:54:33 +08:00
|
|
|
|
2016-02-15 00:59:27 +08:00
|
|
|
ret = boot_sector_init(disk);
|
|
|
|
if(ret)
|
|
|
|
return ret;
|
2013-10-18 05:52:18 +08:00
|
|
|
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
|
|
|
|
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
2016-09-07 03:19:22 +08:00
|
|
|
qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
|
|
|
|
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
|
|
|
|
qtest_add_func("acpi/q35", test_acpi_q35_tcg);
|
|
|
|
qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
|
tests/bios-tables-test: add 64-bit PCI MMIO aperture round-up test on Q35
In commit 9fa99d2519cb ("hw/pci-host: Fix x86 Host Bridges 64bit PCI
hole", 2017-11-16), we meant to expose such a 64-bit PCI MMIO aperture in
the ACPI DSDT that would be at least as large as the new "pci-hole64-size"
property (2GB on i440fx, 32GB on q35). The goal was to offer "enough"
64-bit MMIO aperture to the guest OS for hotplug purposes.
Previous patch fixed the issue that the aperture is extended relative to
a possibly incorrect base. This may result in an aperture size that is
smaller than the intent of commit 9fa99d2519cb.
This patch adds a test to make sure it won't happen again.
In the test case being added:
- use 128 MB initial RAM size,
- ask for one DIMM hotplug slot,
- ask for 2 GB maximum RAM size,
- use a pci-testdev with a 64-bit BAR of 2 GB size.
Consequences:
(1) In pc_memory_init() [hw/i386/pc.c], the DIMM hotplug area size is
initially set to 2048-128 = 1920 MB. (Maximum RAM size minus initial
RAM size.)
(2) The DIMM area base is set to 4096 MB (because the initial RAM is only
128 MB -- there is no initial "high RAM").
(3) Due to commit 085f8e88ba73 ("pc: count in 1Gb hugepage alignment when
sizing hotplug-memory container", 2014-11-24), we add 1 GB for the one
DIMM hotplug slot that was specified. This sets the DIMM area size to
1920+1024 = 2944 MB.
(4) The reserved-memory-end address (exclusive) is set to 4096 + 2944 =
7040 MB (DIMM area base plus DIMM area size).
(5) The reserved-memory-end address is rounded up to GB alignment,
yielding 7 GB (7168 MB).
(6) Given the 2 GB BAR size of pci-testdev, SeaBIOS allocates said 64-bit
BAR in 64-bit address space.
(7) Because reserved-memory-end is at 7 GB, it is unaligned for the 2 GB
BAR. Therefore SeaBIOS allocates the BAR at 8 GB. QEMU then
(correctly) assigns the root bridge aperture base this BAR address, to
be exposed in \_SB.PCI0._CRS.
(8) The intent of commit 9fa99d2519cb dictates that QEMU extend the
aperture size to 32 GB, implying a 40 GB end address. However, QEMU
performs the extension relative to reserved-memory-end (7 GB), not
relative to the bridge aperture base that was correctly deduced from
SeaBIOS's BAR programming (8 GB). Therefore we see 39 GB as the
aperture end address in \_SB.PCI0._CRS:
> QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
> 0x0000000000000000, // Granularity
> 0x0000000200000000, // Range Minimum
> 0x00000009BFFFFFFF, // Range Maximum
> 0x0000000000000000, // Translation Offset
> 0x00000007C0000000, // Length
> ,, , AddressRangeMemory, TypeStatic)
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2018-09-28 05:24:36 +08:00
|
|
|
qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);
|
2016-09-07 03:19:22 +08:00
|
|
|
qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipmi);
|
|
|
|
qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi);
|
|
|
|
qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cphp);
|
|
|
|
qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp);
|
2016-12-06 07:32:20 +08:00
|
|
|
qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp);
|
|
|
|
qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp);
|
2017-12-14 12:08:54 +08:00
|
|
|
qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_tcg_numamem);
|
|
|
|
qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
|
2018-03-11 11:02:14 +08:00
|
|
|
qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
|
|
|
|
qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
|
2013-10-18 05:52:18 +08:00
|
|
|
}
|
2013-12-26 12:53:39 +08:00
|
|
|
ret = g_test_run();
|
2016-02-15 00:59:27 +08:00
|
|
|
boot_sector_cleanup(disk);
|
2013-12-26 12:53:39 +08:00
|
|
|
return ret;
|
2013-10-18 05:52:18 +08:00
|
|
|
}
|