From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: xen-devel@lists.xen.org
Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com,
ian.jackson@eu.citrix.com, julien.grall@arm.com,
jbeulich@suse.com, zhaoshenglong@huawei.com,
boris.ostrovsky@oracle.com, roger.pau@citrix.com
Subject: [PATCH v1 04/20] acpi/hvmloader: Decide which SSDTs to install in hvmloader
Date: Tue, 5 Jul 2016 15:05:03 -0400 [thread overview]
Message-ID: <1467745519-9868-5-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1467745519-9868-1-git-send-email-boris.ostrovsky@oracle.com>
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(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index ca9727f..0bcb185 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -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;
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h
index aa19972..5454bc2 100644
--- a/tools/firmware/hvmloader/acpi/libacpi.h
+++ b/tools/firmware/hvmloader/acpi/libacpi.h
@@ -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;
/*
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index e62052b..1ccb38c 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -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;
--
1.7.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-05 19:05 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-05 19:04 [PATCH v1 00/20] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 01/20] hvmloader: Provide hvmloader_acpi_build_tables() Boris Ostrovsky
2016-07-06 14:47 ` Konrad Rzeszutek Wilk
2016-07-08 9:52 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 02/20] acpi/hvmloader: Move acpi_info initialization out of ACPI code Boris Ostrovsky
2016-07-07 16:58 ` Ian Jackson
2016-07-07 17:09 ` Boris Ostrovsky
2016-07-07 17:15 ` Wei Liu
2016-07-07 17:45 ` Boris Ostrovsky
2016-07-08 15:06 ` Konrad Rzeszutek Wilk
2016-07-08 15:50 ` Ian Jackson
2016-07-08 15:57 ` Boris Ostrovsky
2016-07-08 16:21 ` Ian Jackson
2016-07-11 12:10 ` Wei Liu
2016-07-11 14:47 ` Lars Kurth
2016-07-11 14:54 ` Konrad Rzeszutek Wilk
2016-07-11 15:06 ` Boris Ostrovsky
2016-07-11 15:38 ` Ian Jackson
2016-07-11 15:47 ` Ian Jackson
2016-07-11 16:07 ` Boris Ostrovsky
2016-07-08 10:10 ` Jan Beulich
2016-07-08 14:39 ` Boris Ostrovsky
2016-07-08 15:11 ` Jan Beulich
2016-07-08 16:14 ` Boris Ostrovsky
2016-08-01 10:09 ` Jan Beulich
2016-08-01 14:06 ` Boris Ostrovsky
2016-08-01 14:18 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 03/20] acpi/hvmloader: Initialize vm_gid data outside " Boris Ostrovsky
2016-07-08 10:18 ` Jan Beulich
2016-07-05 19:05 ` Boris Ostrovsky [this message]
2016-07-08 10:27 ` [PATCH v1 04/20] acpi/hvmloader: Decide which SSDTs to install in hvmloader Jan Beulich
2016-07-05 19:05 ` [PATCH v1 05/20] acpi/hvmloader: Move passthrough initialization from ACPI code Boris Ostrovsky
2016-07-08 10:46 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 06/20] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
2016-07-08 13:36 ` Jan Beulich
2016-07-08 15:08 ` Boris Ostrovsky
2016-07-08 15:14 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 07/20] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
2016-07-08 13:38 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 08/20] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
2016-07-08 13:41 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 09/20] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
2016-07-08 13:42 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 10/20] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
2016-07-08 13:58 ` Jan Beulich
2016-07-08 15:23 ` Boris Ostrovsky
2016-07-08 15:35 ` Jan Beulich
2016-07-08 16:19 ` Boris Ostrovsky
2016-07-19 9:11 ` Jan Beulich
2016-07-19 14:08 ` Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 11/20] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
2016-07-08 14:31 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 12/20] acpi/hvmloader: Link ACPI object files directly Boris Ostrovsky
2016-07-08 14:51 ` Jan Beulich
2016-07-08 15:41 ` Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 13/20] acpi/hvmloader: Include file/paths adjustments Boris Ostrovsky
2016-07-08 15:51 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 14/20] acpi: Move ACPI code to tools/libacpi Boris Ostrovsky
2016-08-03 16:00 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 15/20] x86: Add more checks verifying that PIT/PIC/IOAPIC are emulated Boris Ostrovsky
2016-08-03 16:04 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 16/20] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
2016-08-03 16:11 ` Jan Beulich
2016-08-03 16:15 ` Andrew Cooper
2016-07-05 19:05 ` [PATCH v1 17/20] libacpi: Build DSDT for PVH guests Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 18/20] libxl/acpi: Add ACPI e820 entry Boris Ostrovsky
2016-07-06 10:00 ` Julien Grall
2016-07-06 15:43 ` Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 19/20] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests Boris Ostrovsky
2016-07-07 16:47 ` Wei Liu
2016-07-07 17:02 ` Boris Ostrovsky
2016-07-07 17:16 ` Wei Liu
2016-07-05 19:05 ` [PATCH v1 20/20] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-07-06 11:05 ` Julien Grall
2016-07-06 15:50 ` Boris Ostrovsky
2016-07-06 16:04 ` Julien Grall
2016-07-06 16:30 ` Boris Ostrovsky
2016-07-06 17:03 ` Julien Grall
2016-07-06 17:33 ` Boris Ostrovsky
2016-07-07 8:38 ` Jan Beulich
2016-07-07 15:08 ` Boris Ostrovsky
2016-07-07 15:12 ` Julien Grall
2016-07-07 15:24 ` Jan Beulich
2016-07-08 10:55 ` Wei Liu
2016-07-08 14:48 ` Boris Ostrovsky
2016-07-08 16:07 ` Wei Liu
2016-07-08 17:20 ` Boris Ostrovsky
2016-07-11 10:47 ` Wei Liu
2016-07-11 13:33 ` Boris Ostrovsky
2016-07-11 13:39 ` Julien Grall
2016-07-11 13:42 ` Wei Liu
2016-07-11 13:58 ` Julien Grall
2016-07-11 13:41 ` Wei Liu
2016-07-11 14:40 ` Boris Ostrovsky
2016-07-12 14:30 ` Wei Liu
2016-07-11 14:00 ` Anthony PERARD
2016-07-06 16:04 ` [PATCH v1 00/20] Make ACPI builder available to components other than hvmloader Roger Pau Monné
2016-07-06 16:32 ` Boris Ostrovsky
2016-07-07 8:35 ` Jan Beulich
2016-07-07 9:14 ` Julien Grall
2016-07-07 9:20 ` Jan Beulich
2016-07-07 9:29 ` Julien Grall
2016-07-07 15:04 ` Boris Ostrovsky
2016-07-07 15:10 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467745519-9868-5-git-send-email-boris.ostrovsky@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=julien.grall@arm.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).