From patchwork Wed Jun 28 19:13:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106569 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp270007qge; Wed, 28 Jun 2017 12:14:21 -0700 (PDT) X-Received: by 10.237.33.252 with SMTP id m57mr5176321qtc.33.1498677261635; Wed, 28 Jun 2017 12:14:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498677261; cv=none; d=google.com; s=arc-20160816; b=YWZKy+Yahbcaf+mJ+DxR0O6D7f8XnDjN5DBsUA2NDPjDRADZ56+AIW6IV1rXDNbaq6 hO2oGXjbuaMDCCkQTluzv0so8chwigfbn3zABGg6OubhDJjezZGHO9ON37D7FyY7udfM XGZmIz0/H5NA25yJquPNioCnpzHAjMwtVLMD4MelkDa2z+ibwSqfWpLc2QwL85YbS46K ay9LsHCs9VOsIjUuVLo9QevNHiEldUWxYaaHJmBU8+dfRITwy77CiyG3fZIiWzDnZRc3 28HYPcjTXerFJc1wyN1qjUjldHRg44CxOzkIyNl60aa7aH8wAiJt/mP/3P0v3xolx/tv zTyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=eeCqtujKjV+XT84S2w7kkF6NMXldge/PHCBYaHQ15eI=; b=QsgTyiMMHuqomGmeBz4KpMU8+PoHaFgX7f1we687snBTWEDSo4rjQVjPgdvJL4+A06 d1NTL6j5NlRoqa40n2Xtp5LUugCoC/RM2vUle9qhlJRw6nfvKJRqmYmdXFEP2SZ1Vdsa kYvbYti4WHJqvi6Xlsltvw7gVO3qsHyVUjBKdjesV4+0pSHcc0H03htcUVxCjOND/NT1 ebkABhnXB2RC0mtlOfjtgf4F3NZYsZUy2cn7XpfGbqa7hm37E6WAiWDwGlG5Q7bRqPdK a9zoGmOoVA3S6z8wjARmyIBQY8l3PXoVCls9dCjK1Uf/s9hDjRmbSQOeNQwkUiwSij+m Hwmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r50si2757557qtr.99.2017.06.28.12.14.21; Wed, 28 Jun 2017 12:14:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3D4CC60D4E; Wed, 28 Jun 2017 19:14:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0B0B160C1E; Wed, 28 Jun 2017 19:14:17 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3494E608C0; Wed, 28 Jun 2017 19:14:15 +0000 (UTC) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by lists.linaro.org (Postfix) with ESMTPS id A5BD5608C0 for ; Wed, 28 Jun 2017 19:14:03 +0000 (UTC) Received: by mail-wm0-f53.google.com with SMTP id i127so69096891wma.0 for ; Wed, 28 Jun 2017 12:14:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lueiPHtds3jcv7ZQh2y9h93M14K2feAFx7gSt3e4T0k=; b=ac3Ee2MkJVapA+E4W8a4501P1v5G2hQjF2DHpFdlNKmUl5uG+fzcvsbSLx+Od0Fk19 5mLyMSLS8aJyBx5qfV7BG90oamcVklX+vSKYqA7595ZFLLicdPycG3NYftMji/r5+L5I sDBeJmLtjpnhOmBZTFJCZFuOHKvG9cX2MtkbQWjjlJl7Q8Tvm5uyoVQ9v5oXQ8jfgSHU WO3zK/Dq9ZhZCeDO/BxckIFXNouENQ4sTNva6/wsKcC9rMkcYBWzukCGyvFhJk6DwyqH nGmpmS4McrS+xdwTunuKGhdmF9B5fxBdtrAfGPNnQLac8BRCepHcgDWYQTq+g7zaq11i wb7w== X-Gm-Message-State: AKS2vOwwBXnVqsevFlBPK/18MNmfnwi6KLdyxjQ86bJ+zEqI5k4fHZVO MU7UvlcVqDU0MnHOFtr0GbGy X-Received: by 10.28.223.86 with SMTP id w83mr7476773wmg.9.1498677242436; Wed, 28 Jun 2017 12:14:02 -0700 (PDT) Received: from localhost.localdomain ([105.133.250.69]) by smtp.gmail.com with ESMTPSA id s30sm4375824wrc.13.2017.06.28.12.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 12:14:01 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Wed, 28 Jun 2017 19:13:49 +0000 Message-Id: <20170628191349.5233-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170628191349.5233-1-ard.biesheuvel@linaro.org> References: <20170628191349.5233-1-ard.biesheuvel@linaro.org> Cc: rfranz@cavium.com Subject: [Linaro-uefi] [PATCH v2 2/2] Platforms/AMD/Cello: add Realtek MAC override driver X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Deal with the missing MAC address on the Cello Realtek NIC by incorporating an alternative driver that programs another MAC address, either the hardcoded default, or a custom value taken from a UEFI variable. To build the platform with this driver incorporated, and with the default MAC set to 00:E0:4C:97:3C:DC build -p OpenPlatformPkg/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc \ -D RENESAS_XHCI_FW_DIR=~/Downloads \ -D RTK8169_MAC_OVERRIDE=0x0,0xE0,0x4C,0x97,0x3C,0xDC On the individual boards, the MAC can be overridden locally by issuing the following command in the UEFI Shell (all on a single line) setvar Rtk8169MacOverride -guid 2a5e4deb-4445-4fb6-8b14-366b8e779b69 -nv -bs =00E04C973CDD which will set the local MAC to 00:E0:4C:97:3C:DD instead. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 15 ++++++++++++--- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 90cda24ae49d..a7b3e4bb2e32 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -17,9 +17,10 @@ ################################################################################ [Defines] -DEFINE NUM_CORES = 4 -DEFINE DO_KCS = 0 -DEFINE DO_FLASHER = FALSE +DEFINE NUM_CORES = 4 +DEFINE DO_KCS = 0 +DEFINE DO_FLASHER = FALSE +DEFINE RTK8169_MAC_OVERRIDE = 0x0 PLATFORM_NAME = Cello PLATFORM_GUID = 77861b3e-74b0-4ff3-8d18-c5ba5803e1bf @@ -476,6 +477,10 @@ DEFINE DO_FLASHER = FALSE gAmdStyxTokenSpaceGuid.PcdEnableSmmus|L"StyxEnableSmmus"|gAmdStyxVariableGuid|0x0|FALSE +!if "$(RTK8169_MAC_OVERRIDE)" != "0x0" + gOpenPlatformTokenSpaceGuid.PcdMacOverride|L"Rtk8169MacOverride"|gAmdStyxVariableGuid|0x0|{$(RTK8169_MAC_OVERRIDE)} +!endif + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -698,3 +703,7 @@ DEFINE DO_FLASHER = FALSE ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf } !endif + +!if "$(RTK8169_MAC_OVERRIDE)" != "0x0" + OpenPlatformPkg/Drivers/Net/Realtek8169MacOverride/Realtek8169MacOverride.inf +!endif diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 6f7428f0c4ca..30ea6ac08ab4 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -240,6 +240,10 @@ READ_LOCK_STATUS = TRUE } !endif +!if "$(RTK8169_MAC_OVERRIDE)" != "0x0" + INF OpenPlatformPkg/Drivers/Net/Realtek8169MacOverride/Realtek8169MacOverride.inf +!endif + [FV.STYX_EFI] FvAlignment = 16 ERASE_POLARITY = 1