<p>Raul Rangel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28882">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libpayload/x86/exception: Add ability to ignore unknown interrupts<br><br>This will make enabling the APIC safer by ignoring unknown interrupts<br>and not halting the system. Once all interrupt sources have been found<br>and handled DIE_ON_UNKNOWN_INTERRUPT can be set if desired.<br><br>BUG=b:116777191<br>TEST=Booted grunt, halted the kernel, and pushed the power button while<br>in S5. Verified that depthcharge logged the unknown exception.<br><br>APIC Init Started<br>APIC Configured<br>Ignoring interrupt vector 39<br><br>Change-Id: If4ed566ec284d69786c369f37e4e331d7f892c74<br>Signed-off-by: Raul E Rangel <rrangel@chromium.org><br>---<br>M payloads/libpayload/arch/x86/Kconfig<br>M payloads/libpayload/arch/x86/exception.c<br>2 files changed, 32 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/28882/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/libpayload/arch/x86/Kconfig b/payloads/libpayload/arch/x86/Kconfig</span><br><span>index cbb21cb..129ff5f 100644</span><br><span>--- a/payloads/libpayload/arch/x86/Kconfig</span><br><span>+++ b/payloads/libpayload/arch/x86/Kconfig</span><br><span>@@ -37,4 +37,21 @@</span><br><span> config ENABLE_APIC</span><br><span>  bool "Enables the Local APIC"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+choice</span><br><span style="color: hsl(120, 100%, 40%);">+   prompt "Interrupt Handling"</span><br><span style="color: hsl(120, 100%, 40%);">+ default LOG_UNKNOWN_INTERRUPTS if ENABLE_APIC</span><br><span style="color: hsl(120, 100%, 40%);">+ default DIE_ON_UNKNOWN_INTERRUPT</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config IGNORE_UNKNOWN_INTERRUPTS</span><br><span style="color: hsl(120, 100%, 40%);">+  bool "Ignore unknown user defined interrupts"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config LOG_UNKNOWN_INTERRUPTS</span><br><span style="color: hsl(120, 100%, 40%);">+      bool "Logs unknown user defined interrupts to the console"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config DIE_ON_UNKNOWN_INTERRUPT</span><br><span style="color: hsl(120, 100%, 40%);">+       bool "Die if an unknown user defined interrupt is encountered"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+endchoice</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif</span><br><span>diff --git a/payloads/libpayload/arch/x86/exception.c b/payloads/libpayload/arch/x86/exception.c</span><br><span>index 1fa1304..983a9f3 100644</span><br><span>--- a/payloads/libpayload/arch/x86/exception.c</span><br><span>+++ b/payloads/libpayload/arch/x86/exception.c</span><br><span>@@ -171,9 +171,14 @@</span><br><span> </span><br><span>   if (handlers[vec]) {</span><br><span>                 handlers[vec](vec);</span><br><span style="color: hsl(0, 100%, 40%);">-             if (IS_ENABLED(CONFIG_LP_ENABLE_APIC))</span><br><span style="color: hsl(0, 100%, 40%);">-                  apic_eoi(vec);</span><br><span style="color: hsl(0, 100%, 40%);">-          return;</span><br><span style="color: hsl(120, 100%, 40%);">+               goto success;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (vec >= EXC_COUNT</span><br><span style="color: hsl(120, 100%, 40%);">+                   && IS_ENABLED(CONFIG_LP_IGNORE_UNKNOWN_INTERRUPTS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+              goto success;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (vec >= EXC_COUNT</span><br><span style="color: hsl(120, 100%, 40%);">+                   && IS_ENABLED(CONFIG_LP_LOG_UNKNOWN_INTERRUPTS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+         printf("Ignoring interrupt vector %u\n", vec);</span><br><span style="color: hsl(120, 100%, 40%);">+              goto success;</span><br><span>        }</span><br><span> </span><br><span>        die_if(vec >= EXC_COUNT || !names[vec], "Bad exception vector %u\n",</span><br><span>@@ -181,7 +186,14 @@</span><br><span> </span><br><span>         dump_exception_state();</span><br><span>      dump_stack(exception_state->regs.esp, 512);</span><br><span style="color: hsl(120, 100%, 40%);">+        /* We don't call apic_eoi because we don't want to ack the interrupt and</span><br><span style="color: hsl(120, 100%, 40%);">+         allow another interrupt to wake the processor. */</span><br><span>         halt();</span><br><span style="color: hsl(120, 100%, 40%);">+       return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+success:</span><br><span style="color: hsl(120, 100%, 40%);">+   if (IS_ENABLED(CONFIG_LP_ENABLE_APIC))</span><br><span style="color: hsl(120, 100%, 40%);">+                apic_eoi(vec);</span><br><span> }</span><br><span> </span><br><span> void exception_init(void)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28882">change 28882</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/28882"/><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: If4ed566ec284d69786c369f37e4e331d7f892c74 </div>
<div style="display:none"> Gerrit-Change-Number: 28882 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Raul Rangel <rrangel@chromium.org> </div>