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 <boris.ostrovsky@oracle.com>,
roger.pau@citrix.com
Subject: [PATCH v5 06/21] acpi/hvmloader: Set TIS header address in hvmloader
Date: Thu, 22 Sep 2016 15:13:31 -0400 [thread overview]
Message-ID: <1474571626-6694-7-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1474571626-6694-1-git-send-email-boris.ostrovsky@oracle.com>
Users other than hvmloader may provide TIS address as virtual.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
tools/firmware/hvmloader/acpi/build.c | 9 ++++-----
tools/firmware/hvmloader/acpi/libacpi.h | 3 +++
tools/firmware/hvmloader/config.h | 2 ++
tools/firmware/hvmloader/util.c | 4 ++++
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 68eb7c4..c984e5a 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -335,7 +335,6 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
struct acpi_20_tcpa *tcpa;
unsigned char *ssdt;
static const uint16_t tis_signature[] = {0x0001, 0x0001, 0x0001};
- uint16_t *tis_hdr;
void *lasa;
/* MADT. */
@@ -388,10 +387,10 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
}
/* TPM TCPA and SSDT. */
- tis_hdr = (uint16_t *)0xFED40F00;
- if ( (tis_hdr[0] == tis_signature[0]) &&
- (tis_hdr[1] == tis_signature[1]) &&
- (tis_hdr[2] == tis_signature[2]) )
+ if ( (config->table_flags & ACPI_HAS_TCPA) &&
+ (config->tis_hdr[0] == tis_signature[0]) &&
+ (config->tis_hdr[1] == tis_signature[1]) &&
+ (config->tis_hdr[2] == tis_signature[2]) )
{
ssdt = mem_alloc(sizeof(ssdt_tpm), 16);
if (!ssdt) return -1;
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h
index d1e7042..70cf26b 100644
--- a/tools/firmware/hvmloader/acpi/libacpi.h
+++ b/tools/firmware/hvmloader/acpi/libacpi.h
@@ -27,6 +27,7 @@
#define ACPI_HAS_SSDT_PM (1<<4)
#define ACPI_HAS_SSDT_S3 (1<<5)
#define ACPI_HAS_SSDT_S4 (1<<6)
+#define ACPI_HAS_TCPA (1<<7)
struct xen_vmemrange;
struct acpi_numa {
@@ -60,6 +61,8 @@ struct acpi_config {
struct acpi_numa numa;
const struct hvm_info_table *hvminfo;
+ const uint16_t *tis_hdr;
+
/*
* Address where acpi_info should be placed.
* This must match the OperationRegion(BIOS, SystemMemory, ....)
diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h
index a4429f4..6e00413 100644
--- a/tools/firmware/hvmloader/config.h
+++ b/tools/firmware/hvmloader/config.h
@@ -56,6 +56,8 @@ extern uint8_t ioapic_version;
/* MMIO hole: Hardcoded defaults, which can be dynamically expanded. */
#define PCI_MEM_END 0xfc000000
+#define ACPI_TIS_HDR_ADDRESS 0xFED40F00UL
+
extern unsigned long pci_mem_start, pci_mem_end;
extern uint64_t pci_hi_mem_start, pci_hi_mem_end;
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index f37b16e..8875675 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -919,6 +919,10 @@ 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;
+
+ config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS;
+
config->numa.nr_vmemranges = nr_vmemranges;
config->numa.nr_vnodes = nr_vnodes;
config->numa.vcpu_to_vnode = vcpu_to_vnode;
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-09-22 19:13 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 01/21] acpi: Makefile should better tolerate interrupts Boris Ostrovsky
2016-09-23 8:33 ` Jan Beulich
2016-09-23 11:39 ` Ian Jackson
2016-09-22 19:13 ` [PATCH v5 02/21] acpi: Extract acpi info description into a separate ASL file Boris Ostrovsky
2016-09-23 8:34 ` Jan Beulich
2016-09-22 19:13 ` [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries Boris Ostrovsky
2016-09-23 9:18 ` Jan Beulich
2016-09-23 11:42 ` Ian Jackson
2016-09-23 14:23 ` Boris Ostrovsky
2016-09-23 14:24 ` Ian Jackson
2016-09-23 14:35 ` Boris Ostrovsky
2016-09-23 14:38 ` Ian Jackson
2016-09-23 14:48 ` Boris Ostrovsky
2016-09-23 14:44 ` Jan Beulich
2016-09-23 11:44 ` Ian Jackson
2016-09-22 19:13 ` [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1 Boris Ostrovsky
2016-09-23 11:44 ` Ian Jackson
2016-11-14 20:05 ` Konrad Rzeszutek Wilk
2016-11-14 20:13 ` Ken Lancaster
2016-09-22 19:13 ` [PATCH v5 05/21] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
2016-09-22 19:13 ` Boris Ostrovsky [this message]
2016-09-22 19:13 ` [PATCH v5 07/21] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 08/21] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 09/21] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 10/21] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 11/21] acpi/hvmloader: Link ACPI object files directly Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 12/21] acpi/hvmloader: Include file/paths adjustments Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 13/21] acpi: Move ACPI code to tools/libacpi Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 14/21] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 15/21] libacpi: Build DSDT for PVH guests Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 16/21] libxc/libxl: Allow multiple ACPI modules Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 17/21] libxl/acpi: Add ACPI e820 entry Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 18/21] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 19/21] libxl: Initialize domain build info before calling libxl__domain_make Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 20/21] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-09-22 19:21 ` Wei Liu
2016-09-22 19:13 ` [PATCH v5 21/21] libxc/xc_dom_core: Copy ACPI tables to guest space Boris Ostrovsky
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=1474571626-6694-7-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).