soc/amd: use common ACPI_SCI_IRQ definition
ACPI_SCI_IRQ is defined as 9 for all AMD SoCs, so move the definition to
the common amdblocks/acpi.h. Since all but Stoneyridge's soc/acpi.h are
now empty, delete those files too.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I8210c98dc4cf2c6001d5273d132053278ff7fea5
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80222
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/amd/bilby/mainboard.c b/src/mainboard/amd/bilby/mainboard.c
index 5e20946..ed4e706 100644
--- a/src/mainboard/amd/bilby/mainboard.c
+++ b/src/mainboard/amd/bilby/mainboard.c
@@ -2,10 +2,10 @@
#include <console/console.h>
#include <device/device.h>
+#include <amdblocks/acpi.h>
#include <amdblocks/amd_pci_util.h>
#include <FspsUpd.h>
#include <gpio.h>
-#include <soc/acpi.h>
#include <soc/cpu.h>
#include <soc/southbridge.h>
#include <soc/pci_devs.h>
diff --git a/src/mainboard/amd/birman/mainboard.c b/src/mainboard/amd/birman/mainboard.c
index e97bb31..0deba67 100644
--- a/src/mainboard/amd/birman/mainboard.c
+++ b/src/mainboard/amd/birman/mainboard.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h>
#include <amdblocks/amd_pci_util.h>
#include <commonlib/helpers.h>
#include <device/device.h>
-#include <soc/acpi.h>
#include <types.h>
#include "gpio.h"
diff --git a/src/mainboard/amd/chausie/mainboard.c b/src/mainboard/amd/chausie/mainboard.c
index 41e314a..c3eb70a 100644
--- a/src/mainboard/amd/chausie/mainboard.c
+++ b/src/mainboard/amd/chausie/mainboard.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h>
#include <amdblocks/amd_pci_util.h>
#include <commonlib/helpers.h>
#include <device/device.h>
-#include <soc/acpi.h>
#include <types.h>
#include "gpio.h"
diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c
index d89449f..8353d820 100644
--- a/src/mainboard/amd/gardenia/mainboard.c
+++ b/src/mainboard/amd/gardenia/mainboard.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h>
#include <device/device.h>
#include <amdblocks/agesawrapper.h>
#include <amdblocks/amd_pci_util.h>
diff --git a/src/mainboard/amd/majolica/mainboard.c b/src/mainboard/amd/majolica/mainboard.c
index 9dbd4e4..5f5a90c 100644
--- a/src/mainboard/amd/majolica/mainboard.c
+++ b/src/mainboard/amd/majolica/mainboard.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h>
#include <amdblocks/amd_pci_util.h>
#include <commonlib/helpers.h>
#include <device/device.h>
-#include <soc/acpi.h>
#include <types.h>
/* The IRQ mapping in fch_irq_map ends up getting written to the indirect address space that is
diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c
index d3b79e6..7975c10 100644
--- a/src/mainboard/amd/mandolin/mainboard.c
+++ b/src/mainboard/amd/mandolin/mainboard.c
@@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h>
#include <console/console.h>
#include <device/device.h>
#include <amdblocks/amd_pci_util.h>
#include <FspsUpd.h>
-#include <soc/acpi.h>
#include <soc/cpu.h>
#include <soc/southbridge.h>
#include <soc/pci_devs.h>
diff --git a/src/mainboard/amd/mayan/mainboard.c b/src/mainboard/amd/mayan/mainboard.c
index 0785366..427c085 100644
--- a/src/mainboard/amd/mayan/mainboard.c
+++ b/src/mainboard/amd/mayan/mainboard.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h>
#include <amdblocks/amd_pci_util.h>
#include <commonlib/helpers.h>
#include <device/device.h>
-#include <soc/acpi.h>
#include <types.h>
#include "gpio.h"
diff --git a/src/mainboard/amd/onyx_poc/mainboard.c b/src/mainboard/amd/onyx_poc/mainboard.c
index af89e14..bc181ce 100644
--- a/src/mainboard/amd/onyx_poc/mainboard.c
+++ b/src/mainboard/amd/onyx_poc/mainboard.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/acpi.h>
+#include <amdblocks/acpi.h>
#include <soc/amd_pci_int_defs.h>
#include <amdblocks/amd_pci_util.h>
#include <types.h>
diff --git a/src/mainboard/amd/pademelon/mainboard.c b/src/mainboard/amd/pademelon/mainboard.c
index 8be12f1..f4d5be9 100644
--- a/src/mainboard/amd/pademelon/mainboard.c
+++ b/src/mainboard/amd/pademelon/mainboard.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h>
#include <device/device.h>
#include <amdblocks/agesawrapper.h>
#include <amdblocks/amd_pci_util.h>
diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c
index af79a5e..18d5e8f 100644
--- a/src/mainboard/google/guybrush/mainboard.c
+++ b/src/mainboard/google/guybrush/mainboard.c
@@ -2,6 +2,7 @@
#include <acpi/acpi.h>
#include <acpi/acpigen.h>
+#include <amdblocks/acpi.h>
#include <amdblocks/acpimmio.h>
#include <amdblocks/amd_pci_util.h>
#include <amdblocks/psp.h>
@@ -12,7 +13,6 @@
#include <device/device.h>
#include <drivers/i2c/tpm/chip.h>
#include <gpio.h>
-#include <soc/acpi.h>
#include <variant/ec.h>
#define BACKLIGHT_GPIO GPIO_129
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c
index 5ddc5ae..5ecc52e 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h>
#include <string.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/google/myst/mainboard.c b/src/mainboard/google/myst/mainboard.c
index 36f5bab..e5d2858 100644
--- a/src/mainboard/google/myst/mainboard.c
+++ b/src/mainboard/google/myst/mainboard.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include <amdblocks/acpi.h>
#include <amdblocks/acpimmio.h>
#include <amdblocks/amd_pci_util.h>
#include <amdblocks/xhci.h>
@@ -8,7 +9,6 @@
#include <cpu/x86/smm.h>
#include <device/device.h>
#include <drivers/i2c/tpm/chip.h>
-#include <soc/acpi.h>
#include <variant/ec.h>
/* The IRQ mapping in fch_irq_map ends up getting written to the indirect address space that is
diff --git a/src/mainboard/google/skyrim/mainboard.c b/src/mainboard/google/skyrim/mainboard.c
index 125bebb..8a395a8 100644
--- a/src/mainboard/google/skyrim/mainboard.c
+++ b/src/mainboard/google/skyrim/mainboard.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include <amdblocks/acpi.h>
#include <amdblocks/acpimmio.h>
#include <amdblocks/amd_pci_util.h>
#include <amdblocks/psp.h>
@@ -9,7 +10,6 @@
#include <cpu/x86/smm.h>
#include <device/device.h>
#include <drivers/i2c/tpm/chip.h>
-#include <soc/acpi.h>
#include <variant/ec.h>
/* The IRQ mapping in fch_irq_map ends up getting written to the indirect address space that is
diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c
index 74ed679..4aa0c58 100644
--- a/src/mainboard/google/zork/mainboard.c
+++ b/src/mainboard/google/zork/mainboard.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include <amdblocks/acpi.h>
#include <console/console.h>
#include <device/device.h>
#include <device/mmio.h>
@@ -11,7 +12,6 @@
#include <boardid.h>
#include <gpio.h>
#include <smbios.h>
-#include <soc/acpi.h>
#include <soc/cpu.h>
#include <soc/pci_devs.h>
#include <soc/platform_descriptors.h>
diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c
index ea895c9..7a5fdf0 100644
--- a/src/soc/amd/cezanne/acpi.c
+++ b/src/soc/amd/cezanne/acpi.c
@@ -13,7 +13,6 @@
#include <arch/smp/mpspec.h>
#include <console/console.h>
#include <cpu/amd/cpuid.h>
-#include <soc/acpi.h>
#include <soc/iomap.h>
#include <types.h>
#include "chip.h"
diff --git a/src/soc/amd/cezanne/agesa_acpi.c b/src/soc/amd/cezanne/agesa_acpi.c
index e22cc08..96ff0f0 100644
--- a/src/soc/amd/cezanne/agesa_acpi.c
+++ b/src/soc/amd/cezanne/agesa_acpi.c
@@ -4,7 +4,6 @@
#include <amdblocks/acpi.h>
#include <device/device.h>
#include <FspGuids.h>
-#include <soc/acpi.h>
#include <types.h>
unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
diff --git a/src/soc/amd/cezanne/include/soc/acpi.h b/src/soc/amd/cezanne/include/soc/acpi.h
deleted file mode 100644
index c709b78..0000000
--- a/src/soc/amd/cezanne/include/soc/acpi.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef AMD_CEZANNE_ACPI_H
-#define AMD_CEZANNE_ACPI_H
-
-#define ACPI_SCI_IRQ 9
-
-#endif /* AMD_CEZANNE_ACPI_H */
diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c
index 547163c..9d0ece1 100644
--- a/src/soc/amd/common/block/acpi/ivrs.c
+++ b/src/soc/amd/common/block/acpi/ivrs.c
@@ -12,7 +12,6 @@
#include <device/mmio.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
-#include <soc/acpi.h>
#include <soc/data_fabric.h>
#include <soc/iomap.h>
#include <soc/pci_devs.h>
diff --git a/src/soc/amd/common/block/acpi/pm_state.c b/src/soc/amd/common/block/acpi/pm_state.c
index ccfef0a..23a7d45 100644
--- a/src/soc/amd/common/block/acpi/pm_state.c
+++ b/src/soc/amd/common/block/acpi/pm_state.c
@@ -4,7 +4,6 @@
#include <acpi/acpi_pm.h>
#include <amdblocks/acpi.h>
#include <bootstate.h>
-#include <soc/acpi.h>
#include <soc/nvs.h>
#include <soc/southbridge.h>
#include <types.h>
diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h
index 2a29f37..8642d0f 100644
--- a/src/soc/amd/common/block/include/amdblocks/acpi.h
+++ b/src/soc/amd/common/block/include/amdblocks/acpi.h
@@ -8,6 +8,8 @@
#include <device/device.h>
#include <types.h>
+#define ACPI_SCI_IRQ 9
+
/* ACPI MMIO registers 0xfed80800 */
#define MMIO_ACPI_PM1_EVT_BLK 0x00
#define MMIO_ACPI_PM1_STS 0x00
diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index 96b9a2c..4e81316 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -17,7 +17,6 @@
#include <amdblocks/ioapic.h>
#include <amdblocks/iomap.h>
#include <amdblocks/lpc.h>
-#include <soc/acpi.h>
#include <soc/iomap.h>
#include <soc/lpc.h>
#include <soc/southbridge.h>
diff --git a/src/soc/amd/genoa_poc/acpi.c b/src/soc/amd/genoa_poc/acpi.c
index cadf8db..8f842f9 100644
--- a/src/soc/amd/genoa_poc/acpi.c
+++ b/src/soc/amd/genoa_poc/acpi.c
@@ -9,7 +9,6 @@
#include <arch/ioapic.h>
#include <console/console.h>
#include <device/device.h>
-#include <soc/acpi.h>
#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
void acpi_fill_fadt(acpi_fadt_t *fadt)
diff --git a/src/soc/amd/genoa_poc/fch.c b/src/soc/amd/genoa_poc/fch.c
index f340d82..3af741c 100644
--- a/src/soc/amd/genoa_poc/fch.c
+++ b/src/soc/amd/genoa_poc/fch.c
@@ -7,7 +7,6 @@
#include <amdblocks/smi.h>
#include <bootstate.h>
#include <cpu/x86/smm.h>
-#include <soc/acpi.h>
#include <soc/amd_pci_int_defs.h>
#include <soc/smi.h>
#include <soc/southbridge.h>
diff --git a/src/soc/amd/genoa_poc/include/soc/acpi.h b/src/soc/amd/genoa_poc/include/soc/acpi.h
deleted file mode 100644
index a2a9f39..0000000
--- a/src/soc/amd/genoa_poc/include/soc/acpi.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef AMD_GENOA_POC_ACPI_H
-#define AMD_GENOA_POC_ACPI_H
-
-#define ACPI_SCI_IRQ 9
-
-#endif /* AMD_GENOA_POC_ACPI_H */
diff --git a/src/soc/amd/glinda/acpi.c b/src/soc/amd/glinda/acpi.c
index a927f8b..8cca10d 100644
--- a/src/soc/amd/glinda/acpi.c
+++ b/src/soc/amd/glinda/acpi.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <console/console.h>
#include <cpu/amd/cpuid.h>
-#include <soc/acpi.h>
#include <soc/iomap.h>
#include <types.h>
#include "chip.h"
diff --git a/src/soc/amd/glinda/agesa_acpi.c b/src/soc/amd/glinda/agesa_acpi.c
index e04f7cb..68273d1 100644
--- a/src/soc/amd/glinda/agesa_acpi.c
+++ b/src/soc/amd/glinda/agesa_acpi.c
@@ -6,7 +6,6 @@
#include <amdblocks/acpi.h>
#include <device/device.h>
#include <FspGuids.h>
-#include <soc/acpi.h>
#include <types.h>
unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
diff --git a/src/soc/amd/glinda/include/soc/acpi.h b/src/soc/amd/glinda/include/soc/acpi.h
deleted file mode 100644
index 891b658..0000000
--- a/src/soc/amd/glinda/include/soc/acpi.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-/* TODO: Move to common */
-
-#ifndef AMD_GLINDA_ACPI_H
-#define AMD_GLINDA_ACPI_H
-
-#define ACPI_SCI_IRQ 9
-
-#endif /* AMD_GLINDA_ACPI_H */
diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c
index 80d407c..11261db 100644
--- a/src/soc/amd/mendocino/acpi.c
+++ b/src/soc/amd/mendocino/acpi.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <console/console.h>
#include <cpu/amd/cpuid.h>
-#include <soc/acpi.h>
#include <soc/iomap.h>
#include <types.h>
#include "chip.h"
diff --git a/src/soc/amd/mendocino/agesa_acpi.c b/src/soc/amd/mendocino/agesa_acpi.c
index 8866fc4..7ff8403 100644
--- a/src/soc/amd/mendocino/agesa_acpi.c
+++ b/src/soc/amd/mendocino/agesa_acpi.c
@@ -6,7 +6,6 @@
#include <amdblocks/acpi.h>
#include <device/device.h>
#include <FspGuids.h>
-#include <soc/acpi.h>
#include <types.h>
unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
diff --git a/src/soc/amd/mendocino/include/soc/acpi.h b/src/soc/amd/mendocino/include/soc/acpi.h
deleted file mode 100644
index 25f9234..0000000
--- a/src/soc/amd/mendocino/include/soc/acpi.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef AMD_MENDOCINO_ACPI_H
-#define AMD_MENDOCINO_ACPI_H
-
-#define ACPI_SCI_IRQ 9
-
-#endif /* AMD_MENDOCINO_ACPI_H */
diff --git a/src/soc/amd/phoenix/acpi.c b/src/soc/amd/phoenix/acpi.c
index ce727a8..76de7a0 100644
--- a/src/soc/amd/phoenix/acpi.c
+++ b/src/soc/amd/phoenix/acpi.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <console/console.h>
#include <cpu/amd/cpuid.h>
-#include <soc/acpi.h>
#include <soc/iomap.h>
#include <types.h>
#include "chip.h"
diff --git a/src/soc/amd/phoenix/agesa_acpi.c b/src/soc/amd/phoenix/agesa_acpi.c
index e4fa2bf..4ebe814 100644
--- a/src/soc/amd/phoenix/agesa_acpi.c
+++ b/src/soc/amd/phoenix/agesa_acpi.c
@@ -7,7 +7,6 @@
#include <commonlib/bsd/helpers.h>
#include <device/device.h>
#include <FspGuids.h>
-#include <soc/acpi.h>
#include <types.h>
unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
diff --git a/src/soc/amd/phoenix/include/soc/acpi.h b/src/soc/amd/phoenix/include/soc/acpi.h
deleted file mode 100644
index 3fea5cc..0000000
--- a/src/soc/amd/phoenix/include/soc/acpi.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-/* TODO: Move to common */
-
-#ifndef AMD_PHOENIX_ACPI_H
-#define AMD_PHOENIX_ACPI_H
-
-#define ACPI_SCI_IRQ 9
-
-#endif /* AMD_PHOENIX_ACPI_H */
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 92f48df..d864053 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -19,7 +19,6 @@
#include <amdblocks/chip.h>
#include <amdblocks/cpu.h>
#include <amdblocks/ioapic.h>
-#include <soc/acpi.h>
#include <soc/pci_devs.h>
#include <soc/southbridge.h>
#include "chip.h"
diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c
index bde9543..5e1f8e8 100644
--- a/src/soc/amd/picasso/agesa_acpi.c
+++ b/src/soc/amd/picasso/agesa_acpi.c
@@ -14,7 +14,6 @@
#include <device/pci_def.h>
#include <device/pci_ops.h>
#include <FspGuids.h>
-#include <soc/acpi.h>
#include <soc/data_fabric.h>
#include <soc/pci_devs.h>
#include <stdint.h>
diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c
index a1eef6f..bfe65a2 100644
--- a/src/soc/amd/picasso/fch.c
+++ b/src/soc/amd/picasso/fch.c
@@ -13,7 +13,6 @@
#include <amdblocks/gpio.h>
#include <amdblocks/i2c.h>
#include <amdblocks/smi.h>
-#include <soc/acpi.h>
#include <soc/cpu.h>
#include <soc/i2c.h>
#include <soc/iomap.h>
diff --git a/src/soc/amd/picasso/include/soc/acpi.h b/src/soc/amd/picasso/include/soc/acpi.h
deleted file mode 100644
index 8dee91d..0000000
--- a/src/soc/amd/picasso/include/soc/acpi.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef AMD_PICASSO_ACPI_H
-#define AMD_PICASSO_ACPI_H
-
-#define ACPI_SCI_IRQ 9
-
-#endif /* AMD_PICASSO_ACPI_H */
diff --git a/src/soc/amd/stoneyridge/include/soc/acpi.h b/src/soc/amd/stoneyridge/include/soc/acpi.h
index 0065d6e..f0c35c0 100644
--- a/src/soc/amd/stoneyridge/include/soc/acpi.h
+++ b/src/soc/amd/stoneyridge/include/soc/acpi.h
@@ -6,8 +6,6 @@
#include <acpi/acpi.h>
#include <amdblocks/acpi.h>
-#define ACPI_SCI_IRQ 9
-
#if CONFIG(STONEYRIDGE_LEGACY_FREE)
#define FADT_BOOT_ARCH ACPI_FADT_LEGACY_FREE
#else