SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

acpi: build_hpet: use acpi_table_begin()/acpi_table_end() instead of build_header()

Browse Source 
it replaces error-prone pointer arithmetic for build_header() API,
with 2 calls to start and finish table creation,
which hides offsets magic from API user.

while at it convert build_hpet() to endian agnostic
build_append_FOO() API

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20210924122802.1455362-15-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2021-09-24 08:27:41 -04:00 committed by Michael S. Tsirkin
parent 5c142bc48f
commit 43dde1705c
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/i386/acpi-build.c
View File

@ -1871,22 +1871,32 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
free_aml_allocator(); free_aml_allocator();
} }
/*
* IA-PC HPET (High Precision Event Timers) Specification (Revision: 1.0a)
* 3.2.4The ACPI 2.0 HPET Description Table (HPET)
*/
static void static void
build_hpet(GArray *table_data, BIOSLinker *linker, const char *oem_id, build_hpet(GArray *table_data, BIOSLinker *linker, const char *oem_id,
const char *oem_table_id) const char *oem_table_id)
{ {
Acpi20Hpet *hpet; AcpiTable table = { .sig = "HPET", .rev = 1,
int hpet_start = table_data->len; .oem_id = oem_id, .oem_table_id = oem_table_id };
hpet = acpi_data_push(table_data, sizeof(*hpet)); acpi_table_begin(&table, table_data);
/* Note timer_block_id value must be kept in sync with value advertised by /* Note timer_block_id value must be kept in sync with value advertised by
* emulated hpet * emulated hpet
*/ */
hpet->timer_block_id = cpu_to_le32(0x8086a201); /* Event Timer Block ID */
hpet->addr.address = cpu_to_le64(HPET_BASE); build_append_int_noprefix(table_data, 0x8086a201, 4);
build_header(linker, table_data, /* BASE_ADDRESS */
(void *)(table_data->data + hpet_start), build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 0, 0, 0, HPET_BASE);
"HPET", sizeof(*hpet), 1, oem_id, oem_table_id); /* HPET Number */
build_append_int_noprefix(table_data, 0, 1);
/* Main Counter Minimum Clock_tick in Periodic Mode */
build_append_int_noprefix(table_data, 0, 2);
/* Page Protection And OEM Attribute */
build_append_int_noprefix(table_data, 0, 1);
acpi_table_end(linker, &table);
} }
#ifdef CONFIG_TPM #ifdef CONFIG_TPM

13
include/hw/acpi/acpi-defs.h
View File

@ -358,19 +358,6 @@ struct AcpiGenericTimerTable {
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiGenericTimerTable AcpiGenericTimerTable; typedef struct AcpiGenericTimerTable AcpiGenericTimerTable;
/*
* HPET Description Table
*/
struct Acpi20Hpet {
ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint32_t timer_block_id;
struct AcpiGenericAddress addr;
uint8_t hpet_number;
uint16_t min_tick;
uint8_t page_protect;
} QEMU_PACKED;
typedef struct Acpi20Hpet Acpi20Hpet;
/* /*
* SRAT (NUMA topology description) table * SRAT (NUMA topology description) table
*/ */