<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30231">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/net/rt8168: support loading MAC address from vpd.bin<br><br>Adapted from earlier implementation for google/beltino<br><br>Test: build/boot on google/fizz, with RO_VPD region of<br>stock ChromeOS firmware injected into cbfs as vpd.bin.<br>Verify LAN MAC address correctly persisted.<br><br>Change-Id: If18ab2cd0148c1272cbe65c2ad8864ddd3b4ddf8<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/drivers/net/r8168.c<br>1 file changed, 12 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/30231/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c</span><br><span>index 5280cb6..a125ec3 100644</span><br><span>--- a/src/drivers/net/r8168.c</span><br><span>+++ b/src/drivers/net/r8168.c</span><br><span>@@ -113,17 +113,24 @@</span><br><span>                 /* Translate index number from integer to ascii */</span><br><span>           key[DEVICE_INDEX_BYTE] = (device_index - 1) + '0';</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  if (fmap_locate_area_as_rdev("RO_VPD", &rdev)) {</span><br><span style="color: hsl(0, 100%, 40%);">-          printk(BIOS_ERR, "Error: Couldn't find RO_VPD region.");</span><br><span style="color: hsl(0, 100%, 40%);">-          return CB_ERR;</span><br><span style="color: hsl(120, 100%, 40%);">+        if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+            if (fmap_locate_area_as_rdev("RO_VPD", &rdev)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        printk(BIOS_ERR, "Error: Couldn't find RO_VPD region.");</span><br><span style="color: hsl(120, 100%, 40%);">+                        return CB_ERR;</span><br><span style="color: hsl(120, 100%, 40%);">+                }</span><br><span style="color: hsl(120, 100%, 40%);">+             search_address = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(120, 100%, 40%);">+           search_length = region_device_sz(&rdev);</span><br><span style="color: hsl(120, 100%, 40%);">+  } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              search_address = cbfs_boot_map_with_leak("vpd.bin",</span><br><span style="color: hsl(120, 100%, 40%);">+                                                 CBFS_TYPE_RAW,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                        &search_length);</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-       search_address = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        if (search_address == NULL) {</span><br><span>                printk(BIOS_ERR, "LAN: VPD not found.\n");</span><br><span>                 return CB_ERR;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   search_length = region_device_sz(&rdev);</span><br><span>         offset = search(key, search_address, strlen(key),</span><br><span>                    search_length);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30231">change 30231</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/c/coreboot/+/30231"/><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-Change-Id: If18ab2cd0148c1272cbe65c2ad8864ddd3b4ddf8 </div>
<div style="display:none"> Gerrit-Change-Number: 30231 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>