@@ -54,11 +54,6 @@ static void set_checksum(
p[checksum_offset] = -sum;
}
-static uint8_t battery_port_exists(void)
-{
- return (inb(0x88) == 0x1F);
-}
-
static struct acpi_20_madt *construct_madt(struct acpi_info *info)
{
struct acpi_20_madt *madt;
@@ -320,7 +315,7 @@ static int construct_passthrough_tables(unsigned long *table_ptrs,
}
static int construct_secondary_tables(unsigned long *table_ptrs,
- struct acpi_info *info)
+ struct acpi_config *config)
{
int nr_tables = 0;
struct acpi_20_madt *madt;
@@ -335,13 +330,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
/* MADT. */
if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode )
{
- madt = construct_madt(info);
+ madt = construct_madt(&config->ainfo);
if (!madt) return -1;
table_ptrs[nr_tables++] = (unsigned long)madt;
}
/* HPET. */
- if ( info->hpet_present )
+ if ( config->ainfo.hpet_present )
{
hpet = construct_hpet();
if (!hpet) return -1;
@@ -353,7 +348,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
if (!waet) return -1;
table_ptrs[nr_tables++] = (unsigned long)waet;
- if ( battery_port_exists() )
+ if ( config->table_flags & ACPI_BUILD_SSDT_PM )
{
ssdt = mem_alloc(sizeof(ssdt_pm), 16);
if (!ssdt) return -1;
@@ -361,7 +356,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
table_ptrs[nr_tables++] = (unsigned long)ssdt;
}
- if ( !strncmp(xenstore_read("platform/acpi_s3", "1"), "1", 1) )
+ if ( config->table_flags & ACPI_BUILD_SSDT_S3 )
{
ssdt = mem_alloc(sizeof(ssdt_s3), 16);
if (!ssdt) return -1;
@@ -371,7 +366,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
printf("S3 disabled\n");
}
- if ( !strncmp(xenstore_read("platform/acpi_s4", "1"), "1", 1) )
+ if ( config->table_flags & ACPI_BUILD_SSDT_S4 )
{
ssdt = mem_alloc(sizeof(ssdt_s4), 16);
if (!ssdt) return -1;
@@ -539,8 +534,7 @@ void acpi_build_tables(struct acpi_config *config)
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_20_fadt));
- nr_secondaries = construct_secondary_tables(secondary_tables,
- &config->ainfo);
+ nr_secondaries = construct_secondary_tables(secondary_tables, config);
if ( nr_secondaries < 0 )
goto oom;
@@ -28,6 +28,11 @@
#ifndef __LIBACPI_H__
#define __LIBACPI_H__
+/* Flags indicating which tables to build */
+#define ACPI_BUILD_SSDT_PM (1<<0)
+#define ACPI_BUILD_SSDT_S3 (1<<1)
+#define ACPI_BUILD_SSDT_S4 (1<<2)
+
#pragma pack ()
/*
@@ -54,6 +59,8 @@ struct acpi_config {
uint64_t vm_gid[2];
+ uint32_t table_flags;
+
/* May have some fields updated by acpi_build_table() */
struct acpi_info ainfo;
/*
@@ -859,6 +859,11 @@ int hpet_exists(unsigned long hpet_base)
return ((hpet_id >> 16) == 0x8086);
}
+static uint8_t battery_port_exists(void)
+{
+ return (inb(0x88) == 0x1F);
+}
+
void hvmloader_acpi_build_tables(struct acpi_config *config,
unsigned int physical)
{
@@ -890,6 +895,13 @@ void hvmloader_acpi_build_tables(struct acpi_config *config,
config->vm_gid[1] = strtoll(end+1, NULL, 0);
}
+ if ( battery_port_exists() )
+ config->table_flags |= ACPI_BUILD_SSDT_PM;
+ if ( !strncmp(xenstore_read("platform/acpi_s3", "1"), "1", 1) )
+ config->table_flags |= ACPI_BUILD_SSDT_S3;
+ if ( !strncmp(xenstore_read("platform/acpi_s4", "1"), "1", 1) )
+ config->table_flags |= ACPI_BUILD_SSDT_S4;
+
config->rsdp = physical;
config->ainfop = ACPI_INFO_PHYSICAL_ADDRESS;
With that, xenstore_read() won't need to be done in ACPI code Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> --- tools/firmware/hvmloader/acpi/build.c | 20 +++++++------------- tools/firmware/hvmloader/acpi/libacpi.h | 7 +++++++ tools/firmware/hvmloader/util.c | 12 ++++++++++++ 3 files changed, 26 insertions(+), 13 deletions(-)