[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v5 08/21] acpi/hvmloader: Build WAET optionally
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx> Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx> --- tools/firmware/hvmloader/acpi/build.c | 10 +++++++--- tools/firmware/hvmloader/acpi/libacpi.h | 1 + tools/firmware/hvmloader/util.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index dc489bb..537933b 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -360,9 +360,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs, } /* WAET. */ - waet = construct_waet(); - if (!waet) return -1; - table_ptrs[nr_tables++] = (unsigned long)waet; + if ( config->table_flags & ACPI_HAS_WAET ) + { + waet = construct_waet(); + if ( !waet ) + return -1; + table_ptrs[nr_tables++] = (unsigned long)waet; + } if ( config->table_flags & ACPI_HAS_SSDT_PM ) { diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h index b8f28a3..b411a6e 100644 --- a/tools/firmware/hvmloader/acpi/libacpi.h +++ b/tools/firmware/hvmloader/acpi/libacpi.h @@ -29,6 +29,7 @@ #define ACPI_HAS_SSDT_S4 (1<<6) #define ACPI_HAS_TCPA (1<<7) #define ACPI_HAS_IOAPIC (1<<8) +#define ACPI_HAS_WAET (1<<9) struct xen_vmemrange; struct acpi_numa { diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index aa5fc20..b345576 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -919,7 +919,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, if ( !strncmp(xenstore_read("platform/acpi_s4", "1"), "1", 1) ) config->table_flags |= ACPI_HAS_SSDT_S4; - config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC); + config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | ACPI_HAS_WAET); config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS; -- 1.8.3.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx https://lists.xen.org/xen-devel
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |