<p>Tristan Corrick has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29386">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/intel/lynxpoint: Add a common platform.asl file<br><br>The platform.asl file is copied from sb/intel/bd82x6x, and also matches<br>the contents deleted from each mainboard's platform.asl.<br><br>Tested on an ASRock H81M-HDS and a Google Peppy board (variant of<br>Slippy). No issues arose from this patch.<br><br>Change-Id: I539e401ce9af83070f69147526ca3b1c122f042c<br>Signed-off-by: Tristan Corrick <tristan@corrick.kiwi><br>---<br>M src/mainboard/google/beltino/acpi/platform.asl<br>M src/mainboard/google/slippy/acpi/platform.asl<br>M src/mainboard/intel/baskingridge/acpi/platform.asl<br>A src/southbridge/intel/lynxpoint/acpi/platform.asl<br>4 files changed, 56 insertions(+), 111 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/29386/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/beltino/acpi/platform.asl b/src/mainboard/google/beltino/acpi/platform.asl</span><br><span>index bc2fba2..cbe0c6f 100644</span><br><span>--- a/src/mainboard/google/beltino/acpi/platform.asl</span><br><span>+++ b/src/mainboard/google/beltino/acpi/platform.asl</span><br><span>@@ -14,43 +14,7 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* The APM port can be used for generating software SMIs */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OperationRegion (APMP, SystemIO, 0xb2, 2)</span><br><span style="color: hsl(0, 100%, 40%);">-Field (APMP, ByteAcc, NoLock, Preserve)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- APMC, 8, // APM command</span><br><span style="color: hsl(0, 100%, 40%);">- APMS, 8 // APM status</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Port 80 POST */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OperationRegion (POST, SystemIO, 0x80, 1)</span><br><span style="color: hsl(0, 100%, 40%);">-Field (POST, ByteAcc, Lock, Preserve)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- DBG0, 8</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* SMI I/O Trap */</span><br><span style="color: hsl(0, 100%, 40%);">-Method(TRAP, 1, Serialized)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Store (Arg0, SMIF) // SMI Function</span><br><span style="color: hsl(0, 100%, 40%);">- Store (0, TRP0) // Generate trap</span><br><span style="color: hsl(0, 100%, 40%);">- Return (SMIF) // Return value of SMI handler</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* The _PIC method is called by the OS to choose between interrupt</span><br><span style="color: hsl(0, 100%, 40%);">- * routing via the i8259 interrupt controller or the APIC.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * _PIC is called with a parameter of 0 for i8259 configuration and</span><br><span style="color: hsl(0, 100%, 40%);">- * with a parameter of 1 for Local Apic/IOAPIC configuration.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Method(_PIC, 1)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- // Remember the OS' IRQ routing choice.</span><br><span style="color: hsl(0, 100%, 40%);">- Store(Arg0, PICM)</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+#include <southbridge/intel/lynxpoint/acpi/platform.asl></span><br><span> </span><br><span> /* The _PTS method (Prepare To Sleep) is called before the OS is</span><br><span> * entering a sleep state. The sleep state number is passed in Arg0</span><br><span>diff --git a/src/mainboard/google/slippy/acpi/platform.asl b/src/mainboard/google/slippy/acpi/platform.asl</span><br><span>index 7074336..10b0efb 100644</span><br><span>--- a/src/mainboard/google/slippy/acpi/platform.asl</span><br><span>+++ b/src/mainboard/google/slippy/acpi/platform.asl</span><br><span>@@ -14,43 +14,7 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* The APM port can be used for generating software SMIs */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OperationRegion (APMP, SystemIO, 0xb2, 2)</span><br><span style="color: hsl(0, 100%, 40%);">-Field (APMP, ByteAcc, NoLock, Preserve)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- APMC, 8, // APM command</span><br><span style="color: hsl(0, 100%, 40%);">- APMS, 8 // APM status</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Port 80 POST */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OperationRegion (POST, SystemIO, 0x80, 1)</span><br><span style="color: hsl(0, 100%, 40%);">-Field (POST, ByteAcc, Lock, Preserve)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- DBG0, 8</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* SMI I/O Trap */</span><br><span style="color: hsl(0, 100%, 40%);">-Method(TRAP, 1, Serialized)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Store (Arg0, SMIF) // SMI Function</span><br><span style="color: hsl(0, 100%, 40%);">- Store (0, TRP0) // Generate trap</span><br><span style="color: hsl(0, 100%, 40%);">- Return (SMIF) // Return value of SMI handler</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* The _PIC method is called by the OS to choose between interrupt</span><br><span style="color: hsl(0, 100%, 40%);">- * routing via the i8259 interrupt controller or the APIC.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * _PIC is called with a parameter of 0 for i8259 configuration and</span><br><span style="color: hsl(0, 100%, 40%);">- * with a parameter of 1 for Local Apic/IOAPIC configuration.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Method(_PIC, 1)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- // Remember the OS' IRQ routing choice.</span><br><span style="color: hsl(0, 100%, 40%);">- Store(Arg0, PICM)</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+#include <southbridge/intel/lynxpoint/acpi/platform.asl></span><br><span> </span><br><span> /* The _PTS method (Prepare To Sleep) is called before the OS is</span><br><span> * entering a sleep state. The sleep state number is passed in Arg0</span><br><span>diff --git a/src/mainboard/intel/baskingridge/acpi/platform.asl b/src/mainboard/intel/baskingridge/acpi/platform.asl</span><br><span>index 22a13b2..4d610d5 100644</span><br><span>--- a/src/mainboard/intel/baskingridge/acpi/platform.asl</span><br><span>+++ b/src/mainboard/intel/baskingridge/acpi/platform.asl</span><br><span>@@ -14,43 +14,7 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* The APM port can be used for generating software SMIs */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OperationRegion (APMP, SystemIO, 0xb2, 2)</span><br><span style="color: hsl(0, 100%, 40%);">-Field (APMP, ByteAcc, NoLock, Preserve)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- APMC, 8, // APM command</span><br><span style="color: hsl(0, 100%, 40%);">- APMS, 8 // APM status</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Port 80 POST */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OperationRegion (POST, SystemIO, 0x80, 1)</span><br><span style="color: hsl(0, 100%, 40%);">-Field (POST, ByteAcc, Lock, Preserve)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- DBG0, 8</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* SMI I/O Trap */</span><br><span style="color: hsl(0, 100%, 40%);">-Method(TRAP, 1, Serialized)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Store (Arg0, SMIF) // SMI Function</span><br><span style="color: hsl(0, 100%, 40%);">- Store (0, TRP0) // Generate trap</span><br><span style="color: hsl(0, 100%, 40%);">- Return (SMIF) // Return value of SMI handler</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* The _PIC method is called by the OS to choose between interrupt</span><br><span style="color: hsl(0, 100%, 40%);">- * routing via the i8259 interrupt controller or the APIC.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * _PIC is called with a parameter of 0 for i8259 configuration and</span><br><span style="color: hsl(0, 100%, 40%);">- * with a parameter of 1 for Local Apic/IOAPIC configuration.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Method(_PIC, 1)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- // Remember the OS' IRQ routing choice.</span><br><span style="color: hsl(0, 100%, 40%);">- Store(Arg0, PICM)</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+#include <southbridge/intel/lynxpoint/acpi/platform.asl></span><br><span> </span><br><span> /* The _PTS method (Prepare To Sleep) is called before the OS is</span><br><span> * entering a sleep state. The sleep state number is passed in Arg0</span><br><span>diff --git a/src/southbridge/intel/lynxpoint/acpi/platform.asl b/src/southbridge/intel/lynxpoint/acpi/platform.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..e370668</span><br><span>--- /dev/null</span><br><span>+++ b/src/southbridge/intel/lynxpoint/acpi/platform.asl</span><br><span>@@ -0,0 +1,53 @@</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) 2011-2012 The Chromium OS Authors. All rights reserved.</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%);">+/* The APM port can be used for generating software SMIs */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OperationRegion (APMP, SystemIO, 0xb2, 2)</span><br><span style="color: hsl(120, 100%, 40%);">+Field (APMP, ByteAcc, NoLock, Preserve)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ APMC, 8, // APM command</span><br><span style="color: hsl(120, 100%, 40%);">+ APMS, 8 // APM status</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Port 80 POST */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OperationRegion (POST, SystemIO, 0x80, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+Field (POST, ByteAcc, Lock, Preserve)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ DBG0, 8</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%);">+/* SMI I/O Trap */</span><br><span style="color: hsl(120, 100%, 40%);">+Method(TRAP, 1, Serialized)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Store (Arg0, SMIF) // SMI Function</span><br><span style="color: hsl(120, 100%, 40%);">+ Store (0, TRP0) // Generate trap</span><br><span style="color: hsl(120, 100%, 40%);">+ Return (SMIF) // Return value of SMI handler</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%);">+/* The _PIC method is called by the OS to choose between interrupt</span><br><span style="color: hsl(120, 100%, 40%);">+ * routing via the i8259 interrupt controller or the APIC.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * _PIC is called with a parameter of 0 for i8259 configuration and</span><br><span style="color: hsl(120, 100%, 40%);">+ * with a parameter of 1 for Local Apic/IOAPIC configuration.</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%);">+Method(_PIC, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ // Remember the OS' IRQ routing choice.</span><br><span style="color: hsl(120, 100%, 40%);">+ Store(Arg0, PICM)</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/29386">change 29386</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/29386"/><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: I539e401ce9af83070f69147526ca3b1c122f042c </div>
<div style="display:none"> Gerrit-Change-Number: 29386 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Tristan Corrick <tristan@corrick.kiwi> </div>