diff options
| -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]; |