<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/25540">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ioapic: extend definition name to avoid collision<br><br>Change EN/DISABLED to INT_EN/DISABLED to avoid collision with other<br>EN/DISABLE definition.<br><br>Change-Id: I85b1c544d0f31340a09e18f4b36c1942ea0fa6ef<br>Signed-off-by: Marc Jones <marc.jones@scarletltd.com><br>Reviewed-on: https://review.coreboot.org/25540<br>Reviewed-by: Martin Roth <martinroth@google.com><br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>---<br>M src/arch/x86/include/arch/ioapic.h<br>M src/arch/x86/ioapic.c<br>M src/drivers/generic/ioapic/ioapic.c<br>3 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/include/arch/ioapic.h b/src/arch/x86/include/arch/ioapic.h</span><br><span>index ad96ba3..bc229d9 100644</span><br><span>--- a/src/arch/x86/include/arch/ioapic.h</span><br><span>+++ b/src/arch/x86/include/arch/ioapic.h</span><br><span>@@ -26,8 +26,8 @@</span><br><span> </span><br><span> #define ALL           (0xff << 24)</span><br><span> #define NONE              (0)</span><br><span style="color: hsl(0, 100%, 40%);">-#define DISABLED     (1 << 16)</span><br><span style="color: hsl(0, 100%, 40%);">-#define ENABLED          (0 << 16)</span><br><span style="color: hsl(120, 100%, 40%);">+#define INT_DISABLED   (1 << 16)</span><br><span style="color: hsl(120, 100%, 40%);">+#define INT_ENABLED    (0 << 16)</span><br><span> #define TRIGGER_EDGE (0 << 15)</span><br><span> #define TRIGGER_LEVEL        (1 << 15)</span><br><span> #define POLARITY_HIGH        (0 << 13)</span><br><span>diff --git a/src/arch/x86/ioapic.c b/src/arch/x86/ioapic.c</span><br><span>index dba49c0..7bd52f5 100644</span><br><span>--- a/src/arch/x86/ioapic.c</span><br><span>+++ b/src/arch/x86/ioapic.c</span><br><span>@@ -53,7 +53,7 @@</span><br><span> </span><br><span>     ioapic_interrupts = ioapic_interrupt_count(ioapic_base);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    low = DISABLED;</span><br><span style="color: hsl(120, 100%, 40%);">+       low = INT_DISABLED;</span><br><span>  high = NONE;</span><br><span> </span><br><span>     for (i = 0; i < ioapic_interrupts; i++) {</span><br><span>@@ -118,7 +118,7 @@</span><br><span>   }</span><br><span> </span><br><span>        /* Enable Virtual Wire Mode. */</span><br><span style="color: hsl(0, 100%, 40%);">- low = ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT;</span><br><span style="color: hsl(120, 100%, 40%);">+        low = INT_ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT;</span><br><span>   high = bsp_lapicid << (56 - 32);</span><br><span> </span><br><span>   io_apic_write(ioapic_base, 0x10, low);</span><br><span>@@ -131,7 +131,7 @@</span><br><span> </span><br><span>     printk(BIOS_SPEW, "IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n",</span><br><span>             0, high, low);</span><br><span style="color: hsl(0, 100%, 40%);">-   low = DISABLED;</span><br><span style="color: hsl(120, 100%, 40%);">+       low = INT_DISABLED;</span><br><span>  high = NONE;</span><br><span>         for (i = 1; i < ioapic_interrupts; i++) {</span><br><span>                 io_apic_write(ioapic_base, i * 2 + 0x10, low);</span><br><span>diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c</span><br><span>index 44f1b02..271e98c 100644</span><br><span>--- a/src/drivers/generic/ioapic/ioapic.c</span><br><span>+++ b/src/drivers/generic/ioapic/ioapic.c</span><br><span>@@ -61,7 +61,7 @@</span><br><span> </span><br><span>      if (config->enable_virtual_wire) {</span><br><span>                /* Enable Virtual Wire Mode. */</span><br><span style="color: hsl(0, 100%, 40%);">-         low = ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT;</span><br><span style="color: hsl(120, 100%, 40%);">+                low = INT_ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT;</span><br><span>           high = bsp_lapicid << (56 - 32);</span><br><span> </span><br><span>           io_apic_write(ioapic_base, 0x10, low);</span><br><span>@@ -75,7 +75,7 @@</span><br><span>           printk(BIOS_SPEW, "IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", 0,</span><br><span>                   high, low);</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       low = DISABLED;</span><br><span style="color: hsl(120, 100%, 40%);">+       low = INT_DISABLED;</span><br><span>  high = NONE;</span><br><span> </span><br><span>     for (i = 1; i < ioapic_interrupts; i++) {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25540">change 25540</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/25540"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I85b1c544d0f31340a09e18f4b36c1942ea0fa6ef </div>
<div style="display:none"> Gerrit-Change-Number: 25540 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Marc Jones <marc@marcjonesconsulting.com> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>