sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/acpi.h: Convert MADT APIC type names to all caps

Browse Source 
Convert names to all capital in enum acpi_apic_types. Use of these names in
corresponding type assign for I/O APIC Structure.

Change-Id: Iab2f6d8f645677734df753f8bf59fde4205ce714
Signed-off-by: Himanshu Sahdev <himanshusah@hcl.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36197
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Himanshu Sahdev 2019-10-21 18:50:50 +05:30 committed by Patrick Georgi
parent b0f99ad794
commit 8c09b82cb1
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/x86/acpi.c
View File

@ -127,7 +127,7 @@ int acpi_create_mcfg_mmconfig(acpi_mcfg_mmconfig_t *mmconfig, u32 base,
int acpi_create_madt_lapic(acpi_madt_lapic_t *lapic, u8 cpu, u8 apic) int acpi_create_madt_lapic(acpi_madt_lapic_t *lapic, u8 cpu, u8 apic)
{ {
lapic->type = 0; /* Local APIC structure */ lapic->type = LOCAL_APIC; /* Local APIC structure */
lapic->length = sizeof(acpi_madt_lapic_t); lapic->length = sizeof(acpi_madt_lapic_t);
lapic->flags = (1 << 0); /* Processor/LAPIC enabled */ lapic->flags = (1 << 0); /* Processor/LAPIC enabled */
lapic->processor_id = cpu; lapic->processor_id = cpu;
@ -165,7 +165,7 @@ unsigned long acpi_create_madt_lapics(unsigned long current)
int acpi_create_madt_ioapic(acpi_madt_ioapic_t *ioapic, u8 id, u32 addr, int acpi_create_madt_ioapic(acpi_madt_ioapic_t *ioapic, u8 id, u32 addr,
u32 gsi_base) u32 gsi_base)
{ {
ioapic->type = 1; /* I/O APIC structure */ ioapic->type = IO_APIC; /* I/O APIC structure */
ioapic->length = sizeof(acpi_madt_ioapic_t); ioapic->length = sizeof(acpi_madt_ioapic_t);
ioapic->reserved = 0x00; ioapic->reserved = 0x00;
ioapic->gsi_base = gsi_base; ioapic->gsi_base = gsi_base;
@ -178,7 +178,7 @@ int acpi_create_madt_ioapic(acpi_madt_ioapic_t *ioapic, u8 id, u32 addr,
int acpi_create_madt_irqoverride(acpi_madt_irqoverride_t *irqoverride, int acpi_create_madt_irqoverride(acpi_madt_irqoverride_t *irqoverride,
u8 bus, u8 source, u32 gsirq, u16 flags) u8 bus, u8 source, u32 gsirq, u16 flags)
{ {
irqoverride->type = 2; /* Interrupt source override */ irqoverride->type = IRQ_SOURCE_OVERRIDE; /* Interrupt source override */
irqoverride->length = sizeof(acpi_madt_irqoverride_t); irqoverride->length = sizeof(acpi_madt_irqoverride_t);
irqoverride->bus = bus; irqoverride->bus = bus;
irqoverride->source = source; irqoverride->source = source;
@ -191,7 +191,7 @@ int acpi_create_madt_irqoverride(acpi_madt_irqoverride_t *irqoverride,
int acpi_create_madt_lapic_nmi(acpi_madt_lapic_nmi_t *lapic_nmi, u8 cpu, int acpi_create_madt_lapic_nmi(acpi_madt_lapic_nmi_t *lapic_nmi, u8 cpu,
u16 flags, u8 lint) u16 flags, u8 lint)
{ {
lapic_nmi->type = 4; /* Local APIC NMI structure */ lapic_nmi->type = LOCAL_APIC_NMI; /* Local APIC NMI structure */
lapic_nmi->length = sizeof(acpi_madt_lapic_nmi_t); lapic_nmi->length = sizeof(acpi_madt_lapic_nmi_t);
lapic_nmi->flags = flags; lapic_nmi->flags = flags;
lapic_nmi->processor_id = cpu; lapic_nmi->processor_id = cpu;

33
src/arch/x86/include/arch/acpi.h
View File

@ -390,24 +390,23 @@ typedef struct acpi_dmar {
} __packed acpi_dmar_t; } __packed acpi_dmar_t;
/* MADT: APIC Structure Types */ /* MADT: APIC Structure Types */
/* TODO: Convert to ALLCAPS. */
enum acpi_apic_types { enum acpi_apic_types {
LocalApic = 0, /* Processor local APIC */ LOCAL_APIC, /* Processor local APIC */
IOApic = 1, /* I/O APIC */ IO_APIC, /* I/O APIC */
IRQSourceOverride = 2, /* Interrupt source override */ IRQ_SOURCE_OVERRIDE, /* Interrupt source override */
NMIType = 3, /* NMI source */ NMI_TYPE, /* NMI source */
LocalApicNMI = 4, /* Local APIC NMI */ LOCAL_APIC_NMI, /* Local APIC NMI */
LApicAddressOverride = 5, /* Local APIC address override */ LAPIC_ADDRESS_OVERRIDE, /* Local APIC address override */
IOSApic = 6, /* I/O SAPIC */ IO_SAPIC, /* I/O SAPIC */
LocalSApic = 7, /* Local SAPIC */ LOCAL_SAPIC, /* Local SAPIC */
PlatformIRQSources = 8, /* Platform interrupt sources */ PLATFORM_IRQ_SOURCES, /* Platform interrupt sources */
Localx2Apic = 9, /* Processor local x2APIC */ LOCAL_X2APIC, /* Processor local x2APIC */
Localx2ApicNMI = 10, /* Local x2APIC NMI */ LOCAL_X2APIC_NMI, /* Local x2APIC NMI */
GICC = 11, /* GIC CPU Interface */ GICC, /* GIC CPU Interface */
GICD = 12, /* GIC Distributor */ GICD, /* GIC Distributor */
GIC_MSI_FRAME = 13, /* GIC MSI Frame */ GIC_MSI_FRAME, /* GIC MSI Frame */
GICR = 14, /* GIC Redistributor */ GICR, /* GIC Redistributor */
GIC_ITS = 15, /* Interrupt Translation Service */ GIC_ITS, /* Interrupt Translation Service */
/* 0x10-0x7f: Reserved */ /* 0x10-0x7f: Reserved */
/* 0x80-0xff: Reserved for OEM use */ /* 0x80-0xff: Reserved for OEM use */
}; };