<p>Gaggery Tsai has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22984">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/net: Add deivce index for multiple NIC cards<br><br>This patch adds a member device_index to r8168 chip information which<br>allows driver to indetify which NIC card requests MAC address.<br>In this implmentation, only 10 NIC cards are supported, the device<br>index is in the range of 0 to 9.<br><br>BUG=b:69950854<br>BRANCH=None<br>TEST=Added device_indexi = [0-9] under /drivers/net in device tree &&<br> Programmed the mac address to VPD in shell<br> vpd -s ethernet_mac[0-9]=<mac address> && reboot the system.<br> Ensure the MAC address was fetched correctly by ifconfig command.<br><br>Change-Id: I108b9bfba39370c8906a2fa4d2b39b106e884e0c<br>Signed-off-by: Gaggery Tsai <gaggery.tsai@intel.com><br>---<br>M src/drivers/net/chip.h<br>M src/drivers/net/r8168.c<br>2 files changed, 18 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/22984/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/net/chip.h b/src/drivers/net/chip.h</span><br><span>index 8e8c02b..5d253dc 100644</span><br><span>--- a/src/drivers/net/chip.h</span><br><span>+++ b/src/drivers/net/chip.h</span><br><span>@@ -16,7 +16,8 @@</span><br><span> </span><br><span> struct drivers_net_config {</span><br><span> uint16_t customized_leds;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned wake; /* Wake pin for ACPI _PRW */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned wake; /* Wake pin for ACPI _PRW */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned device_index; /* Indentify device number */</span><br><span> };</span><br><span> </span><br><span> #endif /* __DRIVERS_R8168_CHIP_H__ */</span><br><span>diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c</span><br><span>index 4c17017..74c8f87 100644</span><br><span>--- a/src/drivers/net/r8168.c</span><br><span>+++ b/src/drivers/net/r8168.c</span><br><span>@@ -91,13 +91,22 @@</span><br><span> </span><br><span> #define MACLEN 17</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static enum cb_err fetch_mac_string_vpd(u8 *macstrbuf)</span><br><span style="color: hsl(120, 100%, 40%);">+static enum cb_err fetch_mac_string_vpd(u8 *macstrbuf, const u8 device_index)</span><br><span> {</span><br><span> struct region_device rdev;</span><br><span> void *search_address;</span><br><span> size_t search_length;</span><br><span> size_t offset;</span><br><span style="color: hsl(0, 100%, 40%);">- char key[] = "ethernet_mac";</span><br><span style="color: hsl(120, 100%, 40%);">+ char key[] = "ethernet_mac "; /* Leave a space at tail to stuff an index */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Limit up to 10 (0-9) NIC MAC address from VPD at this moment</span><br><span style="color: hsl(120, 100%, 40%);">+ * , but will we have 10 more NIC cards?</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%);">+ /* Translate index number from integer to ascii, base '0' is 0x30 */</span><br><span style="color: hsl(120, 100%, 40%);">+ key[12] = device_index + 0x30;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "Requesting %s from VPD.\n", key);</span><br><span> </span><br><span> if (fmap_locate_area_as_rdev("RO_VPD", &rdev)) {</span><br><span> printk(BIOS_ERR, "Error: Couldn't find RO_VPD region.");</span><br><span>@@ -172,10 +181,14 @@</span><br><span> int i = 0;</span><br><span> /* Default MAC Address of 00:E0:4C:00:C0:B0 */</span><br><span> u8 mac[6] = { 0x00, 0xe0, 0x4c, 0x00, 0xc0, 0xb0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct drivers_net_config *config = dev->chip_info;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!config)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> /* check the VPD for the mac address */</span><br><span> if (IS_ENABLED(CONFIG_RT8168_GET_MAC_FROM_VPD)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (fetch_mac_string_vpd(macstrbuf) != CB_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fetch_mac_string_vpd(macstrbuf, config->device_index) != CB_SUCCESS)</span><br><span> printk(BIOS_ERR, "r8168: mac address not found in VPD,"</span><br><span> " using default 00:e0:4c:00:c0:b0\n");</span><br><span> } else {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/22984">change 22984</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/22984"/><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: I108b9bfba39370c8906a2fa4d2b39b106e884e0c </div>
<div style="display:none"> Gerrit-Change-Number: 22984 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Gaggery Tsai <gaggery.tsai@intel.com> </div>