[S] Change in coreboot[master]: soc/intel/common: Use ACPI_COMMON_MADT_IOAPIC

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74358 )

Change subject: soc/intel/common: Use ACPI_COMMON_MADT_IOAPIC
......................................................................

soc/intel/common: Use ACPI_COMMON_MADT_IOAPIC

For the first IOAPIC, use the common MADT generator with
default IRQ overrides.

Change-Id: Ie6e3eae1728a9a94205ec59557d4af1655191166
Signed-off-by: Kyösti Mälkki 
---
M src/soc/intel/common/block/acpi/Kconfig
M src/soc/intel/common/block/acpi/acpi.c
2 files changed, 20 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/74358/1

diff --git a/src/soc/intel/common/block/acpi/Kconfig b/src/soc/intel/common/block/acpi/Kconfig
index 8f4e308..c750e7e 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 f692b41..81d1371 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -80,12 +80,12 @@

/* 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;
 }