<p>Tristan Corrick has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29388">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/intel/lynxpoint: Deduplicate `acpi_fill_madt()`<br><br>The function `acpi_fill_madt()` is identical among all the Lynx Point<br>boards, so share a common function between them. The file madt.c that<br>implements the common function was copied from sb/intel/bd82x6x.<br><br>Tested on an ASRock H81M-HDS and Google Peppy (variant of Slippy). No<br>issues arose from this patch.<br><br>Change-Id: Ife9e3917febf43d8a92cac66b502e2dee8527556<br>Signed-off-by: Tristan Corrick <tristan@corrick.kiwi><br>---<br>M src/mainboard/google/beltino/acpi_tables.c<br>M src/mainboard/google/slippy/acpi_tables.c<br>M src/mainboard/intel/baskingridge/acpi_tables.c<br>M src/southbridge/intel/lynxpoint/Makefile.inc<br>A src/southbridge/intel/lynxpoint/madt.c<br>5 files changed, 42 insertions(+), 54 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/29388/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c</span><br><span>index 3e9f2ad..b6ca0f8 100644</span><br><span>--- a/src/mainboard/google/beltino/acpi_tables.c</span><br><span>+++ b/src/mainboard/google/beltino/acpi_tables.c</span><br><span>@@ -78,21 +78,3 @@</span><br><span> </span><br><span> acpi_update_thermal_table(gnvs);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_fill_madt(unsigned long current)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* Local APICs */</span><br><span style="color: hsl(0, 100%, 40%);">- current = acpi_create_madt_lapics(current);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* IOAPIC */</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,</span><br><span style="color: hsl(0, 100%, 40%);">- 2, IO_APIC_ADDR, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* INT_SRC_OVR */</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(0, 100%, 40%);">- current, 0, 0, 2, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(0, 100%, 40%);">- current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return current;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c</span><br><span>index 4036f1b..7de0bfb 100644</span><br><span>--- a/src/mainboard/google/slippy/acpi_tables.c</span><br><span>+++ b/src/mainboard/google/slippy/acpi_tables.c</span><br><span>@@ -62,21 +62,3 @@</span><br><span> </span><br><span> acpi_update_thermal_table(gnvs);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_fill_madt(unsigned long current)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* Local APICs */</span><br><span style="color: hsl(0, 100%, 40%);">- current = acpi_create_madt_lapics(current);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* IOAPIC */</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,</span><br><span style="color: hsl(0, 100%, 40%);">- 2, IO_APIC_ADDR, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* INT_SRC_OVR */</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(0, 100%, 40%);">- current, 0, 0, 2, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(0, 100%, 40%);">- current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return current;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c</span><br><span>index b9dd015..730fbad 100644</span><br><span>--- a/src/mainboard/intel/baskingridge/acpi_tables.c</span><br><span>+++ b/src/mainboard/intel/baskingridge/acpi_tables.c</span><br><span>@@ -80,21 +80,3 @@</span><br><span> </span><br><span> acpi_update_thermal_table(gnvs);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_fill_madt(unsigned long current)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* Local APICs */</span><br><span style="color: hsl(0, 100%, 40%);">- current = acpi_create_madt_lapics(current);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* IOAPIC */</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,</span><br><span style="color: hsl(0, 100%, 40%);">- 2, IO_APIC_ADDR, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* INT_SRC_OVR */</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(0, 100%, 40%);">- current, 0, 0, 2, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(0, 100%, 40%);">- current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return current;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/southbridge/intel/lynxpoint/Makefile.inc b/src/southbridge/intel/lynxpoint/Makefile.inc</span><br><span>index db34546..4530df0 100644</span><br><span>--- a/src/southbridge/intel/lynxpoint/Makefile.inc</span><br><span>+++ b/src/southbridge/intel/lynxpoint/Makefile.inc</span><br><span>@@ -38,6 +38,7 @@</span><br><span> ramstage-y += me_status.c</span><br><span> ramstage-y += watchdog.c</span><br><span> ramstage-y += acpi.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += madt.c</span><br><span> </span><br><span> ramstage-$(CONFIG_ELOG) += elog.c</span><br><span> </span><br><span>diff --git a/src/southbridge/intel/lynxpoint/madt.c b/src/southbridge/intel/lynxpoint/madt.c</span><br><span>new file mode 100644</span><br><span>index 0000000..afa15ae</span><br><span>--- /dev/null</span><br><span>+++ b/src/southbridge/intel/lynxpoint/madt.c</span><br><span>@@ -0,0 +1,41 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2007-2009 coresystems GmbH</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <types.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cbmem.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <arch/acpi.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <arch/ioapic.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <arch/acpigen.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <arch/smp/mpspec.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_fill_madt(unsigned long current)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Local APICs */</span><br><span style="color: hsl(120, 100%, 40%);">+ current = acpi_create_madt_lapics(current);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* IOAPIC */</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,</span><br><span style="color: hsl(120, 100%, 40%);">+ 2, IO_APIC_ADDR, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* INT_SRC_OVR */</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(120, 100%, 40%);">+ current, 0, 0, 2, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(120, 100%, 40%);">+ current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return current;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29388">change 29388</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29388"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ife9e3917febf43d8a92cac66b502e2dee8527556 </div>
<div style="display:none"> Gerrit-Change-Number: 29388 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Tristan Corrick <tristan@corrick.kiwi> </div>