diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2024-01-26 14:41:14 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2024-01-27 16:39:21 +0000 |
| commit | 0079200e8d45db31fcd0a2501f281809523329ca (patch) | |
| tree | 8fa84b0ebad6e4e979ae7be4a1ea0f034474f483 /src | |
| parent | d9e826322031f5936231be44e3b2c406be40a304 (diff) | |
| download | coreboot-0079200e8d45db31fcd0a2501f281809523329ca.tar.gz coreboot-0079200e8d45db31fcd0a2501f281809523329ca.tar.bz2 coreboot-0079200e8d45db31fcd0a2501f281809523329ca.zip | |
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>
Diffstat (limited to 'src')
38 files changed, 16 insertions, 81 deletions
diff --git a/src/mainboard/amd/bilby/mainboard.c b/src/mainboard/amd/bilby/mainboard.c index 5e209462ae3e..ed4e706d45c9 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 e97bb31c6d40..0deba6710f44 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 41e314aadc24..c3eb70a806ab 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 d89449f6fa64..8353d82099e1 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 9dbd4e42eee1..5f5a90c1934f 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 d3b79e613421..7975c10c8c73 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 07853668f95b..427c0855c10c 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 af89e140b140..bc181ce39570 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 8be12f183cbe..f4d5be964d61 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 af79a5e7953d..18d5e8f38500 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 5ddc5ae7dd25..5ecc52eaa0f7 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 36f5bab6aba8..e5d285855ec6 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 125bebbd82f9..8a395a8d6713 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 74ed679d9b6a..4aa0c580a5da 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 ea895c905f68..7a5fdf0ed5cd 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 e22cc08877ef..96ff0f00fe27 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 c709b7837f8c..000000000000 --- 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 547163c6ff51..9d0ece1d6ca9 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 ccfef0a7522d..23a7d45d8ee5 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 2a29f37c4f1b..8642d0f4f7fa 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 96b9a2c4e7b7..4e8131688123 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 cadf8db2f0d6..8f842f92cbf4 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 f340d82c39ca..3af741c0b3a9 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 a2a9f3973285..000000000000 --- 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 a927f8b68d17..8cca10d41957 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 e04f7cb30066..68273d17cd3f 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 891b6589a4dd..000000000000 --- 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 80d407cce2d9..11261db91a20 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 8866fc486fbb..7ff8403a9d5d 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 25f9234938b2..000000000000 --- 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 ce727a8904a8..76de7a0fb10f 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 e4fa2bfb26a5..4ebe814ab55f 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 3fea5cc8008e..000000000000 --- 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 92f48df32e38..d864053f1901 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 bde9543e29b9..5e1f8e8667cb 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 a1eef6f53409..bfe65a2b9e49 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 8dee91ded307..000000000000 --- 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 0065d6ed5df6..f0c35c070c37 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 |