<p>Richard Spiegel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23825">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common/block/pi/amd_late_init.c: Fix part number<br><br>Some DIMMs have invalid strings when it comes to part number (bytes<br>0x149-0x15c). It should be ASCIIZ with unused space filled with white<br>spaces (ASCII 0x20). Byte 20 should be 0, all others should be ASCII.<br>Create a test that detects invalid strings and replace them with "NA",<br>while truncating valid strings to 18 characters (dimm->module_part_number<br>has 19 bytes and byte 19 has to be 0).<br><br>BUG=b:73122207<br>TEST=Build, boot and record serial output for kahlee while injecting<br>different strings to dmi17->PartNumber. Use code to examine SMBIOS,<br>while testing different valid and invalid strings, testing corner cases.<br>Remove string injection before committing.<br><br>Change-Id: I427262873f9ec80f459245e5f509e28a68de3074<br>Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M src/soc/amd/common/block/pi/amd_late_init.c<br>1 file changed, 35 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/23825/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/amd/common/block/pi/amd_late_init.c b/src/soc/amd/common/block/pi/amd_late_init.c</span><br><span>index 68f15ed..66684af 100644</span><br><span>--- a/src/soc/amd/common/block/pi/amd_late_init.c</span><br><span>+++ b/src/soc/amd/common/block/pi/amd_late_init.c</span><br><span>@@ -25,6 +25,35 @@</span><br><span> #include <amdblocks/agesawrapper.h></span><br><span> #include <amdblocks/agesawrapper_call.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int validate_part_number(char *buffer)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int valid, space, i;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ch;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ valid = 0; /* valid until proven invalid */</span><br><span style="color: hsl(120, 100%, 40%);">+ space = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 19; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ch = buffer[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch < 0x20)</span><br><span style="color: hsl(120, 100%, 40%);">+ valid = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch == 0x20)</span><br><span style="color: hsl(120, 100%, 40%);">+ space++;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ch > 0x20) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (space > 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ valid = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ space = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * dimm->module_part_number is 19 bytes, with last byte 0.</span><br><span style="color: hsl(120, 100%, 40%);">+ * dmi17->PartNumber is 21 bytes with last byte 0. So truncate</span><br><span style="color: hsl(120, 100%, 40%);">+ * string just in case it's valid.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ buffer[18] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return valid;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void transfer_memory_info(TYPE17_DMI_INFO *dmi17, struct dimm_info *dimm)</span><br><span> {</span><br><span> size_t len, destlen;</span><br><span>@@ -49,8 +78,12 @@</span><br><span> dimm->bus_width = dmi17->DataWidth;</span><br><span> dimm->mod_id = dmi17->ManufacturerIdCode;</span><br><span> dimm->bank_locator = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- strncpy((char *)dimm->module_part_number, "NA",</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(dimm->module_part_number));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (validate_part_number(dmi17->PartNumber))</span><br><span style="color: hsl(120, 100%, 40%);">+ strncpy((char *)dimm->module_part_number, "NA",</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(dimm->module_part_number));</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ strncpy((char *)dimm->module_part_number, dmi17->PartNumber,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(dimm->module_part_number));</span><br><span> }</span><br><span> </span><br><span> static void prepare_dmi_17(void *unused)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23825">change 23825</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/23825"/><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: I427262873f9ec80f459245e5f509e28a68de3074 </div>
<div style="display:none"> Gerrit-Change-Number: 23825 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>