77af8a2b95
This updates the FADT generated for x86/64 machine types from Revision 1 to 3. (Based on ACPI standard 2.0 instead of 1.0) The intention is to expose the reset register information to guest operating systems which require it, specifically OS X/macOS. Revision 1 FADTs do not contain the fields relating to the reset register. The new layout and contents remains backwards-compatible with operating systems which only support ACPI 1.0, as the existing fields are not modified by this change, as the 64-bit and 32-bit variants are allowed to co-exist according to the ACPI 2.0 standard. No regressions became apparent in tests with a range of Windows (XP-10) and Linux versions. The BIOS tables test suite's FADT checksum test has also been updated to reflect the new FADT layout and content. Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu> Message-Id: <1489558827-28971-2-git-send-email-phil@philjordan.eu> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
105 lines
4.0 KiB
C
105 lines
4.0 KiB
C
/*
|
|
* Utilities for working with ACPI tables
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef TEST_ACPI_UTILS_H
|
|
#define TEST_ACPI_UTILS_H
|
|
|
|
#include "hw/acpi/acpi-defs.h"
|
|
#include "libqtest.h"
|
|
|
|
/* DSDT and SSDTs format */
|
|
typedef struct {
|
|
AcpiTableHeader header;
|
|
gchar *aml; /* aml bytecode from guest */
|
|
gsize aml_len;
|
|
gchar *aml_file;
|
|
gchar *asl; /* asl code generated from aml */
|
|
gsize asl_len;
|
|
gchar *asl_file;
|
|
bool tmp_files_retain; /* do not delete the temp asl/aml */
|
|
} AcpiSdtTable;
|
|
|
|
#define ACPI_READ_FIELD(field, addr) \
|
|
do { \
|
|
switch (sizeof(field)) { \
|
|
case 1: \
|
|
field = readb(addr); \
|
|
break; \
|
|
case 2: \
|
|
field = readw(addr); \
|
|
break; \
|
|
case 4: \
|
|
field = readl(addr); \
|
|
break; \
|
|
case 8: \
|
|
field = readq(addr); \
|
|
break; \
|
|
default: \
|
|
g_assert(false); \
|
|
} \
|
|
addr += sizeof(field); \
|
|
} while (0);
|
|
|
|
#define ACPI_READ_ARRAY_PTR(arr, length, addr) \
|
|
do { \
|
|
int idx; \
|
|
for (idx = 0; idx < length; ++idx) { \
|
|
ACPI_READ_FIELD(arr[idx], addr); \
|
|
} \
|
|
} while (0);
|
|
|
|
#define ACPI_READ_ARRAY(arr, addr) \
|
|
ACPI_READ_ARRAY_PTR(arr, sizeof(arr) / sizeof(arr[0]), addr)
|
|
|
|
#define ACPI_READ_TABLE_HEADER(table, addr) \
|
|
do { \
|
|
ACPI_READ_FIELD((table)->signature, addr); \
|
|
ACPI_READ_FIELD((table)->length, addr); \
|
|
ACPI_READ_FIELD((table)->revision, addr); \
|
|
ACPI_READ_FIELD((table)->checksum, addr); \
|
|
ACPI_READ_ARRAY((table)->oem_id, addr); \
|
|
ACPI_READ_ARRAY((table)->oem_table_id, addr); \
|
|
ACPI_READ_FIELD((table)->oem_revision, addr); \
|
|
ACPI_READ_ARRAY((table)->asl_compiler_id, addr); \
|
|
ACPI_READ_FIELD((table)->asl_compiler_revision, addr); \
|
|
} while (0);
|
|
|
|
#define ACPI_ASSERT_CMP(actual, expected) do { \
|
|
uint32_t ACPI_ASSERT_CMP_le = cpu_to_le32(actual); \
|
|
char ACPI_ASSERT_CMP_str[5] = {}; \
|
|
memcpy(ACPI_ASSERT_CMP_str, &ACPI_ASSERT_CMP_le, 4); \
|
|
g_assert_cmpstr(ACPI_ASSERT_CMP_str, ==, expected); \
|
|
} while (0)
|
|
|
|
#define ACPI_ASSERT_CMP64(actual, expected) do { \
|
|
uint64_t ACPI_ASSERT_CMP_le = cpu_to_le64(actual); \
|
|
char ACPI_ASSERT_CMP_str[9] = {}; \
|
|
memcpy(ACPI_ASSERT_CMP_str, &ACPI_ASSERT_CMP_le, 8); \
|
|
g_assert_cmpstr(ACPI_ASSERT_CMP_str, ==, expected); \
|
|
} while (0)
|
|
|
|
#define ACPI_READ_GENERIC_ADDRESS(field, addr) \
|
|
do { \
|
|
ACPI_READ_FIELD((field).space_id, addr); \
|
|
ACPI_READ_FIELD((field).bit_width, addr); \
|
|
ACPI_READ_FIELD((field).bit_offset, addr); \
|
|
ACPI_READ_FIELD((field).access_width, addr); \
|
|
ACPI_READ_FIELD((field).address, addr); \
|
|
} while (0);
|
|
|
|
|
|
uint8_t acpi_calc_checksum(const uint8_t *data, int len);
|
|
uint32_t acpi_find_rsdp_address(void);
|
|
void acpi_parse_rsdp_table(uint32_t addr, AcpiRsdpDescriptor *rsdp_table);
|
|
|
|
#endif /* TEST_ACPI_UTILS_H */
|