<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28265">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/net/atl1e: Add driver<br><br>Change-Id: I5c32df00e25453c350a45e7f1ee6834b89c4289f<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/drivers/net/Kconfig<br>M src/drivers/net/Makefile.inc<br>A src/drivers/net/atl1e.c<br>M src/mainboard/asus/p5qc/Kconfig<br>4 files changed, 196 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/28265/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/net/Kconfig b/src/drivers/net/Kconfig</span><br><span>index bd6f09a..83d88c7 100644</span><br><span>--- a/src/drivers/net/Kconfig</span><br><span>+++ b/src/drivers/net/Kconfig</span><br><span>@@ -29,3 +29,19 @@</span><br><span> Please refer to RTL811x datasheet section 7.2 Customizable LED</span><br><span> Configuration for details. With this flag enabled, the</span><br><span> customized_leds variable will be read from devicetree setting.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config ATHEROS_ATL1E_SETMAC</span><br><span style="color: hsl(120, 100%, 40%);">+ bool</span><br><span style="color: hsl(120, 100%, 40%);">+ help</span><br><span style="color: hsl(120, 100%, 40%);">+ This sets the MAC address on boards featuring the atheros 1968:1026</span><br><span style="color: hsl(120, 100%, 40%);">+ card which lack an eeprom to store it.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config ATHEROS_ATL1E_MACADDRESS</span><br><span style="color: hsl(120, 100%, 40%);">+ string "Atheros AR8121/AR8113/AR8114 mac address"</span><br><span style="color: hsl(120, 100%, 40%);">+ depends on ATHEROS_ATL1E_SETMAC</span><br><span style="color: hsl(120, 100%, 40%);">+ default "90:e6:ba:24:f9:d2"</span><br><span style="color: hsl(120, 100%, 40%);">+ help</span><br><span style="color: hsl(120, 100%, 40%);">+ This is a string to set the mac address on an Atheros atl1e card.</span><br><span style="color: hsl(120, 100%, 40%);">+ It must be in the form of "xx:xx:xx:xx:xx:xx", where x is a</span><br><span style="color: hsl(120, 100%, 40%);">+ hexadecimal number for it to be valid. Failing to do so will</span><br><span style="color: hsl(120, 100%, 40%);">+ result in the default macaddress being used.</span><br><span>diff --git a/src/drivers/net/Makefile.inc b/src/drivers/net/Makefile.inc</span><br><span>index 20dbe50..33c8211 100644</span><br><span>--- a/src/drivers/net/Makefile.inc</span><br><span>+++ b/src/drivers/net/Makefile.inc</span><br><span>@@ -1,6 +1,7 @@</span><br><span> romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c</span><br><span> ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c</span><br><span> ramstage-$(CONFIG_REALTEK_8168_RESET) += r8168.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-$(CONFIG_ATHEROS_ATL1E_SETMAC) += atl1e.c</span><br><span> </span><br><span> ifneq ($(CONFIG_REALTEK_8168_MACADDRESS),"")</span><br><span> $(obj)/rt8168-macaddress: $(DOTCONFIG)</span><br><span>@@ -11,3 +12,13 @@</span><br><span> rt8168-macaddress-file := $(obj)/rt8168-macaddress</span><br><span> rt8168-macaddress-type := raw</span><br><span> endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ifneq ($(CONFIG_ATHEROS_ATL1E_MACADDRESS),"")</span><br><span style="color: hsl(120, 100%, 40%);">+$(obj)/atl1e-macaddress: $(DOTCONFIG)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo " Creating a file holding the atl1e macaddress"</span><br><span style="color: hsl(120, 100%, 40%);">+ printf %s $(CONFIG_ATHEROS_ATL1E_MACADDRESS) > $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cbfs-files-$(CONFIG_ATHEROS_ATL1E_SETMAC) += atl1e-macaddress</span><br><span style="color: hsl(120, 100%, 40%);">+atl1e-macaddress-file := $(obj)/atl1e-macaddress</span><br><span style="color: hsl(120, 100%, 40%);">+atl1e-macaddress-type := raw</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c</span><br><span>new file mode 100644</span><br><span>index 0000000..65fc511</span><br><span>--- /dev/null</span><br><span>+++ b/src/drivers/net/atl1e.c</span><br><span>@@ -0,0 +1,168 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2007 Atheros Corporation. All rights reserved.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2012 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2016 Damien Zammit <damien@zamaudio.com></span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2018 Arthur Heymans <arthur@aheymans.xyz></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</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%);">+ * This driver sets the macaddress of a Atheros AR8121/AR8113/AR8114</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%);">+#include <device/device.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <device/pci.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define REG_SPI_FLASH_CTRL 0x200</span><br><span style="color: hsl(120, 100%, 40%);">+#define SPI_FLASH_CTRL_EN_VPD 0x2000</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define REG_PCIE_CAP_LIST 0x58</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define REG_MAC_STA_ADDR 0x1488</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static u8 get_hex_digit(const u8 c)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 ret = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = c - '0';</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret > 0x09) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = c - 'A' + 0x0a;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret > 0x0f)</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = c - 'a' + 0x0a;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret > 0x0f) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "Error: Invalid hex digit found: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "%c - 0x%02x\n", (char)c, c);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</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%);">+#define MACLEN 17</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static enum cb_err fetch_mac_string_cbfs(u8 *macstrbuf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cbfsf fh;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t matchraw = CBFS_TYPE_RAW;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cbfs_boot_locate(&fh, "atl1e-macaddress", &matchraw)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* check the cbfs for the mac address */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rdev_readat(&fh.data, macstrbuf, 0, MACLEN) != MACLEN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "atl1e: Error reading MAC from CBFS\n");</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%);">+ return CB_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void get_mac_address(u8 *macaddr, const u8 *strbuf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t offset = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((strbuf[2] != ':') || (strbuf[5] != ':') ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (strbuf[8] != ':') || (strbuf[11] != ':') ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (strbuf[14] != ':')) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "atl1e: ignore invalid MAC address in cbfs\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+ for (i = 0; i < 6; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ macaddr[i] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ macaddr[i] |= get_hex_digit(strbuf[offset]) << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ macaddr[i] |= get_hex_digit(strbuf[offset + 1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ offset += 3;</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%);">+static void program_mac_address(struct device *dev, u32 mem_base)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 macstrbuf[MACLEN] = { 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Default MAC Address of 90:e6:ba:24:f9:d2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 mac[6] = { 0x90, 0xe6, 0xba, 0x24, 0xf9, 0xd2 };</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 value;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fetch_mac_string_cbfs(macstrbuf) != CB_SUCCESS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "atl1e: Error reading MAC from CBFS,"</span><br><span style="color: hsl(120, 100%, 40%);">+ " using default 90:e6:ba:24:f9:d2\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ get_mac_address(mac, macstrbuf);</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%);">+ printk(BIOS_DEBUG, "atl1e: Programming MAC Address...");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ value = (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | (mac[5] << 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ write32((void *)mem_base + REG_MAC_STA_ADDR, value);</span><br><span style="color: hsl(120, 100%, 40%);">+ value = (mac[0] << 8) | (mac[1] << 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ write32((void *)mem_base + REG_MAC_STA_ADDR + 4, value);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "done\n");</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%);">+static int atl1e_eeprom_exist(u32 mem_base)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 value = read32((void *)mem_base + REG_SPI_FLASH_CTRL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (value & SPI_FLASH_CTRL_EN_VPD) {</span><br><span style="color: hsl(120, 100%, 40%);">+ value &= ~SPI_FLASH_CTRL_EN_VPD;</span><br><span style="color: hsl(120, 100%, 40%);">+ write32((void *)mem_base + REG_SPI_FLASH_CTRL, value);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ value = read32((void *)mem_base + REG_PCIE_CAP_LIST);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ((value & 0xff00) == 0x6c00) ? 1 : 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%);">+static void atl1e_init(struct device *dev)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the resource of the NIC mmio */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct resource *nic_res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 mem_base = nic_res->base;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if(atl1e_eeprom_exist(mem_base)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_INFO, "atl1e NIC has SPI eeprom, not setting MAC\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+ /* Check if the base is invalid */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mem_base) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "atl1e: Error cant find MEM resource\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Enable but do not set bus master */</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_write_config16(dev, PCI_COMMAND,</span><br><span style="color: hsl(120, 100%, 40%);">+ PCI_COMMAND_MEMORY | PCI_COMMAND_IO);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Program MAC address based on CBFS "macaddress" containing</span><br><span style="color: hsl(120, 100%, 40%);">+ * a string AA:BB:CC:DD:EE:FF */</span><br><span style="color: hsl(120, 100%, 40%);">+ program_mac_address(dev, mem_base);</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%);">+static struct device_operations atl1e_ops = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .read_resources = pci_dev_read_resources,</span><br><span style="color: hsl(120, 100%, 40%);">+ .set_resources = pci_dev_set_resources,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enable_resources = pci_dev_enable_resources,</span><br><span style="color: hsl(120, 100%, 40%);">+ .init = atl1e_init,</span><br><span style="color: hsl(120, 100%, 40%);">+ .scan_bus = 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%);">+static const struct pci_driver atl1e_driver __pci_driver = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .ops = &atl1e_ops,</span><br><span style="color: hsl(120, 100%, 40%);">+ .vendor = 0x1969,</span><br><span style="color: hsl(120, 100%, 40%);">+ .device = 0x1026,</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%);">+struct chip_operations drivers_net_ops = {</span><br><span style="color: hsl(120, 100%, 40%);">+ CHIP_NAME("Atheros AR8121/AR8113/AR8114")</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span>diff --git a/src/mainboard/asus/p5qc/Kconfig b/src/mainboard/asus/p5qc/Kconfig</span><br><span>index 605dfd7..cf71b64 100644</span><br><span>--- a/src/mainboard/asus/p5qc/Kconfig</span><br><span>+++ b/src/mainboard/asus/p5qc/Kconfig</span><br><span>@@ -28,6 +28,7 @@</span><br><span> select HAVE_OPTION_TABLE</span><br><span> select HAVE_CMOS_DEFAULT</span><br><span> select HAVE_ACPI_RESUME</span><br><span style="color: hsl(120, 100%, 40%);">+ select ATHEROS_ATL1E_SETMAC</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28265">change 28265</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/28265"/><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: I5c32df00e25453c350a45e7f1ee6834b89c4289f </div>
<div style="display:none"> Gerrit-Change-Number: 28265 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>