From 7186e28001ff01e9f48f838eab8ee462c3e8155c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 8 Apr 2023 00:46:30 +0300 Subject: [PATCH] soc/amd: Drop acpi_fill_madt_irqoverride() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is unused. The use of field irq is problematic as it should appear relative to IOAPIC GSI bases in the devicetree. Change-Id: I460fd5fde3a7fba5518ccfc153a266d097a95a39 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/74357 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/soc/amd/cezanne/acpi.c | 2 -- src/soc/amd/common/block/acpi/tables.c | 21 ------------------- .../amd/common/block/include/amdblocks/acpi.h | 1 - .../amd/common/block/include/amdblocks/chip.h | 11 ---------- src/soc/amd/glinda/acpi.c | 2 -- src/soc/amd/mendocino/acpi.c | 2 -- src/soc/amd/phoenix/acpi.c | 2 -- src/soc/amd/picasso/acpi.c | 2 -- 8 files changed, 43 deletions(-) diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c index 732e7367a4..3482bbb620 100644 --- a/src/soc/amd/cezanne/acpi.c +++ b/src/soc/amd/cezanne/acpi.c @@ -25,8 +25,6 @@ unsigned long acpi_fill_madt(unsigned long current) current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/common/block/acpi/tables.c b/src/soc/amd/common/block/acpi/tables.c index 3ba9af6499..aaa851e0ac 100644 --- a/src/soc/amd/common/block/acpi/tables.c +++ b/src/soc/amd/common/block/acpi/tables.c @@ -16,27 +16,6 @@ unsigned long southbridge_write_acpi_tables(const struct device *device, return acpi_write_hpet(device, current, rsdp); } -unsigned long acpi_fill_madt_irqoverride(unsigned long current) -{ - const struct soc_amd_common_config *cfg = soc_get_common_config(); - unsigned int i; - uint8_t irq; - uint8_t flags; - - for (i = 0; i < ARRAY_SIZE(cfg->irq_override); ++i) { - irq = cfg->irq_override[i].irq; - flags = cfg->irq_override[i].flags; - - if (!flags) - continue; - - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, 0, - irq, irq, flags); - } - - return current; -} - /* Used by \_SB.PCI0._CRS */ void acpi_fill_root_complex_tom(const struct device *device) { diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index 9ffcb7e746..91051841f5 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -54,7 +54,6 @@ struct chipset_power_state { unsigned long southbridge_write_acpi_tables(const struct device *device, unsigned long current, struct acpi_rsdp *rsdp); -unsigned long acpi_fill_madt_irqoverride(unsigned long current); void acpi_fill_root_complex_tom(const struct device *device); uintptr_t add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp, diff --git a/src/soc/amd/common/block/include/amdblocks/chip.h b/src/soc/amd/common/block/include/amdblocks/chip.h index 46662fc596..41359239ca 100644 --- a/src/soc/amd/common/block/include/amdblocks/chip.h +++ b/src/soc/amd/common/block/include/amdblocks/chip.h @@ -27,17 +27,6 @@ struct soc_amd_common_config { uint16_t fadt_boot_arch; uint32_t fadt_flags; - /** - * IRQ 0 - 15 have a default trigger of edge and default polarity of high. - * If you have a device that requires a different configuration you can override the - * settings here. - */ - struct { - uint8_t irq; - /* See MP_IRQ_* from acpi.h */ - uint8_t flags; - } irq_override[16]; - /* Audio Co-processor (ACP) configuration */ struct acp_config acp_config; }; diff --git a/src/soc/amd/glinda/acpi.c b/src/soc/amd/glinda/acpi.c index f5185d40aa..d961fcfc65 100644 --- a/src/soc/amd/glinda/acpi.c +++ b/src/soc/amd/glinda/acpi.c @@ -27,8 +27,6 @@ unsigned long acpi_fill_madt(unsigned long current) current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c index a8b04bf40b..fddc892605 100644 --- a/src/soc/amd/mendocino/acpi.c +++ b/src/soc/amd/mendocino/acpi.c @@ -26,8 +26,6 @@ unsigned long acpi_fill_madt(unsigned long current) current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/phoenix/acpi.c b/src/soc/amd/phoenix/acpi.c index e0115719a0..d067deb4a1 100644 --- a/src/soc/amd/phoenix/acpi.c +++ b/src/soc/amd/phoenix/acpi.c @@ -27,8 +27,6 @@ unsigned long acpi_fill_madt(unsigned long current) current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 9e74c6e6b8..a5df99d6cd 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -30,8 +30,6 @@ unsigned long acpi_fill_madt(unsigned long current) current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - current = acpi_fill_madt_irqoverride(current); - return current; }