diff options
| -rw-r--r-- | src/soc/intel/common/block/acpi/Kconfig | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/acpi/acpi.c | 10 |
2 files changed, 7 insertions, 5 deletions
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; } |