<p>Raul Rangel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28879">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libpayload/apic: Only ACK interrupts triggered by the APIC<br><br>Only set end of interrupt (EOI) when the APIC In-Service vector matches<br>the interrupt vector. This makes it so we don't EOI a non APIC<br>interrupt.<br><br>BUG=b:116777191<br>TEST=Booted grunt with APIC enabled and verified depthcharge still<br>works.<br><br>Change-Id: I00bd1e7a0fcf2fc004feadc40d22ebfefe68b384<br>Signed-off-by: Raul E Rangel <rrangel@chromium.org><br>---<br>M payloads/libpayload/arch/x86/apic.c<br>M payloads/libpayload/arch/x86/exception.c<br>M payloads/libpayload/include/x86/arch/apic.h<br>3 files changed, 27 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/28879/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/libpayload/arch/x86/apic.c b/payloads/libpayload/arch/x86/apic.c</span><br><span>index 048cc66..3b294cb 100644</span><br><span>--- a/payloads/libpayload/arch/x86/apic.c</span><br><span>+++ b/payloads/libpayload/arch/x86/apic.c</span><br><span>@@ -58,6 +58,8 @@</span><br><span> #define APIC_TIMER_INIT_COUNT 0x380</span><br><span> #define APIC_TIMER_CUR_COUNT 0x390</span><br><span> #define APIC_TIMER_DIV_CFG 0x3E0</span><br><span style="color: hsl(120, 100%, 40%);">+#define APIC_ISR_0 0x100</span><br><span style="color: hsl(120, 100%, 40%);">+#define APIC_ISR_OFFSET 0x010</span><br><span> </span><br><span> #define APIC_LVT_SIZE 0x010</span><br><span> </span><br><span>@@ -141,11 +143,28 @@</span><br><span> timer_waiting = 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void apic_eoi(void)</span><br><span style="color: hsl(120, 100%, 40%);">+void apic_eoi(uint8_t vector)</span><br><span> {</span><br><span> die_if(!apic_bar, "APIC is not initialized");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- apic_write32(APIC_EOI, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Local and I/O APICs support 240 vectors (in the range of 16 to 255)</span><br><span style="color: hsl(120, 100%, 40%);">+ * as valid interrupts.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vector <= 15)</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%);">+ /* Each bank handles 32 vectors */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bank = vector / 32;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t offset = APIC_ISR_0 + bank * APIC_ISR_OFFSET;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t mask = apic_read32(offset);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t shift = vector % 32;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mask & (1 << shift))</span><br><span style="color: hsl(120, 100%, 40%);">+ apic_write32(APIC_EOI, 0);</span><br><span> }</span><br><span> </span><br><span> static enum APIC_CAPABILITY apic_capabilities(void)</span><br><span>diff --git a/payloads/libpayload/arch/x86/exception.c b/payloads/libpayload/arch/x86/exception.c</span><br><span>index 2691c85..3cd95bb 100644</span><br><span>--- a/payloads/libpayload/arch/x86/exception.c</span><br><span>+++ b/payloads/libpayload/arch/x86/exception.c</span><br><span>@@ -34,13 +34,6 @@</span><br><span> #include <arch/apic.h></span><br><span> </span><br><span> #define IF_FLAG (1 << 9)</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * Local and I/O APICs support 240 vectors (in the range of 16 to 255) as valid</span><br><span style="color: hsl(0, 100%, 40%);">- * interrupts. The Intel 64 and IA-32 architectures reserve vectors 16</span><br><span style="color: hsl(0, 100%, 40%);">- * through 31 for predefined interrupts, exceptions, and Intel-reserved</span><br><span style="color: hsl(0, 100%, 40%);">- * encodings.</span><br><span style="color: hsl(0, 100%, 40%);">-*/</span><br><span style="color: hsl(0, 100%, 40%);">-#define FIRST_USER_DEFINED_VECTOR 32</span><br><span> </span><br><span> u32 exception_stack[0x400] __attribute__((aligned(8)));</span><br><span> </span><br><span>@@ -173,15 +166,15 @@</span><br><span> </span><br><span> void exception_dispatch(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- u32 vec = exception_state->vector;</span><br><span style="color: hsl(120, 100%, 40%);">+ die_if(exception_state->vector >= ARRAY_SIZE(handlers),</span><br><span style="color: hsl(120, 100%, 40%);">+ "Invalid vector %u\n", exception_state->vector);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- die_if(vec >= ARRAY_SIZE(handlers), "Invalid vector %u\n", vec);</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 vec = exception_state->vector;</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%);">- && vec >= FIRST_USER_DEFINED_VECTOR)</span><br><span style="color: hsl(0, 100%, 40%);">- apic_eoi();</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> return;</span><br><span> }</span><br><span> </span><br><span>diff --git a/payloads/libpayload/include/x86/arch/apic.h b/payloads/libpayload/include/x86/arch/apic.h</span><br><span>index c28fc0f..1eb3508 100644</span><br><span>--- a/payloads/libpayload/include/x86/arch/apic.h</span><br><span>+++ b/payloads/libpayload/include/x86/arch/apic.h</span><br><span>@@ -38,7 +38,7 @@</span><br><span> uint8_t apic_id(void);</span><br><span> </span><br><span> /** Signal the end of the interrupt handler. */</span><br><span style="color: hsl(0, 100%, 40%);">-void apic_eoi(void);</span><br><span style="color: hsl(120, 100%, 40%);">+void apic_eoi(uint8_t vector);</span><br><span> </span><br><span> void apic_delay(unsigned int usec);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28879">change 28879</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/28879"/><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: I00bd1e7a0fcf2fc004feadc40d22ebfefe68b384 </div>
<div style="display:none"> Gerrit-Change-Number: 28879 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Raul Rangel <rrangel@chromium.org> </div>