diff options
| author | Raul E Rangel <rrangel@chromium.org> | 2022-04-25 14:59:05 -0600 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-05-16 13:08:35 +0000 |
| commit | 169302aa7f52c9d9e842700575741a932a64ac99 (patch) | |
| tree | 482069799866bfc5c87f6082ca2bb72d72dfc35a | |
| parent | bae84984860853f67d36b775c39171845be74b8b (diff) | |
acpi, arch/x86/smp/mpspec,soc/amd/common: Move MP_IRQ_ flags into acpi.h
The MP_IRQ flags can be used in the MP table and the ACPI MADT table.
Move them into acpi.h to avoid pulling in the full mpspec.h which is
only available on x86.
BUG=b:218874489, b:160595155
TEST=Build
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: I4f1091b7629a6446fa399720b0270556a926401a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63845
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/arch/x86/include/arch/smp/mpspec.h | 10 | ||||
| -rw-r--r-- | src/include/acpi/acpi.h | 9 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/chip.h | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/arch/x86/include/arch/smp/mpspec.h b/src/arch/x86/include/arch/smp/mpspec.h index 0528f05300..48e5732a4f 100644 --- a/src/arch/x86/include/arch/smp/mpspec.h +++ b/src/arch/x86/include/arch/smp/mpspec.h @@ -3,6 +3,7 @@ #ifndef __ASM_MPSPEC_H #define __ASM_MPSPEC_H +#include <acpi/acpi.h> #include <device/device.h> #include <cpu/x86/lapic_def.h> @@ -120,15 +121,6 @@ enum mp_irq_source_types { mp_ExtINT = 3 }; -#define MP_IRQ_POLARITY_DEFAULT 0x0 -#define MP_IRQ_POLARITY_HIGH 0x1 -#define MP_IRQ_POLARITY_LOW 0x3 -#define MP_IRQ_POLARITY_MASK 0x3 -#define MP_IRQ_TRIGGER_DEFAULT 0x0 -#define MP_IRQ_TRIGGER_EDGE 0x4 -#define MP_IRQ_TRIGGER_LEVEL 0xc -#define MP_IRQ_TRIGGER_MASK 0xc - struct mpc_config_lintsrc { u8 mpc_type; u8 mpc_irqtype; diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h index ad91fbd25c..286ebface8 100644 --- a/src/include/acpi/acpi.h +++ b/src/include/acpi/acpi.h @@ -636,6 +636,15 @@ typedef struct acpi_madt_ioapic { u32 gsi_base; /* Global system interrupt base */ } __packed acpi_madt_ioapic_t; +#define MP_IRQ_POLARITY_DEFAULT 0x0 +#define MP_IRQ_POLARITY_HIGH 0x1 +#define MP_IRQ_POLARITY_LOW 0x3 +#define MP_IRQ_POLARITY_MASK 0x3 +#define MP_IRQ_TRIGGER_DEFAULT 0x0 +#define MP_IRQ_TRIGGER_EDGE 0x4 +#define MP_IRQ_TRIGGER_LEVEL 0xc +#define MP_IRQ_TRIGGER_MASK 0xc + /* MADT: Interrupt Source Override Structure */ typedef struct acpi_madt_irqoverride { u8 type; /* Type (2) */ diff --git a/src/soc/amd/common/block/include/amdblocks/chip.h b/src/soc/amd/common/block/include/amdblocks/chip.h index 2ae9185dd3..46662fc596 100644 --- a/src/soc/amd/common/block/include/amdblocks/chip.h +++ b/src/soc/amd/common/block/include/amdblocks/chip.h @@ -34,7 +34,7 @@ struct soc_amd_common_config { */ struct { uint8_t irq; - /* See MP_IRQ_* from mpspec.h */ + /* See MP_IRQ_* from acpi.h */ uint8_t flags; } irq_override[16]; |