From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: xen-devel@lists.xen.org
Cc: Keir Fraser <keir@xen.org>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Jan Beulich <jbeulich@suse.com>, Wei Liu <wei.liu2@citrix.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
roger.pau@citrix.com
Subject: [PATCH RFC 02/20] acpi/hvmloader: Move acpi_info initialization out of ACPI code
Date: Tue, 5 Apr 2016 21:25:31 -0400 [thread overview]
Message-ID: <1459905949-10358-3-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1459905949-10358-1-git-send-email-boris.ostrovsky@oracle.com>
acpi_info can be initialized by hvmloader itself. Now ACPI code
doesn't need to use hvmloader-private variables/routines such as
uart_exists(), lpt_exists() etc.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
tools/firmware/hvmloader/acpi/acpi2_0.h | 18 ++++++++++++++
tools/firmware/hvmloader/acpi/build.c | 44 ++++++---------------------------
tools/firmware/hvmloader/util.c | 15 +++++++++++
3 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h
index 78eb43d..24f86c9 100644
--- a/tools/firmware/hvmloader/acpi/acpi2_0.h
+++ b/tools/firmware/hvmloader/acpi/acpi2_0.h
@@ -451,11 +451,29 @@ struct acpi_20_slit {
#pragma pack ()
+/*
+ * Located at ACPI_INFO_PHYSICAL_ADDRESS.
+ *
+ * This must match the Field("BIOS"....) definition in the DSDT.
+ */
+struct acpi_info {
+ uint8_t com1_present:1; /* 0[0] - System has COM1? */
+ uint8_t com2_present:1; /* 0[1] - System has COM2? */
+ uint8_t lpt1_present:1; /* 0[2] - System has LPT1? */
+ uint8_t hpet_present:1; /* 0[3] - System has HPET? */
+ uint32_t pci_min, pci_len; /* 4, 8 - PCI I/O hole boundaries */
+ uint32_t madt_csum_addr; /* 12 - Address of MADT checksum */
+ uint32_t madt_lapic0_addr; /* 16 - Address of first MADT LAPIC struct */
+ uint32_t vm_gid_addr; /* 20 - Address of VM generation id buffer */
+ uint64_t pci_hi_min, pci_hi_len; /* 24, 32 - PCI I/O hole boundaries */
+};
+
struct acpi_config {
unsigned char *dsdt_anycpu;
int dsdt_anycpu_len;
unsigned char *dsdt_15cpu;
int dsdt_15cpu_len;
+ struct acpi_info acpi_info;
};
void acpi_build_tables(struct acpi_config *config, unsigned int physical);
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 503648c..e039d9e 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -38,23 +38,6 @@ extern struct acpi_20_fadt Fadt;
extern struct acpi_20_facs Facs;
extern struct acpi_20_waet Waet;
-/*
- * Located at ACPI_INFO_PHYSICAL_ADDRESS.
- *
- * This must match the Field("BIOS"....) definition in the DSDT.
- */
-struct acpi_info {
- uint8_t com1_present:1; /* 0[0] - System has COM1? */
- uint8_t com2_present:1; /* 0[1] - System has COM2? */
- uint8_t lpt1_present:1; /* 0[2] - System has LPT1? */
- uint8_t hpet_present:1; /* 0[3] - System has HPET? */
- uint32_t pci_min, pci_len; /* 4, 8 - PCI I/O hole boundaries */
- uint32_t madt_csum_addr; /* 12 - Address of MADT checksum */
- uint32_t madt_lapic0_addr; /* 16 - Address of first MADT LAPIC struct */
- uint32_t vm_gid_addr; /* 20 - Address of VM generation id buffer */
- uint64_t pci_hi_min, pci_hi_len; /* 24, 32 - PCI I/O hole boundaries */
-};
-
/* Number of processor objects in the chosen DSDT. */
static unsigned int nr_processor_objects;
@@ -360,7 +343,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
}
/* HPET. */
- if ( hpet_exists(ACPI_HPET_ADDRESS) )
+ if ( info->hpet_present )
{
hpet = construct_hpet();
if (!hpet) return -1;
@@ -497,7 +480,6 @@ static int new_vm_gid(struct acpi_info *acpi_info)
void acpi_build_tables(struct acpi_config *config, unsigned int physical)
{
- struct acpi_info *acpi_info;
struct acpi_20_rsdp *rsdp;
struct acpi_20_rsdt *rsdt;
struct acpi_20_xsdt *xsdt;
@@ -508,11 +490,6 @@ void acpi_build_tables(struct acpi_config *config, unsigned int physical)
unsigned long secondary_tables[ACPI_MAX_SECONDARY_TABLES];
int nr_secondaries, i;
- /* Allocate and initialise the acpi info area. */
- mem_hole_populate_ram(ACPI_INFO_PHYSICAL_ADDRESS >> PAGE_SHIFT, 1);
- acpi_info = (struct acpi_info *)ACPI_INFO_PHYSICAL_ADDRESS;
- memset(acpi_info, 0, sizeof(*acpi_info));
-
/*
* Fill in high-memory data structures, starting at @buf.
*/
@@ -574,7 +551,8 @@ void acpi_build_tables(struct acpi_config *config, unsigned int physical)
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_20_fadt));
- nr_secondaries = construct_secondary_tables(secondary_tables, acpi_info);
+ nr_secondaries = construct_secondary_tables(secondary_tables,
+ &config->acpi_info);
if ( nr_secondaries < 0 )
goto oom;
@@ -619,20 +597,12 @@ void acpi_build_tables(struct acpi_config *config, unsigned int physical)
offsetof(struct acpi_20_rsdp, extended_checksum),
sizeof(struct acpi_20_rsdp));
- if ( !new_vm_gid(acpi_info) )
+ if ( !new_vm_gid(&config->acpi_info) )
goto oom;
- acpi_info->com1_present = uart_exists(0x3f8);
- acpi_info->com2_present = uart_exists(0x2f8);
- acpi_info->lpt1_present = lpt_exists(0x378);
- acpi_info->hpet_present = hpet_exists(ACPI_HPET_ADDRESS);
- acpi_info->pci_min = pci_mem_start;
- acpi_info->pci_len = pci_mem_end - pci_mem_start;
- if ( pci_hi_mem_end > pci_hi_mem_start )
- {
- acpi_info->pci_hi_min = pci_hi_mem_start;
- acpi_info->pci_hi_len = pci_hi_mem_end - pci_hi_mem_start;
- }
+ memcpy((struct acpi_info *)ACPI_INFO_PHYSICAL_ADDRESS,
+ &config->acpi_info,
+ sizeof(config->acpi_info));
return;
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 9af29b1..7ce5f5d 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -860,6 +860,21 @@ int hpet_exists(unsigned long hpet_base)
void hvmloader_acpi_build_tables(struct acpi_config *config,
unsigned int physical)
{
+ /* Allocate and initialise the acpi info area. */
+ mem_hole_populate_ram(ACPI_INFO_PHYSICAL_ADDRESS >> PAGE_SHIFT, 1);
+
+ config->acpi_info.com1_present = uart_exists(0x3f8);
+ config->acpi_info.com2_present = uart_exists(0x2f8);
+ config->acpi_info.lpt1_present = lpt_exists(0x378);
+ config->acpi_info.hpet_present = hpet_exists(ACPI_HPET_ADDRESS);
+ config->acpi_info.pci_min = pci_mem_start;
+ config->acpi_info.pci_len = pci_mem_end - pci_mem_start;
+ if ( pci_hi_mem_end > pci_hi_mem_start )
+ {
+ config->acpi_info.pci_hi_min = pci_hi_mem_start;
+ config->acpi_info.pci_hi_len = pci_hi_mem_end - pci_hi_mem_start;
+ }
+
acpi_build_tables(config, physical);
}
--
2.4.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-04-06 1:25 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 1:25 [PATCH RFC 00/20] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 01/20] hvmloader: Provide hvmloader_acpi_build_tables() Boris Ostrovsky
2016-06-02 12:42 ` Jan Beulich
2016-06-02 16:39 ` Boris Ostrovsky
2016-04-06 1:25 ` Boris Ostrovsky [this message]
2016-06-02 12:54 ` [PATCH RFC 02/20] acpi/hvmloader: Move acpi_info initialization out of ACPI code Jan Beulich
2016-06-02 16:54 ` Boris Ostrovsky
2016-06-03 12:13 ` Jan Beulich
2016-06-03 14:42 ` Boris Ostrovsky
2016-06-03 14:55 ` Jan Beulich
2016-06-03 15:29 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 03/20] acpi/hvmloader: Initialize vm_gid data outside " Boris Ostrovsky
2016-06-02 13:03 ` Jan Beulich
2016-06-02 17:01 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 04/20] acpi/hvmloader: Decide which SSDTs to build in hvmloader Boris Ostrovsky
2016-06-02 13:07 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 05/20] acpi/hvmloader: Move passthrough initialization from ACPI code Boris Ostrovsky
2016-06-02 13:52 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 06/20] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
2016-06-02 14:05 ` Jan Beulich
2016-06-02 17:18 ` Boris Ostrovsky
2016-06-03 12:16 ` Jan Beulich
2016-06-03 14:49 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 07/20] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
2016-06-02 14:09 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 08/20] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 09/20] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
2016-06-02 14:32 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 10/20] acpi/hvmloader: Provide address of acpi_info as an argument to ACPI code Boris Ostrovsky
2016-06-03 16:03 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 11/20] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
2016-06-06 10:48 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 12/20] acpi/hvmloader: Link ACPI object files directly Boris Ostrovsky
2016-06-06 11:04 ` Jan Beulich
2016-06-06 14:20 ` Boris Ostrovsky
2016-06-06 14:29 ` Jan Beulich
2016-06-06 14:49 ` Boris Ostrovsky
2016-06-06 14:57 ` Jan Beulich
2016-06-06 15:31 ` Andrew Cooper
2016-06-06 15:41 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 13/20] acpi/hvmloader: Add stdio.h, string.h and x86.h Boris Ostrovsky
2016-06-06 11:31 ` Jan Beulich
2016-06-06 15:08 ` Boris Ostrovsky
2016-06-06 15:22 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 14/20] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
2016-06-06 12:58 ` Jan Beulich
2016-06-06 15:46 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 15/20] acpi: Move ACPI code to xen/common/libacpi Boris Ostrovsky
2016-06-06 13:05 ` Jan Beulich
2016-06-06 16:09 ` Boris Ostrovsky
2016-06-07 6:20 ` Jan Beulich
2016-06-07 12:24 ` Roger Pau Monné
2016-06-07 14:32 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 16/20] x86/vlapic: Don't try to accept 8259 interrupt if !has_vpic() Boris Ostrovsky
2016-06-03 16:14 ` Jan Beulich
2016-06-03 17:50 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 17/20] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
2016-06-03 16:18 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 18/20] libxc/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-06-02 16:26 ` Roger Pau Monné
2016-06-06 12:03 ` Wei Liu
2016-06-06 15:15 ` Boris Ostrovsky
2016-06-16 8:54 ` Wei Liu
2016-06-16 13:07 ` Boris Ostrovsky
2016-06-06 13:29 ` Jan Beulich
2016-06-06 16:59 ` Boris Ostrovsky
2016-06-07 6:17 ` Jan Beulich
2016-06-07 13:59 ` Boris Ostrovsky
2016-06-07 14:10 ` Jan Beulich
2016-06-07 14:47 ` Boris Ostrovsky
2016-06-07 15:00 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 19/20] acpi: Set HW_REDUCED_ACPI in FADT if IOAPIC is not supported Boris Ostrovsky
2016-06-06 13:38 ` Jan Beulich
2016-06-06 17:31 ` Boris Ostrovsky
2016-06-07 6:06 ` Jan Beulich
2016-06-07 14:02 ` Boris Ostrovsky
2016-06-07 14:12 ` Jan Beulich
2016-06-07 15:17 ` Boris Ostrovsky
2016-06-07 15:41 ` Jan Beulich
2016-06-08 22:04 ` Boris Ostrovsky
2016-06-09 8:13 ` Roger Pau Monné
2016-06-09 8:41 ` Jan Beulich
2016-06-09 14:09 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 20/20] acpi: Make ACPI builder available to hypervisor code Boris Ostrovsky
2016-06-06 13:48 ` Jan Beulich
2016-05-09 20:10 ` [PATCH RFC 00/20] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-05-10 7:25 ` Jan Beulich
2016-06-02 12:40 ` Jan Beulich
2016-06-02 16:37 ` Boris Ostrovsky
2016-06-03 7:18 ` Roger Pau Monné
2016-06-03 10:08 ` 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=1459905949-10358-3-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=keir@xen.org \
--cc=roger.pau@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/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).