<p>Richard Spiegel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25510">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/kahlee: Fix IRQ routing<br><br>ACPI interrupt routing file routing.asl is not reflecting AGESA settings to<br>the NB Interrupt Routing Registers. The AGESA settings are:<br>Device self INTA INTB INTC INTD<br>GPP 0 23 0 1 2 3<br>GPP 1 24 8 9 10 11<br>GPP 2 25 16 17 18 19<br>GPP 3 26 24 25 26 27<br>GPP 4 23 3 0 1 2<br>HDA none 22 23 20 21<br>GBIF none 6 7 4 5<br><br>Fix the routing table, considering that NB IOAPIC starts at interrupt 24.<br><br>BUG=b:74104946<br>TEST=Build and boot kahlee and grunt, verify that neither is broken.<br><br>Change-Id: I60847c46f3f938f9e97d7b323b27d20e36aa2d02<br>Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl<br>1 file changed, 29 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/25510/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl</span><br><span>index c61bc4bb..53cd373 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl</span><br><span>+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl</span><br><span>@@ -65,14 +65,16 @@</span><br><span> /* Bus 0, Dev 0 - F15 Host Controller */</span><br><span> </span><br><span> /* Bus 0, Dev 1 - PCI Bridge for Internal Graphics(IGP) */</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0001FFFF, 0, 0, 43 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0001FFFF, 1, 0, 40 },</span><br><span style="color: hsl(120, 100%, 40%);">+ /* IOAPIC2BASE + (group * 4) == 24 + (1 * 4), CDAB swizzle */</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0001FFFF, 0, 0, 30 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0001FFFF, 1, 0, 31 },</span><br><span> </span><br><span> /* Bus 0, Dev 2 - PCIe Bridges */</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0002FFFF, 0, 0, 44 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0002FFFF, 1, 0, 45 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0002FFFF, 2, 0, 46 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0002FFFF, 3, 0, 47 },</span><br><span style="color: hsl(120, 100%, 40%);">+ /* IOAPIC2BASE + 23 */</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0002FFFF, 0, 0, 47 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0002FFFF, 1, 0, 48 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0002FFFF, 2, 0, 49 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0002FFFF, 3, 0, 50 },</span><br><span> </span><br><span> /* SB devices in APIC mode */</span><br><span> /* Bus 0, Dev 20 - F0:SMBus/ACPI;F3:LPC;F7:SD */</span><br><span>@@ -103,7 +105,7 @@</span><br><span> Package() { 0x0000FFFF, 3, INTD, 0 },</span><br><span> })</span><br><span> Name (APS4, Package()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(120, 100%, 40%);">+{ /* IOAPIC2BASE + (group * 4) == 24 + (0 * 4), no swizzle */</span><br><span> /* PCIe slot - Hooked to PCIe slot 4 */</span><br><span> Package() { 0x0000FFFF, 0, 0, 24 },</span><br><span> Package() { 0x0000FFFF, 1, 0, 25 },</span><br><span>@@ -120,11 +122,11 @@</span><br><span> Package() { 0x0000FFFF, 3, INTA, 0 },</span><br><span> })</span><br><span> Name (APS5, Package()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 0, 0, 28 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 1, 0, 29 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 2, 0, 30 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 3, 0, 31 },</span><br><span style="color: hsl(120, 100%, 40%);">+{ /* IOAPIC2BASE + (group * 4) == 24 + (2 * 4), no swizzle */</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 0, 0, 32 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 1, 0, 33 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 2, 0, 34 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 3, 0, 35 },</span><br><span> })</span><br><span> </span><br><span> /* GPP 2 */</span><br><span>@@ -136,11 +138,11 @@</span><br><span> Package() { 0x0000FFFF, 3, INTB, 0 },</span><br><span> })</span><br><span> Name (APS6, Package()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 0, 0, 32 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 1, 0, 33 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 2, 0, 34 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 3, 0, 35 },</span><br><span style="color: hsl(120, 100%, 40%);">+{ /* IOAPIC2BASE + (group * 4) == 24 + (4 * 4), no swizzle */</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 0, 0, 40 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 1, 0, 41 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 2, 0, 42 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 3, 0, 43 },</span><br><span> })</span><br><span> </span><br><span> /* GPP 3 */</span><br><span>@@ -152,11 +154,11 @@</span><br><span> Package() { 0x0000FFFF, 3, INTC, 0 },</span><br><span> })</span><br><span> Name (APS7, Package()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 0, 0, 36 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 1, 0, 37 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 2, 0, 38 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 3, 0, 39 },</span><br><span style="color: hsl(120, 100%, 40%);">+{ /* IOAPIC2BASE + (group * 4) == 24 + (6 * 4), no swizzle */</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 0, 0, 48 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 1, 0, 49 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 2, 0, 50 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 3, 0, 51 },</span><br><span> })</span><br><span> </span><br><span> /* GPP 4 */</span><br><span>@@ -167,9 +169,9 @@</span><br><span> Package(){0x0000FFFF, 3, INTD, 0 },</span><br><span> })</span><br><span> Name (APS8, Package()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 0, 0, 40 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 1, 0, 41 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 2, 0, 42 },</span><br><span style="color: hsl(0, 100%, 40%);">- Package() { 0x0000FFFF, 3, 0, 43 },</span><br><span style="color: hsl(120, 100%, 40%);">+{ /* IOAPIC2BASE + (group * 4) == 24 + (0 * 4), DABC swizzle */</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 0, 0, 27 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 1, 0, 24 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 2, 0, 25 },</span><br><span style="color: hsl(120, 100%, 40%);">+ Package() { 0x0000FFFF, 3, 0, 26 },</span><br><span> })</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25510">change 25510</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/25510"/><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: I60847c46f3f938f9e97d7b323b27d20e36aa2d02 </div>
<div style="display:none"> Gerrit-Change-Number: 25510 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>