From 8eac12fa7d49de59f63739bcb466e188dbc1ed66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 12 Apr 2023 14:04:44 +0300 Subject: soc/intel/common: Use ACPI_COMMON_MADT_IOAPIC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the first IOAPIC, use the common MADT generator with default IRQ overrides. Change-Id: Ie6e3eae1728a9a94205ec59557d4af1655191166 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/74358 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/soc/intel/common/block/acpi/Kconfig | 2 ++ src/soc/intel/common/block/acpi/acpi.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/soc/intel/common/block') diff --git a/src/soc/intel/common/block/acpi/Kconfig b/src/soc/intel/common/block/acpi/Kconfig index 8f4e308879..c750e7ebd7 100644 --- a/src/soc/intel/common/block/acpi/Kconfig +++ b/src/soc/intel/common/block/acpi/Kconfig @@ -1,7 +1,9 @@ config SOC_INTEL_COMMON_BLOCK_ACPI depends on SOC_INTEL_COMMON_BLOCK_CPU depends on SOC_INTEL_COMMON_BLOCK_PMC + select ACPI_COMMON_MADT_IOAPIC select ACPI_COMMON_MADT_LAPIC if !SOC_INTEL_COMMON_BLOCK_ACPI_CPU_HYBRID + select ACPI_CUSTOM_MADT bool help Intel Processor common code for ACPI diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index 1b5538ff4e..fda82d4e26 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -80,12 +80,12 @@ unsigned long acpi_fill_madt(unsigned long current) /* IOAPIC */ ioapic_entries = soc_get_ioapic_info(&ioapic_table); - for (int i = 0; i < ioapic_entries; i++) - current += acpi_create_madt_ioapic_from_hw((void *)current, ioapic_table[i]); - /* INT_SRC_OVR */ - current += acpi_create_madt_irqoverride((void *)current, 0, 0, 2, 0); - current += acpi_create_madt_sci_override((void *)current); + /* Default SOC IOAPIC entry */ + ASSERT(ioapic_table[0] == IO_APIC_ADDR); + + for (int i = 1; i < ioapic_entries; i++) + current += acpi_create_madt_ioapic_from_hw((void *)current, ioapic_table[i]); return current; } -- cgit v1.2.3