From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
qemu-arm@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH v3 07/22] acpi: madt: skip pci override on pci-less systems.
Date: Wed, 20 May 2020 15:19:48 +0200 [thread overview]
Message-ID: <20200520132003.9492-8-kraxel@redhat.com> (raw)
In-Reply-To: <20200520132003.9492-1-kraxel@redhat.com>
Needed for microvm.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/i386/acpi-common.h | 3 ++-
hw/i386/acpi-build.c | 2 +-
hw/i386/acpi-common.c | 26 +++++++++++++++-----------
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h
index c30e461f1854..9cac18dddf5b 100644
--- a/hw/i386/acpi-common.h
+++ b/hw/i386/acpi-common.h
@@ -9,6 +9,7 @@
#define ACPI_BUILD_IOAPIC_ID 0x0
void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
- X86MachineState *x86ms, AcpiDeviceIf *adev);
+ X86MachineState *x86ms, AcpiDeviceIf *adev,
+ bool has_pci);
#endif
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c0fdd539a640..583bb58d6f0c 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2414,7 +2414,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
acpi_add_table(table_offsets, tables_blob);
acpi_build_madt(tables_blob, tables->linker, x86ms,
- ACPI_DEVICE_IF(pcms->acpi_dev));
+ ACPI_DEVICE_IF(pcms->acpi_dev), true);
vmgenid_dev = find_vmgenid_dev();
if (vmgenid_dev) {
diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
index 5caca16a0b59..ab9b00581a15 100644
--- a/hw/i386/acpi-common.c
+++ b/hw/i386/acpi-common.c
@@ -72,7 +72,8 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
}
void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
- X86MachineState *x86ms, AcpiDeviceIf *adev)
+ X86MachineState *x86ms, AcpiDeviceIf *adev,
+ bool has_pci)
{
MachineClass *mc = MACHINE_GET_CLASS(x86ms);
const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
@@ -111,18 +112,21 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
intsrcovr->gsi = cpu_to_le32(2);
intsrcovr->flags = cpu_to_le16(0); /* conforms to bus specifications */
}
- for (i = 1; i < 16; i++) {
+
+ if (has_pci) {
+ for (i = 1; i < 16; i++) {
#define ACPI_BUILD_PCI_IRQS ((1<<5) | (1<<9) | (1<<10) | (1<<11))
- if (!(ACPI_BUILD_PCI_IRQS & (1 << i))) {
- /* No need for a INT source override structure. */
- continue;
+ if (!(ACPI_BUILD_PCI_IRQS & (1 << i))) {
+ /* No need for a INT source override structure. */
+ continue;
+ }
+ intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
+ intsrcovr->type = ACPI_APIC_XRUPT_OVERRIDE;
+ intsrcovr->length = sizeof(*intsrcovr);
+ intsrcovr->source = i;
+ intsrcovr->gsi = cpu_to_le32(i);
+ intsrcovr->flags = cpu_to_le16(0xd); /* active high, level triggered */
}
- intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
- intsrcovr->type = ACPI_APIC_XRUPT_OVERRIDE;
- intsrcovr->length = sizeof(*intsrcovr);
- intsrcovr->source = i;
- intsrcovr->gsi = cpu_to_le32(i);
- intsrcovr->flags = cpu_to_le16(0xd); /* active high, level triggered */
}
if (x2apic_mode) {
--
2.18.4
next prev parent reply other threads:[~2020-05-20 13:23 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 13:19 [PATCH v3 00/22] microvm: add acpi support Gerd Hoffmann
2020-05-20 13:19 ` [PATCH v3 01/22] microvm: name qboot binary qboot.bin Gerd Hoffmann
2020-05-20 13:25 ` Philippe Mathieu-Daudé
2020-05-25 11:02 ` Gerd Hoffmann
2020-05-25 12:26 ` Philippe Mathieu-Daudé
2020-05-20 13:19 ` [PATCH v3 02/22] [testing] seabios: update submodule to master snapshot Gerd Hoffmann
2020-05-20 13:19 ` [PATCH v3 03/22] [testing] seabios: update config & build rules Gerd Hoffmann
2020-05-20 13:19 ` [PATCH v3 04/22] [testing] seabios: update binaries to master snapshot Gerd Hoffmann
2020-05-20 13:19 ` [PATCH v3 05/22] acpi: make build_madt() more generic Gerd Hoffmann
2020-05-20 13:19 ` [PATCH v3 06/22] acpi: create acpi-common.c and move madt code Gerd Hoffmann
2020-05-20 13:31 ` Philippe Mathieu-Daudé
2020-05-20 13:19 ` Gerd Hoffmann [this message]
2020-05-20 13:19 ` [PATCH v3 08/22] acpi: fadt: add hw-reduced sleep register support Gerd Hoffmann
2020-05-20 13:19 ` [PATCH v3 09/22] acpi: ged: rename event memory region Gerd Hoffmann
2020-05-20 13:33 ` Philippe Mathieu-Daudé
2020-05-21 7:58 ` Igor Mammedow
2020-05-20 13:19 ` [PATCH v3 10/22] acpi: ged: add control regs Gerd Hoffmann
2020-05-21 8:58 ` Igor Mammedov
2020-05-20 13:19 ` [PATCH v3 11/22] acpi: ged: add x86 device variant Gerd Hoffmann
2020-05-21 9:01 ` Igor Mammedov
2020-05-20 13:19 ` [PATCH v3 12/22] acpi: move acpi_dsdt_add_power_button() to ged Gerd Hoffmann
2020-05-20 13:32 ` Philippe Mathieu-Daudé
2020-05-21 9:03 ` Igor Mammedov
2020-05-20 13:19 ` [PATCH v3 13/22] x86: coldplug cpus Gerd Hoffmann
2020-05-20 14:07 ` Igor Mammedov
2020-05-20 13:19 ` [PATCH v3 14/22] microvm: use 2G split unconditionally Gerd Hoffmann
2020-05-20 13:34 ` Philippe Mathieu-Daudé
2020-05-21 9:14 ` Igor Mammedov
2020-05-21 9:29 ` Igor Mammedov
2020-05-25 11:45 ` Gerd Hoffmann
2020-05-25 16:36 ` Igor Mammedov
2020-05-26 4:48 ` Gerd Hoffmann
2020-05-27 12:25 ` Igor Mammedov
2020-05-27 13:06 ` Paolo Bonzini
2020-05-27 14:26 ` Igor Mammedov
2020-05-27 14:35 ` Igor Mammedov
2020-05-27 14:54 ` Paolo Bonzini
2020-05-28 7:19 ` Gerd Hoffmann
2020-05-28 7:17 ` Gerd Hoffmann
2020-05-20 13:19 ` [PATCH v3 15/22] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-05-20 13:29 ` Philippe Mathieu-Daudé
2020-05-25 11:49 ` Gerd Hoffmann
2020-05-25 12:27 ` Philippe Mathieu-Daudé
2020-05-20 13:19 ` [PATCH v3 16/22] microvm/acpi: add minimal acpi support Gerd Hoffmann
2020-05-21 10:09 ` Igor Mammedov
2020-05-20 13:19 ` [PATCH v3 17/22] microvm/acpi: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-05-21 10:12 ` Igor Mammedov
2020-05-20 13:19 ` [PATCH v3 18/22] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-05-21 10:13 ` Igor Mammedov
2020-05-20 13:20 ` [PATCH v3 19/22] microvm/acpi: use seabios with acpi=on Gerd Hoffmann
2020-05-21 10:14 ` Igor Mammedov
2020-05-20 13:20 ` [PATCH v3 20/22] microvm/acpi: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-05-20 13:20 ` [PATCH v3 21/22] [RfC] acpi: add per machine type acpi default Gerd Hoffmann
2020-05-21 10:26 ` Igor Mammedov
2020-05-20 13:20 ` [PATCH v3 22/22] [RfC] acpi: flip default to off for microvm Gerd Hoffmann
2020-05-21 10:36 ` Igor Mammedov
2020-05-25 12:11 ` Gerd Hoffmann
2020-05-20 15:46 ` [PATCH v3 00/22] microvm: add acpi support no-reply
2020-05-20 15:50 ` no-reply
2020-05-20 15:51 ` no-reply
2020-05-20 15:53 ` no-reply
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=20200520132003.9492-8-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=shannon.zhaosl@gmail.com \
--cc=slp@redhat.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).