When resetting an I/O APIC, its ID is set to 0, and SeaBIOS doesn't change it, so report it correctly on the ACPI MADT table and MP-table.
Some hardware may require the BIOS to initialize I/O APIC ID to an unique value, but SeaBIOS doesn't do that. This patch at least makes the tables reflect reality.
Changes v2 -> v3: - Fix MP-table too, not just ACPI MADT table
Changes v1 -> v2: - Cosmetic: whitespace change (removed extra newline) - New patch description
Signed-off-by: Eduardo Habkost ehabkost@redhat.com --- src/acpi.c | 2 +- src/config.h | 1 + src/mptable.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/acpi.c b/src/acpi.c index d39cbd9..da3bc57 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -336,7 +336,7 @@ build_madt(void) struct madt_io_apic *io_apic = (void*)apic; io_apic->type = APIC_IO; io_apic->length = sizeof(*io_apic); - io_apic->io_apic_id = CountCPUs; + io_apic->io_apic_id = BUILD_IOAPIC_ID; io_apic->address = cpu_to_le32(BUILD_IOAPIC_ADDR); io_apic->interrupt = cpu_to_le32(0);
diff --git a/src/config.h b/src/config.h index 3a70867..0d4066d 100644 --- a/src/config.h +++ b/src/config.h @@ -52,6 +52,7 @@ #define BUILD_PCIMEM64_END 0x10000000000ULL
#define BUILD_IOAPIC_ADDR 0xfec00000 +#define BUILD_IOAPIC_ID 0 #define BUILD_HPET_ADDRESS 0xfed00000 #define BUILD_APIC_ADDR 0xfee00000
diff --git a/src/mptable.c b/src/mptable.c index 103f462..74ed33d 100644 --- a/src/mptable.c +++ b/src/mptable.c @@ -92,7 +92,7 @@ mptable_init(void) entrycount += bus - buses;
/* ioapic */ - u8 ioapic_id = CountCPUs; + u8 ioapic_id = BUILD_IOAPIC_ID; struct mpt_ioapic *ioapic = (void*)bus; memset(ioapic, 0, sizeof(*ioapic)); ioapic->type = MPT_TYPE_IOAPIC;