[coreboot-gerrit] Change in coreboot[master]: soc/amd/stoneyridge/acpi.c: Use macros

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46266 )

Change subject: soc/amd/stoneyridge/acpi.c: Use macros
......................................................................

soc/amd/stoneyridge/acpi.c: Use macros

Change-Id: I1fa3a22cbf59a13c902beca6f19375c6e6663f4a
Signed-off-by: Elyes HAOUAS 
---
M src/soc/amd/stoneyridge/acpi.c
1 file changed, 14 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/46266/1

diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index e62f235..c1c0b2e 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -11,6 +11,7 @@
 #include <acpi/acpigen.h>
 #include <device/pci_ops.h>
 #include <arch/ioapic.h>
+#include <arch/smp/mpspec.h>
 #include <cpu/x86/smm.h>
 #include <cbmem.h>
 #include <device/device.h>
@@ -35,7 +36,7 @@
    		CONFIG_MAX_CPUS, IO_APIC_ADDR, 0);

current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current,
-			CONFIG_MAX_CPUS+1, IO_APIC2_ADDR, 24);
+			CONFIG_MAX_CPUS+1, IO_APIC2_ADDR, IO_APIC_INTERRUPTS);

/* 0: mean bus 0--->ISA */
    /* 0: PIC 0 */
@@ -43,8 +44,9 @@
    /* 5 mean: 0101 --> Edge-triggered, Active high */
    current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
    					current, 0, 0, 2, 0);
-	current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
-						current, 0, 9, 9, 0xf);
+	current += acpi_create_madt_irqoverride(
+		(acpi_madt_irqoverride_t *)current, 0, 9, 9,
+		MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW);

/* create all subtables for processors */
    current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)current,
@@ -89,15 +91,15 @@
    fadt->century = 0;	/* 0x7f to make rtc alarm work */
    fadt->iapc_boot_arch = FADT_BOOT_ARCH;	/* See table 5-10 */
    fadt->res2 = 0;		/* reserved, MUST be 0 ACPI 3.0 */
-	fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-10 ACPI 3.0a spec */
-				ACPI_FADT_C1_SUPPORTED |
-				ACPI_FADT_SLEEP_BUTTON |
-				ACPI_FADT_S4_RTC_WAKE |
-				ACPI_FADT_32BIT_TIMER |
-				ACPI_FADT_PCI_EXPRESS_WAKE |
-				ACPI_FADT_PLATFORM_CLOCK |
-				ACPI_FADT_S4_RTC_VALID |
-				ACPI_FADT_REMOTE_POWER_ON;
+	fadt->flags |=	ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
+			ACPI_FADT_C1_SUPPORTED |
+			ACPI_FADT_SLEEP_BUTTON |
+			ACPI_FADT_S4_RTC_WAKE |
+			ACPI_FADT_32BIT_TIMER |
+			ACPI_FADT_PCI_EXPRESS_WAKE |
+			ACPI_FADT_PLATFORM_CLOCK |
+			ACPI_FADT_S4_RTC_VALID |
+			ACPI_FADT_REMOTE_POWER_ON;

fadt->ARM_boot_arch = 0;	/* MUST be 0 ACPI 3.0 */
    fadt->FADT_MinorVersion = 0;	/* MUST be 0 ACPI 3.0 */