<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23569">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/lars,lili: Update SPD Data<br><br>Combination of several commits from Chromium tree:<br>3b875a2 [Lars: Update Memory ID for DVT board]<br>b6d7c63 [Lili: Update Memory IDs]<br>f203f99 [Lili: Add new SPD for Hynix H9CCNNN8GTALAR-NUD]<br>a6571bf [Lili: Update Memory IDs]<br>80e1841 [Lili: Update Memory IDs]<br>58d4487 [Lili: Fix memory string show error in spd data]<br><br>These commits bring lars' SPD data in line with the Chromium tree.<br><br>Original-Change-Id: I54d0e6d2bbe86d5dc2ee5825f332d36abfa99084<br>Original-Change-Id: I9431393f369a1d2870bdabba1fc55d9cefae5c39<br>Original-Change-Id: I3b325a1801f49109429eb647d8d98a5537ce1b7b<br>Original-Change-Id: Ie8a32d8a26ea1054e2df8432084a95d1cb03f991<br>Original-Change-Id: I64c73950e3bea57b6c5a90257211b3d6d7f1baab<br>Original-Change-Id: I0e425fa4f0bae544680d5522c2e05a4f7a3be95a<br>Original-Signed-off-by: David Wu <David_Wu@quantatw.com><br>Original-Signed-off-by: Ren Kuo <Ren.Kuo@quantatw.com><br>Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org><br>Original-Reviewed-by: Duncan Laurie <dlaurie@google.com><br>Original-Tested-by: David Wu <david_wu@quantatw.com><br>Original-Tested-by: Ren Kuo <ren.kuo@quanta.corp-partner.google.com><br><br>Change-Id: I7cc9b01012b0b9ed72804192bb5953243fc859b4<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/mainboard/google/lars/spd/Makefile.inc<br>A src/mainboard/google/lars/spd/hynix_dimm_H9CCNNN8GTALAR-NUD-1G-1866.spd.hex<br>A src/mainboard/google/lars/spd/hynix_dimm_H9CCNNNBJTALAR-NUD-2G-1866.spd.hex<br>A src/mainboard/google/lars/spd/micron_dimm_MT52L256M32D1PF-107-1G-1866.spd.hex<br>A src/mainboard/google/lars/spd/micron_dimm_MT52L512M32D2PF-107-2G-1866.spd.hex<br>M src/mainboard/google/lars/spd/spd.c<br>M src/mainboard/google/lars/spd/spd.h<br>7 files changed, 76 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/23569/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/lars/spd/Makefile.inc b/src/mainboard/google/lars/spd/Makefile.inc</span><br><span>index d6d789e..b6e4fd7 100644</span><br><span>--- a/src/mainboard/google/lars/spd/Makefile.inc</span><br><span>+++ b/src/mainboard/google/lars/spd/Makefile.inc</span><br><span>@@ -24,13 +24,13 @@</span><br><span> SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF-1G-1866 # 0b0011 Single Channel 2GB</span><br><span> SPD_SOURCES += hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866 # 0b0100 Single Channel 4GB</span><br><span> SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF-2G-1866 # 0b0101 Dual Channel 8GB</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b0110</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b0111</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1000</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1001</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1010</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1011</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1100</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866 # 0b0110 Dual Channel 4GB</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR-NUD-2G-1866 # 0b0111 Single Channel 4GB</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b1000 Dual Channel 4GB</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107-2G-1866 # 0b1001 Dual Channel 8GB</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD-1G-1866 # 0b1010 Dual Channel 4GB</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107-2G-1866 # 0b1011 Single Channel 4GB</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF-2G-1866 # 0b1100 Single Channel 4GB</span><br><span> SPD_SOURCES += empty # 0b1101</span><br><span> SPD_SOURCES += empty # 0b1110</span><br><span> SPD_SOURCES += empty # 0b1111</span><br><span>diff --git a/src/mainboard/google/lars/spd/hynix_dimm_H9CCNNN8GTALAR-NUD-1G-1866.spd.hex b/src/mainboard/google/lars/spd/hynix_dimm_H9CCNNN8GTALAR-NUD-1G-1866.spd.hex</span><br><span>new file mode 100644</span><br><span>index 0000000..5c1332e</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/lars/spd/hynix_dimm_H9CCNNN8GTALAR-NUD-1G-1866.spd.hex</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+91 20 F1 03 05 19 05 03 03 11 01 08 09 00 40 05</span><br><span style="color: hsl(120, 100%, 40%);">+78 78 90 50 90 11 50 E0 90 06 3C 3C 01 90 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 CA FA 00 00 00 A8 00 88 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 80 AD 01 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+48 39 43 43 4E 4E 4E 38 47 54 41 4C 41 52 2D 4E</span><br><span style="color: hsl(120, 100%, 40%);">+55 44 00 00 80 AD 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span>diff --git a/src/mainboard/google/lars/spd/hynix_dimm_H9CCNNNBJTALAR-NUD-2G-1866.spd.hex b/src/mainboard/google/lars/spd/hynix_dimm_H9CCNNNBJTALAR-NUD-2G-1866.spd.hex</span><br><span>new file mode 100644</span><br><span>index 0000000..7c7c8d2</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/lars/spd/hynix_dimm_H9CCNNNBJTALAR-NUD-2G-1866.spd.hex</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+91 20 F1 03 05 19 05 0B 03 11 01 08 09 00 40 05</span><br><span style="color: hsl(120, 100%, 40%);">+78 78 90 50 90 11 50 E0 90 06 3C 3C 01 90 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 CA FA 00 00 00 A8 00 88 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 80 AD 01 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+48 39 43 43 4E 4E 4E 42 4A 54 41 4C 41 52 2D 4E</span><br><span style="color: hsl(120, 100%, 40%);">+55 44 00 00 80 AD 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span>diff --git a/src/mainboard/google/lars/spd/micron_dimm_MT52L256M32D1PF-107-1G-1866.spd.hex b/src/mainboard/google/lars/spd/micron_dimm_MT52L256M32D1PF-107-1G-1866.spd.hex</span><br><span>new file mode 100644</span><br><span>index 0000000..8694a40</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/lars/spd/micron_dimm_MT52L256M32D1PF-107-1G-1866.spd.hex</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+91 20 F1 03 05 19 05 03 03 11 01 08 09 00 00 05</span><br><span style="color: hsl(120, 100%, 40%);">+78 78 90 50 90 11 50 E0 90 06 3C 3C 01 90 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 10 CA FA 00 00 00 A8 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 80 2C 00 00 00 00 00 00 00 75 8C</span><br><span style="color: hsl(120, 100%, 40%);">+4D 54 35 32 4C 32 35 36 4D 33 32 44 31 50 46 31</span><br><span style="color: hsl(120, 100%, 40%);">+30 37 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span>diff --git a/src/mainboard/google/lars/spd/micron_dimm_MT52L512M32D2PF-107-2G-1866.spd.hex b/src/mainboard/google/lars/spd/micron_dimm_MT52L512M32D2PF-107-2G-1866.spd.hex</span><br><span>new file mode 100644</span><br><span>index 0000000..b059375</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/lars/spd/micron_dimm_MT52L512M32D2PF-107-2G-1866.spd.hex</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+91 20 F1 03 05 19 05 0B 03 11 01 08 09 00 00 05</span><br><span style="color: hsl(120, 100%, 40%);">+78 78 90 50 90 11 50 E0 90 06 3C 3C 01 90 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 21 CA FA 00 00 00 A8 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 80 2C 00 00 00 00 00 00 00 3D 51</span><br><span style="color: hsl(120, 100%, 40%);">+4D 54 35 32 4C 35 31 32 4D 33 32 44 32 50 46 31</span><br><span style="color: hsl(120, 100%, 40%);">+30 37 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span>diff --git a/src/mainboard/google/lars/spd/spd.c b/src/mainboard/google/lars/spd/spd.c</span><br><span>index 106eb83..d9fe579 100644</span><br><span>--- a/src/mainboard/google/lars/spd/spd.c</span><br><span>+++ b/src/mainboard/google/lars/spd/spd.c</span><br><span>@@ -106,7 +106,8 @@</span><br><span> memcpy(pei_data->spd_data[0][0], spd_file + spd_span, SPD_LEN);</span><br><span> </span><br><span> if (spd_index != MEM_SINGLE_CHAN0 && spd_index != MEM_SINGLE_CHAN3</span><br><span style="color: hsl(0, 100%, 40%);">- && spd_index != MEM_SINGLE_CHAN4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ && spd_index != MEM_SINGLE_CHAN4 && spd_index != MEM_SINGLE_CHAN7</span><br><span style="color: hsl(120, 100%, 40%);">+ && spd_index != MEM_SINGLE_CHANB && spd_index != MEM_SINGLE_CHANC) {</span><br><span> memcpy(pei_data->spd_data[1][0], spd_file + spd_span, SPD_LEN);</span><br><span> printk(BIOS_INFO, "Dual channel SPD detected writing second channel\n");</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/lars/spd/spd.h b/src/mainboard/google/lars/spd/spd.h</span><br><span>index d71487b..25cce5e 100644</span><br><span>--- a/src/mainboard/google/lars/spd/spd.h</span><br><span>+++ b/src/mainboard/google/lars/spd/spd.h</span><br><span>@@ -33,4 +33,7 @@</span><br><span> #define MEM_SINGLE_CHAN0 0x0</span><br><span> #define MEM_SINGLE_CHAN3 0x3</span><br><span> #define MEM_SINGLE_CHAN4 0x4</span><br><span style="color: hsl(120, 100%, 40%);">+#define MEM_SINGLE_CHAN7 0x7</span><br><span style="color: hsl(120, 100%, 40%);">+#define MEM_SINGLE_CHANB 0xb</span><br><span style="color: hsl(120, 100%, 40%);">+#define MEM_SINGLE_CHANC 0xc</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23569">change 23569</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/23569"/><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: I7cc9b01012b0b9ed72804192bb5953243fc859b4 </div>
<div style="display:none"> Gerrit-Change-Number: 23569 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>