Patch set updated for coreboot: southbridge/intel/i82801gx: Add option to skip MADT irq override

[Damien Zammit]

Damien Zammit ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12795

-gerrit

commit df1b26f26c49077c3c60b3105ec6a2cdcf88ab8b
Author: Damien Zammit 
Date:   Wed Dec 23 16:54:29 2015 +1100

southbridge/intel/i82801gx: Add option to skip MADT irq override

Provides Kconfig option IRQ9_MADT_OVERRIDE_OFF to skip
    overriding IRQ9 in MADT.  Required on GA-G41M-ES2L mainboard.

Change-Id: I865ad79c7c89f6eaf91653fbda5762542702274c
    Signed-off-by: Damien Zammit 
---
 src/southbridge/intel/i82801gx/Kconfig | 7 +++++++
 src/southbridge/intel/i82801gx/lpc.c   | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/southbridge/intel/i82801gx/Kconfig b/src/southbridge/intel/i82801gx/Kconfig
index c435b99..9a09ab4 100644
--- a/src/southbridge/intel/i82801gx/Kconfig
+++ b/src/southbridge/intel/i82801gx/Kconfig
@@ -25,6 +25,13 @@ config SOUTHBRIDGE_INTEL_I82801GX

if SOUTHBRIDGE_INTEL_I82801GX

+config IRQ9_MADT_OVERRIDE_OFF
+	bool
+	default n
+	help
+	  When selected, prevents ACPI from
+	  overriding IRQ9 in MADT
+
 config EHCI_BAR
    hex
    default 0xfef00000
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 4e9711c..5fe588d 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -474,9 +474,13 @@ unsigned long acpi_fill_madt(unsigned long current)
    /* INT_SRC_OVR */
    current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
    	 current, 0, 0, 2, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_EDGE);
-	current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
-		 current, 0, 9, 9, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_LEVEL);

+	if (!IS_ENABLED(CONFIG_IRQ9_MADT_OVERRIDE_OFF)) {
+		current += acpi_create_madt_irqoverride(
+			(acpi_madt_irqoverride_t *) current,
+			0, 9, 9, MP_IRQ_POLARITY_HIGH
+				| MP_IRQ_TRIGGER_LEVEL);
+	}

return current;
 }