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/soc/amd | |
| parent | d9e826322031f5936231be44e3b2c406be40a304 (diff) | |
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/soc/amd')
24 files changed, 2 insertions, 70 deletions
diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c index ea895c905f..7a5fdf0ed5 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 e22cc08877..96ff0f00fe 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 c709b7837f..0000000000 --- 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 547163c6ff..9d0ece1d6c 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 ccfef0a752..23a7d45d8e 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 2a29f37c4f..8642d0f4f7 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 96b9a2c4e7..4e81316881 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 cadf8db2f0..8f842f92cb 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 f340d82c39..3af741c0b3 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 a2a9f39732..0000000000 --- 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 a927f8b68d..8cca10d419 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 e04f7cb300..68273d17cd 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 891b6589a4..0000000000 --- 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 80d407cce2..11261db91a 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 8866fc486f..7ff8403a9d 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 25f9234938..0000000000 --- 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 ce727a8904..76de7a0fb1 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 e4fa2bfb26..4ebe814ab5 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 3fea5cc800..0000000000 --- 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 92f48df32e..d864053f19 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 bde9543e29..5e1f8e8667 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 a1eef6f534..bfe65a2b9e 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 8dee91ded3..0000000000 --- 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 0065d6ed5d..f0c35c070c 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 |