<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/24924">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/intel/common: Fix conflicting OIC register definition<br><br>Commit d2d2aef6a3 (sb/intel/{bd82x6,ibexpeak}: Move RCBA macros to a<br>common location) makes some platforms use the wrong OIC register defi-<br>nition. It was extended to 16-bit in the corporate version of ICH10.<br>So let's give the new size and location a new name: EOIC (extended OIC).<br><br>This only touches the systems affected by the mentioned change. Other<br>platforms still need to be adapted before they can use the common RCBA<br>definitions.<br><br>Change-Id: If9e554c072f01412164dc35e0b09272142e3796f<br>Signed-off-by: Nico Huber <nico.huber@secunet.com><br>---<br>M src/mainboard/google/butterfly/romstage.c<br>M src/mainboard/google/link/romstage.c<br>M src/mainboard/google/parrot/romstage.c<br>M src/mainboard/google/stout/romstage.c<br>M src/mainboard/intel/cougar_canyon2/romstage.c<br>M src/mainboard/samsung/lumpy/romstage.c<br>M src/mainboard/samsung/stumpy/romstage.c<br>M src/southbridge/intel/bd82x6x/early_rcba.c<br>M src/southbridge/intel/common/rcba.h<br>9 files changed, 17 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/24924/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c</span><br><span>index a300ff6..ebcba84 100644</span><br><span>--- a/src/mainboard/google/butterfly/romstage.c</span><br><span>+++ b/src/mainboard/google/butterfly/romstage.c</span><br><span>@@ -96,9 +96,9 @@</span><br><span>    DIR_ROUTE(D22IR, PIRQA, PIRQB, PIRQC, PIRQD);</span><br><span> </span><br><span>    /* Enable IOAPIC (generic) */</span><br><span style="color: hsl(0, 100%, 40%);">-   RCBA16(OIC) = 0x0100;</span><br><span style="color: hsl(120, 100%, 40%);">+ RCBA16(EOIC) = 0x0100;</span><br><span>       /* PCH BWG says to read back the IOAPIC enable register */</span><br><span style="color: hsl(0, 100%, 40%);">-      (void) RCBA16(OIC);</span><br><span style="color: hsl(120, 100%, 40%);">+   (void) RCBA16(EOIC);</span><br><span> </span><br><span>     /* Disable unused devices (board specific) */</span><br><span>        reg32 = RCBA32(FD);</span><br><span>diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c</span><br><span>index 544bb4a..a1bbe34 100644</span><br><span>--- a/src/mainboard/google/link/romstage.c</span><br><span>+++ b/src/mainboard/google/link/romstage.c</span><br><span>@@ -104,9 +104,9 @@</span><br><span>       DIR_ROUTE(D22IR, PIRQA, PIRQB, PIRQC, PIRQD);</span><br><span> </span><br><span>    /* Enable IOAPIC (generic) */</span><br><span style="color: hsl(0, 100%, 40%);">-   RCBA16(OIC) = 0x0100;</span><br><span style="color: hsl(120, 100%, 40%);">+ RCBA16(EOIC) = 0x0100;</span><br><span>       /* PCH BWG says to read back the IOAPIC enable register */</span><br><span style="color: hsl(0, 100%, 40%);">-      (void) RCBA16(OIC);</span><br><span style="color: hsl(120, 100%, 40%);">+   (void) RCBA16(EOIC);</span><br><span> }</span><br><span> </span><br><span> static uint8_t *locate_spd(void)</span><br><span>diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c</span><br><span>index 3b7c242..12c1114 100644</span><br><span>--- a/src/mainboard/google/parrot/romstage.c</span><br><span>+++ b/src/mainboard/google/parrot/romstage.c</span><br><span>@@ -95,9 +95,9 @@</span><br><span>   DIR_ROUTE(D22IR, PIRQA, PIRQB, PIRQC, PIRQD);</span><br><span> </span><br><span>    /* Enable IOAPIC (generic) */</span><br><span style="color: hsl(0, 100%, 40%);">-   RCBA16(OIC) = 0x0100;</span><br><span style="color: hsl(120, 100%, 40%);">+ RCBA16(EOIC) = 0x0100;</span><br><span>       /* PCH BWG says to read back the IOAPIC enable register */</span><br><span style="color: hsl(0, 100%, 40%);">-      (void) RCBA16(OIC);</span><br><span style="color: hsl(120, 100%, 40%);">+   (void) RCBA16(EOIC);</span><br><span> </span><br><span>     /* Disable unused devices (board specific) */</span><br><span>        reg32 = RCBA32(FD);</span><br><span>diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c</span><br><span>index ffa2157..4f7f869 100644</span><br><span>--- a/src/mainboard/google/stout/romstage.c</span><br><span>+++ b/src/mainboard/google/stout/romstage.c</span><br><span>@@ -101,9 +101,9 @@</span><br><span>   DIR_ROUTE(D20IR, PIRQD, PIRQE, PIRQF, PIRQG);</span><br><span> </span><br><span>    /* Enable IOAPIC (generic) */</span><br><span style="color: hsl(0, 100%, 40%);">-   RCBA16(OIC) = 0x0100;</span><br><span style="color: hsl(120, 100%, 40%);">+ RCBA16(EOIC) = 0x0100;</span><br><span>       /* PCH BWG says to read back the IOAPIC enable register */</span><br><span style="color: hsl(0, 100%, 40%);">-      (void) RCBA16(OIC);</span><br><span style="color: hsl(120, 100%, 40%);">+   (void) RCBA16(EOIC);</span><br><span> </span><br><span>     /* Disable unused devices (board specific) */</span><br><span>        reg32 = RCBA32(FD);</span><br><span>diff --git a/src/mainboard/intel/cougar_canyon2/romstage.c b/src/mainboard/intel/cougar_canyon2/romstage.c</span><br><span>index 96c22ea..47f7ea5 100644</span><br><span>--- a/src/mainboard/intel/cougar_canyon2/romstage.c</span><br><span>+++ b/src/mainboard/intel/cougar_canyon2/romstage.c</span><br><span>@@ -158,9 +158,9 @@</span><br><span>   DIR_ROUTE(D20IR, PIRQD, PIRQE, PIRQF, PIRQG);</span><br><span> </span><br><span>    /* Enable IOAPIC (generic) */</span><br><span style="color: hsl(0, 100%, 40%);">-   RCBA16(OIC) = 0x0100;</span><br><span style="color: hsl(120, 100%, 40%);">+ RCBA16(EOIC) = 0x0100;</span><br><span>       /* PCH BWG says to read back the IOAPIC enable register */</span><br><span style="color: hsl(0, 100%, 40%);">-      (void) RCBA16(OIC);</span><br><span style="color: hsl(120, 100%, 40%);">+   (void) RCBA16(EOIC);</span><br><span> </span><br><span>     /* Disable unused devices (board specific) */</span><br><span>        reg32 = RCBA32(FD);</span><br><span>diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c</span><br><span>index d7ed435..ce17068 100644</span><br><span>--- a/src/mainboard/samsung/lumpy/romstage.c</span><br><span>+++ b/src/mainboard/samsung/lumpy/romstage.c</span><br><span>@@ -103,9 +103,9 @@</span><br><span>       DIR_ROUTE(D22IR, PIRQA, PIRQB, PIRQC, PIRQD);</span><br><span> </span><br><span>    /* Enable IOAPIC (generic) */</span><br><span style="color: hsl(0, 100%, 40%);">-   RCBA16(OIC) = 0x0100;</span><br><span style="color: hsl(120, 100%, 40%);">+ RCBA16(EOIC) = 0x0100;</span><br><span>       /* PCH BWG says to read back the IOAPIC enable register */</span><br><span style="color: hsl(0, 100%, 40%);">-      (void) RCBA16(OIC);</span><br><span style="color: hsl(120, 100%, 40%);">+   (void) RCBA16(EOIC);</span><br><span> }</span><br><span> </span><br><span> static const uint8_t *locate_spd(void)</span><br><span>diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c</span><br><span>index 265530c..1b5d2ae 100644</span><br><span>--- a/src/mainboard/samsung/stumpy/romstage.c</span><br><span>+++ b/src/mainboard/samsung/stumpy/romstage.c</span><br><span>@@ -112,9 +112,9 @@</span><br><span>       DIR_ROUTE(D22IR, PIRQA, PIRQB, PIRQC, PIRQD);</span><br><span> </span><br><span>    /* Enable IOAPIC (generic) */</span><br><span style="color: hsl(0, 100%, 40%);">-   RCBA16(OIC) = 0x0100;</span><br><span style="color: hsl(120, 100%, 40%);">+ RCBA16(EOIC) = 0x0100;</span><br><span>       /* PCH BWG says to read back the IOAPIC enable register */</span><br><span style="color: hsl(0, 100%, 40%);">-      (void) RCBA16(OIC);</span><br><span style="color: hsl(120, 100%, 40%);">+   (void) RCBA16(EOIC);</span><br><span> }</span><br><span> </span><br><span> static void setup_sio_gpios(void)</span><br><span>diff --git a/src/southbridge/intel/bd82x6x/early_rcba.c b/src/southbridge/intel/bd82x6x/early_rcba.c</span><br><span>index 990ff0d..9ce9dc9 100644</span><br><span>--- a/src/southbridge/intel/bd82x6x/early_rcba.c</span><br><span>+++ b/src/southbridge/intel/bd82x6x/early_rcba.c</span><br><span>@@ -60,9 +60,9 @@</span><br><span>  DIR_ROUTE(D22IR, PIRQA, PIRQB, PIRQC, PIRQD);</span><br><span> </span><br><span>    /* Enable IOAPIC (generic) */</span><br><span style="color: hsl(0, 100%, 40%);">-   RCBA16(OIC) = 0x0100;</span><br><span style="color: hsl(120, 100%, 40%);">+ RCBA16(EOIC) = 0x0100;</span><br><span>       /* PCH BWG says to read back the IOAPIC enable register */</span><br><span style="color: hsl(0, 100%, 40%);">-      (void) RCBA16(OIC);</span><br><span style="color: hsl(120, 100%, 40%);">+   (void) RCBA16(EOIC);</span><br><span> }</span><br><span> </span><br><span> void</span><br><span>diff --git a/src/southbridge/intel/common/rcba.h b/src/southbridge/intel/common/rcba.h</span><br><span>index 1399fde..ad8285a 100644</span><br><span>--- a/src/southbridge/intel/common/rcba.h</span><br><span>+++ b/src/southbridge/intel/common/rcba.h</span><br><span>@@ -147,6 +147,7 @@</span><br><span> #define D20IR           0x3160  /* 16bit */</span><br><span> #define D19IR            0x3168  /* 16bit */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define EOIC           0x31fe  /* 16bit */</span><br><span> #define OIC              0x31ff  /*  8bit */</span><br><span> </span><br><span> #define DIR_ROUTE(x, a, b, c, d) \</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/24924">change 24924</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/24924"/><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: If9e554c072f01412164dc35e0b09272142e3796f </div>
<div style="display:none"> Gerrit-Change-Number: 24924 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>