From ac61a65fef73fe0700695afd1fc849ed629d59aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 8 Apr 2023 09:52:10 +0300 Subject: aopen/dxplplusu: Use ACPI_COMMON_MADT_IOAPIC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit IRQ override from IRQ #0 to GSI #2 is changed from MP_BUS_EISA to MP_BUS_ISA. Change-Id: I115df037fd79e120b04e6aff9e53f963f045b997 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/74352 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/mainboard/aopen/dxplplusu/Kconfig | 1 + src/mainboard/aopen/dxplplusu/acpi_tables.c | 9 --------- src/southbridge/intel/i82801dx/Kconfig | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/mainboard/aopen/dxplplusu/Kconfig b/src/mainboard/aopen/dxplplusu/Kconfig index 5c0ca2b570..7d374f4fa7 100644 --- a/src/mainboard/aopen/dxplplusu/Kconfig +++ b/src/mainboard/aopen/dxplplusu/Kconfig @@ -2,6 +2,7 @@ if BOARD_AOPEN_DXPLPLUSU config BOARD_SPECIFIC_OPTIONS def_bool y + select ACPI_CUSTOM_MADT select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7505 select SOUTHBRIDGE_INTEL_I82870 diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c index ba9d3c876b..e22b454ab5 100644 --- a/src/mainboard/aopen/dxplplusu/acpi_tables.c +++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c @@ -8,9 +8,6 @@ unsigned long acpi_fill_madt(unsigned long current) struct device *bdev, *dev = NULL; struct resource *res = NULL; - /* Southbridge IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, 0xfec00000); - bdev = pcidev_on_root(2, 0); /* P64H2 Bus B IOAPIC */ if (bdev) @@ -28,11 +25,5 @@ unsigned long acpi_fill_madt(unsigned long current) current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, res->base); } - /* Map ISA IRQ 0 to IRQ 2 */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, 1, 0, 2, 0); - - /* IRQ9 differs from ISA standard - ours is active high, level-triggered */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, 0, 9, 9, 0xD); - return current; } diff --git a/src/southbridge/intel/i82801dx/Kconfig b/src/southbridge/intel/i82801dx/Kconfig index 2be911d79f..8393f38499 100644 --- a/src/southbridge/intel/i82801dx/Kconfig +++ b/src/southbridge/intel/i82801dx/Kconfig @@ -2,6 +2,7 @@ config SOUTHBRIDGE_INTEL_I82801DX bool + select ACPI_COMMON_MADT_IOAPIC select ACPI_COMMON_MADT_LAPIC select ACPI_INTEL_HARDWARE_SLEEP_VALUES select HAVE_SMI_HANDLER -- cgit v1.2.3