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 v3 04/19] acpi/hvmloader: Make providing IOAPIC in MADT optional
Date: Wed, 7 Sep 2016 14:59:14 -0400 [thread overview]
Message-ID: <1473274769-19129-5-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1473274769-19129-1-git-send-email-boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
tools/firmware/hvmloader/acpi/build.c | 70 ++++++++++++++++++---------------
tools/firmware/hvmloader/acpi/libacpi.h | 1 +
tools/firmware/hvmloader/util.c | 2 +-
3 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 80386b9..7e7c11f 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -99,43 +99,49 @@ static struct acpi_20_madt *construct_madt(const struct acpi_config *config,
madt->lapic_addr = LAPIC_BASE_ADDRESS;
madt->flags = ACPI_PCAT_COMPAT;
- intsrcovr = (struct acpi_20_madt_intsrcovr *)(madt + 1);
- for ( i = 0; i < 16; i++ )
- {
- memset(intsrcovr, 0, sizeof(*intsrcovr));
- intsrcovr->type = ACPI_INTERRUPT_SOURCE_OVERRIDE;
- intsrcovr->length = sizeof(*intsrcovr);
- intsrcovr->source = i;
-
- if ( i == 0 )
- {
- /* ISA IRQ0 routed to IOAPIC GSI 2. */
- intsrcovr->gsi = 2;
- intsrcovr->flags = 0x0;
- }
- else if ( PCI_ISA_IRQ_MASK & (1U << i) )
- {
- /* PCI: active-low level-triggered. */
- intsrcovr->gsi = i;
- intsrcovr->flags = 0xf;
- }
- else
+ if ( config->table_flags & ACPI_HAS_IOAPIC )
+ {
+ intsrcovr = (struct acpi_20_madt_intsrcovr *)(madt + 1);
+ for ( i = 0; i < 16; i++ )
{
- /* No need for a INT source override structure. */
- continue;
+ memset(intsrcovr, 0, sizeof(*intsrcovr));
+ intsrcovr->type = ACPI_INTERRUPT_SOURCE_OVERRIDE;
+ intsrcovr->length = sizeof(*intsrcovr);
+ intsrcovr->source = i;
+
+ if ( i == 0 )
+ {
+ /* ISA IRQ0 routed to IOAPIC GSI 2. */
+ intsrcovr->gsi = 2;
+ intsrcovr->flags = 0x0;
+ }
+ else if ( PCI_ISA_IRQ_MASK & (1U << i) )
+ {
+ /* PCI: active-low level-triggered. */
+ intsrcovr->gsi = i;
+ intsrcovr->flags = 0xf;
+ }
+ else
+ {
+ /* No need for a INT source override structure. */
+ continue;
+ }
+
+ intsrcovr++;
}
- intsrcovr++;
- }
+ io_apic = (struct acpi_20_madt_ioapic *)intsrcovr;
+ memset(io_apic, 0, sizeof(*io_apic));
+ io_apic->type = ACPI_IO_APIC;
+ io_apic->length = sizeof(*io_apic);
+ io_apic->ioapic_id = IOAPIC_ID;
+ io_apic->ioapic_addr = ioapic_base_address;
- io_apic = (struct acpi_20_madt_ioapic *)intsrcovr;
- memset(io_apic, 0, sizeof(*io_apic));
- io_apic->type = ACPI_IO_APIC;
- io_apic->length = sizeof(*io_apic);
- io_apic->ioapic_id = IOAPIC_ID;
- io_apic->ioapic_addr = ioapic_base_address;
+ lapic = (struct acpi_20_madt_lapic *)(io_apic + 1);
+ }
+ else
+ lapic = (struct acpi_20_madt_lapic *)(madt + 1);
- lapic = (struct acpi_20_madt_lapic *)(io_apic + 1);
info->nr_cpus = hvminfo->nr_vcpus;
info->madt_lapic0_addr = (uint32_t)lapic;
for ( i = 0; i < hvminfo->nr_vcpus; i++ )
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h
index cc57a9c..b089cc5 100644
--- a/tools/firmware/hvmloader/acpi/libacpi.h
+++ b/tools/firmware/hvmloader/acpi/libacpi.h
@@ -30,6 +30,7 @@
#define ACPI_HAS_SSDT_S3 (1<<5)
#define ACPI_HAS_SSDT_S4 (1<<6)
#define ACPI_HAS_TCPA (1<<7)
+#define ACPI_HAS_IOAPIC (1<<8)
struct acpi_numa {
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 8875675..aa5fc20 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;
+ config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC);
config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS;
--
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-07 18:59 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-07 18:59 [PATCH v3 00/19] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 01/19] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1 Boris Ostrovsky
2016-09-07 19:48 ` Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 02/19] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
2016-09-08 13:41 ` Jan Beulich
2016-09-07 18:59 ` [PATCH v3 03/19] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
2016-09-07 18:59 ` Boris Ostrovsky [this message]
2016-09-07 18:59 ` [PATCH v3 05/19] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 06/19] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
2016-09-08 13:54 ` Jan Beulich
2016-09-07 18:59 ` [PATCH v3 07/19] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 08/19] acpi/hvmloader: Link ACPI object files directly Boris Ostrovsky
2016-09-08 13:56 ` Jan Beulich
2016-09-07 18:59 ` [PATCH v3 09/19] acpi/hvmloader: Include file/paths adjustments Boris Ostrovsky
2016-09-08 14:05 ` Jan Beulich
2016-09-08 18:29 ` Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 10/19] acpi: Move ACPI code to tools/libacpi Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 11/19] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 12/19] libacpi: Build DSDT for PVH guests Boris Ostrovsky
2016-09-08 14:09 ` Jan Beulich
2016-09-14 4:13 ` Shannon Zhao
2016-09-14 12:47 ` Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 13/19] acpi: Makefile should better tolerate interrupts Boris Ostrovsky
2016-09-08 14:15 ` Jan Beulich
2016-09-08 18:51 ` Boris Ostrovsky
2016-09-09 8:03 ` Jan Beulich
2016-09-09 13:07 ` Boris Ostrovsky
2016-09-09 13:29 ` Jan Beulich
2016-09-09 13:56 ` Boris Ostrovsky
2016-09-09 14:13 ` Ian Jackson
2016-09-09 14:31 ` Boris Ostrovsky
2016-09-09 14:33 ` Ian Jackson
2016-09-09 14:38 ` Boris Ostrovsky
2016-09-09 15:20 ` Jan Beulich
2016-09-09 16:05 ` Boris Ostrovsky
2016-09-09 16:11 ` Jan Beulich
2016-09-07 18:59 ` [PATCH v3 14/19] libxc/libxl: Allow multiple ACPI modules Boris Ostrovsky
2016-09-15 10:13 ` Wei Liu
2016-09-07 18:59 ` [PATCH v3 15/19] libxl/acpi: Add ACPI e820 entry Boris Ostrovsky
2016-09-15 10:13 ` Wei Liu
2016-09-07 18:59 ` [PATCH v3 16/19] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests Boris Ostrovsky
2016-09-15 10:13 ` Wei Liu
2016-09-07 18:59 ` [PATCH v3 17/19] ilibxl: Initialize domain build info before calling libxl__domain_make Boris Ostrovsky
2016-09-15 10:13 ` Wei Liu
2016-09-07 18:59 ` [PATCH v3 18/19] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-09-08 14:20 ` Jan Beulich
2016-09-08 18:53 ` Boris Ostrovsky
2016-09-09 8:05 ` Jan Beulich
2016-09-09 13:11 ` Boris Ostrovsky
2016-09-09 13:50 ` Ian Jackson
2016-09-09 14:02 ` Boris Ostrovsky
2016-09-07 18:59 ` [PATCH v3 19/19] libxc/xc_dom_core: Copy ACPI tables to guest space Boris Ostrovsky
2016-09-15 10:13 ` Wei Liu
2016-09-14 15:21 ` [PATCH v3 00/19] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-09-15 10:18 ` Wei Liu
2016-09-15 10:20 ` Julien Grall
2016-09-15 10:22 ` Wei Liu
2016-09-15 12:39 ` Boris Ostrovsky
2016-09-15 13:48 ` Julien Grall
2016-09-15 14:07 ` Boris Ostrovsky
2016-09-15 14:21 ` Jan Beulich
2016-09-15 15:28 ` Boris Ostrovsky
2016-09-15 16:05 ` Jan Beulich
2016-09-15 16:40 ` Boris Ostrovsky
2016-09-16 6:45 ` Jan Beulich
2016-09-16 12:41 ` Boris Ostrovsky
2016-09-16 15:22 ` Lars Kurth
2016-09-16 15:53 ` Boris Ostrovsky
2016-09-19 15:30 ` Ian Jackson
2016-09-19 15:42 ` Boris Ostrovsky
2016-09-19 15:49 ` Ian Jackson
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=1473274769-19129-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).