hw/i386/acpi-build: move generic acpi building helpers into dedictated file
Move generic acpi building helpers into dedictated file and this can be shared with other machines. Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Shannon Zhao
Michael S. Tsirkin
parent
395e5fb442
commit
658c27181b
@ -26,6 +26,7 @@
|
||||
#include <string.h>
|
||||
#include "hw/acpi/aml-build.h"
|
||||
#include "qemu/bswap.h"
|
||||
#include "hw/acpi/bios-linker-loader.h"
|
||||
|
||||
static GArray *build_alloc_array(void)
|
||||
{
|
||||
@ -891,3 +892,60 @@ Aml *aml_qword_memory(AmlDecode dec, AmlMinFixed min_fixed,
|
||||
dec, addr_gran, addr_min, addr_max,
|
||||
addr_trans, len, flags);
|
||||
}
|
||||
|
||||
void
|
||||
build_header(GArray *linker, GArray *table_data,
|
||||
AcpiTableHeader *h, const char *sig, int len, uint8_t rev)
|
||||
{
|
||||
memcpy(&h->signature, sig, 4);
|
||||
h->length = cpu_to_le32(len);
|
||||
h->revision = rev;
|
||||
memcpy(h->oem_id, ACPI_BUILD_APPNAME6, 6);
|
||||
memcpy(h->oem_table_id, ACPI_BUILD_APPNAME4, 4);
|
||||
memcpy(h->oem_table_id + 4, sig, 4);
|
||||
h->oem_revision = cpu_to_le32(1);
|
||||
memcpy(h->asl_compiler_id, ACPI_BUILD_APPNAME4, 4);
|
||||
h->asl_compiler_revision = cpu_to_le32(1);
|
||||
h->checksum = 0;
|
||||
/* Checksum to be filled in by Guest linker */
|
||||
bios_linker_loader_add_checksum(linker, ACPI_BUILD_TABLE_FILE,
|
||||
table_data->data, h, len, &h->checksum);
|
||||
}
|
||||
|
||||
void *acpi_data_push(GArray *table_data, unsigned size)
|
||||
{
|
||||
unsigned off = table_data->len;
|
||||
g_array_set_size(table_data, off + size);
|
||||
return table_data->data + off;
|
||||
}
|
||||
|
||||
unsigned acpi_data_len(GArray *table)
|
||||
{
|
||||
#if GLIB_CHECK_VERSION(2, 22, 0)
|
||||
assert(g_array_get_element_size(table) == 1);
|
||||
#endif
|
||||
return table->len;
|
||||
}
|
||||
|
||||
void acpi_add_table(GArray *table_offsets, GArray *table_data)
|
||||
{
|
||||
uint32_t offset = cpu_to_le32(table_data->len);
|
||||
g_array_append_val(table_offsets, offset);
|
||||
}
|
||||
|
||||
void acpi_build_tables_init(AcpiBuildTables *tables)
|
||||
{
|
||||
tables->rsdp = g_array_new(false, true /* clear */, 1);
|
||||
tables->table_data = g_array_new(false, true /* clear */, 1);
|
||||
tables->tcpalog = g_array_new(false, true /* clear */, 1);
|
||||
tables->linker = bios_linker_loader_init();
|
||||
}
|
||||
|
||||
void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
|
||||
{
|
||||
void *linker_data = bios_linker_loader_cleanup(tables->linker);
|
||||
g_free(linker_data);
|
||||
g_array_free(tables->rsdp, true);
|
||||
g_array_free(tables->table_data, true);
|
||||
g_array_free(tables->tcpalog, mfre);
|
||||
}
|
||||
|
||||
@ -70,9 +70,6 @@
|
||||
|
||||
#define ACPI_BUILD_TABLE_SIZE 0x20000
|
||||
|
||||
/* Reserve RAM space for tables: add another order of magnitude. */
|
||||
#define ACPI_BUILD_TABLE_MAX_SIZE 0x200000
|
||||
|
||||
/* #define DEBUG_ACPI_BUILD */
|
||||
#ifdef DEBUG_ACPI_BUILD
|
||||
#define ACPI_BUILD_DPRINTF(fmt, ...) \
|
||||
@ -267,51 +264,8 @@ static void acpi_get_pci_info(PcPciInfo *info)
|
||||
NULL);
|
||||
}
|
||||
|
||||
#define ACPI_BUILD_APPNAME "Bochs"
|
||||
#define ACPI_BUILD_APPNAME6 "BOCHS "
|
||||
#define ACPI_BUILD_APPNAME4 "BXPC"
|
||||
|
||||
#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"
|
||||
#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
|
||||
#define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log"
|
||||
|
||||
static void
|
||||
build_header(GArray *linker, GArray *table_data,
|
||||
AcpiTableHeader *h, const char *sig, int len, uint8_t rev)
|
||||
{
|
||||
memcpy(&h->signature, sig, 4);
|
||||
h->length = cpu_to_le32(len);
|
||||
h->revision = rev;
|
||||
memcpy(h->oem_id, ACPI_BUILD_APPNAME6, 6);
|
||||
memcpy(h->oem_table_id, ACPI_BUILD_APPNAME4, 4);
|
||||
memcpy(h->oem_table_id + 4, sig, 4);
|
||||
h->oem_revision = cpu_to_le32(1);
|
||||
memcpy(h->asl_compiler_id, ACPI_BUILD_APPNAME4, 4);
|
||||
h->asl_compiler_revision = cpu_to_le32(1);
|
||||
h->checksum = 0;
|
||||
/* Checksum to be filled in by Guest linker */
|
||||
bios_linker_loader_add_checksum(linker, ACPI_BUILD_TABLE_FILE,
|
||||
table_data->data, h, len, &h->checksum);
|
||||
}
|
||||
|
||||
/* End here */
|
||||
#define ACPI_PORT_SMI_CMD 0x00b2 /* TODO: this is APM_CNT_IOPORT */
|
||||
|
||||
static inline void *acpi_data_push(GArray *table_data, unsigned size)
|
||||
{
|
||||
unsigned off = table_data->len;
|
||||
g_array_set_size(table_data, off + size);
|
||||
return table_data->data + off;
|
||||
}
|
||||
|
||||
static unsigned acpi_data_len(GArray *table)
|
||||
{
|
||||
#if GLIB_CHECK_VERSION(2, 22, 0)
|
||||
assert(g_array_get_element_size(table) == 1);
|
||||
#endif
|
||||
return table->len;
|
||||
}
|
||||
|
||||
static void acpi_align_size(GArray *blob, unsigned align)
|
||||
{
|
||||
/* Align size to multiple of given size. This reduces the chance
|
||||
@ -320,12 +274,6 @@ static void acpi_align_size(GArray *blob, unsigned align)
|
||||
g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align));
|
||||
}
|
||||
|
||||
static inline void acpi_add_table(GArray *table_offsets, GArray *table_data)
|
||||
{
|
||||
uint32_t offset = cpu_to_le32(table_data->len);
|
||||
g_array_append_val(table_offsets, offset);
|
||||
}
|
||||
|
||||
/* FACS */
|
||||
static void
|
||||
build_facs(GArray *table_data, GArray *linker, PcGuestInfo *guest_info)
|
||||
@ -1295,31 +1243,6 @@ build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt)
|
||||
return rsdp_table;
|
||||
}
|
||||
|
||||
typedef
|
||||
struct AcpiBuildTables {
|
||||
GArray *table_data;
|
||||
GArray *rsdp;
|
||||
GArray *tcpalog;
|
||||
GArray *linker;
|
||||
} AcpiBuildTables;
|
||||
|
||||
static inline void acpi_build_tables_init(AcpiBuildTables *tables)
|
||||
{
|
||||
tables->rsdp = g_array_new(false, true /* clear */, 1);
|
||||
tables->table_data = g_array_new(false, true /* clear */, 1);
|
||||
tables->tcpalog = g_array_new(false, true /* clear */, 1);
|
||||
tables->linker = bios_linker_loader_init();
|
||||
}
|
||||
|
||||
static inline void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
|
||||
{
|
||||
void *linker_data = bios_linker_loader_cleanup(tables->linker);
|
||||
g_free(linker_data);
|
||||
g_array_free(tables->rsdp, true);
|
||||
g_array_free(tables->table_data, true);
|
||||
g_array_free(tables->tcpalog, mfre);
|
||||
}
|
||||
|
||||
typedef
|
||||
struct AcpiBuildState {
|
||||
/* Copy of table in RAM (for patching). */
|
||||
|
||||
@ -4,6 +4,18 @@
|
||||
#include <stdint.h>
|
||||
#include <glib.h>
|
||||
#include "qemu/compiler.h"
|
||||
#include "hw/acpi/acpi-defs.h"
|
||||
|
||||
/* Reserve RAM space for tables: add another order of magnitude. */
|
||||
#define ACPI_BUILD_TABLE_MAX_SIZE 0x200000
|
||||
|
||||
#define ACPI_BUILD_APPNAME "Bochs"
|
||||
#define ACPI_BUILD_APPNAME6 "BOCHS "
|
||||
#define ACPI_BUILD_APPNAME4 "BXPC"
|
||||
|
||||
#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"
|
||||
#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
|
||||
#define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log"
|
||||
|
||||
typedef enum {
|
||||
AML_NO_OPCODE = 0,/* has only data */
|
||||
@ -93,6 +105,14 @@ typedef enum {
|
||||
aml_ReadWrite = 1,
|
||||
} AmlReadAndWrite;
|
||||
|
||||
typedef
|
||||
struct AcpiBuildTables {
|
||||
GArray *table_data;
|
||||
GArray *rsdp;
|
||||
GArray *tcpalog;
|
||||
GArray *linker;
|
||||
} AcpiBuildTables;
|
||||
|
||||
/**
|
||||
* init_aml_allocator:
|
||||
*
|
||||
@ -188,4 +208,13 @@ Aml *aml_resource_template(void);
|
||||
Aml *aml_field(const char *name, AmlFieldFlags flags);
|
||||
Aml *aml_varpackage(uint32_t num_elements);
|
||||
|
||||
void
|
||||
build_header(GArray *linker, GArray *table_data,
|
||||
AcpiTableHeader *h, const char *sig, int len, uint8_t rev);
|
||||
void *acpi_data_push(GArray *table_data, unsigned size);
|
||||
unsigned acpi_data_len(GArray *table);
|
||||
void acpi_add_table(GArray *table_offsets, GArray *table_data);
|
||||
void acpi_build_tables_init(AcpiBuildTables *tables);
|
||||
void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre);
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user