From patchwork Mon Feb 7 23:41:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1589614 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=RAlEJjja; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jt2kZ56mVz9s09 for ; Tue, 8 Feb 2022 10:42:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AAFCD83B58; Tue, 8 Feb 2022 00:42:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="RAlEJjja"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2302083C0A; Tue, 8 Feb 2022 00:42:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20618.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::618]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1F6DD83841 for ; Tue, 8 Feb 2022 00:42:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DJEKAGc5W4vI7NOuxoru3TxPwHmMJBcX+4QmhcG+bjcIV+Ed2wKa9mmWtSnFODbdZrwsjMXrqZpXRzn2FC9rIO8be/zm5JqpSDOevnF2zUALUlg3gdTewsTektJdBy16paujMUJqBYrt1RGIaxaFVz5naw18GBqwb1JSJm30AxXgh8Rc1u2GHmgHDu9ggDsPf8A/Ic9psnJKqi7o3KTUZU40lB36rrXvqlFjU9cdBpAXaCZUAVKYbblQQeHHAq4Ddzux6bzitcNs0ZjNxv5MZugYoD7+salYuy3fiyaTm7wnkMZydEQCXQCSGt58pR9Ke6Nklqh67EpFCvy7ZM7sJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XG6xwyFzr+1sTmFPOnFaulVUdalvanYC/BzTWYWj07c=; b=cF6ncQGn3agChmg8IxNcw5IsLZ7vuKYyYXAHDOX5ZQZmlDPdO7sJXsdJsgIiydTdZzbethkjnkGUXw6vLMFAdlWBCtszM3JjXJsFDPvHmfbzh1qDzVGtomVlIPsXkJyVC0jeExknHsjkz7SQsZzcrtLXnv7YVHqCpEYXFKYLIMYwGMvQJkn4gVIjDps4H1bic9WbJgyODgF5wZtabYWnBJR7Db6ECMBPNdwSPBhyYscpAAmJ45sy0YHgzJIyXeNr2OkOgjSj+6BiUX/XcDcli9WqVNCtccbmRAJX8XehFalYcHKOsdOygZbDj54aV3TNyTYgApQ+YWw4umF60ETYAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XG6xwyFzr+1sTmFPOnFaulVUdalvanYC/BzTWYWj07c=; b=RAlEJjjadCANMQWhBQbg9kyWjsRFjHwiuacUtt+BO5EFxj7mVAp9P2NjepEztlVKzCnwTGuTMqRuR2exz1rpck3pmCNDtnpYUk6N5frrnQxWDh/VMFYkh3KRf5kN53bXO9wLCbqkfJztSJzDSH3/In7EVJpHfJeNbEI2If2e29yVPqzTjxqYXI8BF8+OWwyTKOS7gNX0pvJ+PkmQUFo7MUeHL/vR8yI4Mwyu8CqxmysX4g7l0KC9Wrgp3Zpp+7+HD9KJQRZ+mSiIQ9L/wo0Q2gpmt3OhEcgNJbQ2624m/ngi+APLRGr3UIVoH/g33GrvHaCZb5blUklVIyap5Bx7kA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by AM9PR03MB7377.eurprd03.prod.outlook.com (2603:10a6:20b:26a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Mon, 7 Feb 2022 23:42:25 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::ed45:f086:5e82:fccd]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::ed45:f086:5e82:fccd%4]) with mapi id 15.20.4951.018; Mon, 7 Feb 2022 23:42:25 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Simon Glass Cc: Ramon Fried , Joe Hershberger , Tom Rini , Heinrich Schuchardt , Mario Six , Sean Anderson Subject: [PATCH 01/14] sandbox: net: Remove fake-host-hwaddr Date: Mon, 7 Feb 2022 18:41:59 -0500 Message-Id: <20220207234212.685316-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220207234212.685316-1-sean.anderson@seco.com> References: <20220207234212.685316-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR13CA0024.namprd13.prod.outlook.com (2603:10b6:208:160::37) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f45942f-3f43-43e0-f625-08d9ea937e82 X-MS-TrafficTypeDiagnostic: AM9PR03MB7377:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:499; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lo1PE57/F36AijF8qy2V4PsVetRK1QJ3RwSFY6ghtRyjjwn63fkdh9u7/UNymL2khhNlCmUaG6/yifn6dNqLYcIcxxJuIuu6Xogsi/NIq4cUiej8MLFRvS68wYl4MHPAHzC2l60Gh72r6BKFJPRbYxCfiL7ITN/SKzec8aH/a+2rfIewtSczsck9PpKfCjAMjhxykLYX/8tLdzIXQjbBoxFQKYimOgjlzEfjYMEiU1JKmdnHd1MKMCeVZjcK5YXz8NAShNqcHUcO6JxyJ0qu9BHPrj0PhvCdyPSXNjgCui0BmtZvx85DB6Dj4vgWKy879+vtThxizKE7mOZGQmC7syKOjIJvOZ6jwBvoIY3e9/4G4WOsJJiKi9kvfvVcmLZcvufFdEP4md4MG95isWSvs9u4956diIqtOzr7Lb2SV9D7knqiMzQmunMG1aZXJbLQhHqj3TArmtpmtnz9OzjqWh6PrfFgRj1InacnNgiIledIpRLs5+OIdUuqezJoLaI9qJVwQa7HtdvxdxtFRdpQMsaVomBue0ihH6NDh3ybIwFRvRoVQ/QH3Q178Z19gJWSxh3IY6VtQ1d88L4gPgWbhgZPgQ42M8s6IXvPuZezgoCeILGMCjHaauKvwjiMKtMnbWMtzdxdEuY7kZvII6mPbbRtXeIHWJ62IP3zH7Xghxm1Md59kfrKv9lojHb14mqEtNgcWVOKEgMxb/MfF3b4Zw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(8676002)(66476007)(66556008)(4326008)(66946007)(52116002)(36756003)(2906002)(6666004)(6506007)(83380400001)(8936002)(86362001)(44832011)(5660300002)(186003)(1076003)(26005)(6512007)(107886003)(38350700002)(508600001)(38100700002)(316002)(54906003)(6916009)(6486002)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9xUd5xdFcXHQM0BQp2pYCB5KPysrv5aQ9NT1+3tvgVrUs+5G6jkJdE2Jh/SRgdTzHvd6aiNeHfa8sgODbrjFVGpMJyAv+7RiF2b9Px48eEvfkd+jPiru3YXwRKUnr9Iif2zNjUZVVLGOjTeo5rVeWm6Kpg70UEqA2YXPpyK2P5NSP+FTMtyumIftoP9SWUstCWfVJuFjc4P60JHKMKf1ixs3SMZ1hGwv5Gq+GPo33YiEx2F/9fAid2/VpH6Kzgi4bK8FXUTNNbw+CUUI9Z5C2ZAEVEiJEHCORJN9YrutAOKdYGaPSSUj6ayKsUrxEbnqWFR6Z9vMO/ugjJt5/FC+rr6GRU2HjG/BBa8Ubuvvd24Ii2zDnIFjWdnM6x7iRvLjG6PAkTjCa210lPINJFt1XXTlPni4rcbHRjm1DA03bdQQV+cZAxl/fGPtzD6+f9uxkISRh3/S5bnQASMmBiqBCzTRmp0ugQZ/5yxMLI5ntMUTZFEj5uB8XbODoNXtbi7ePLf+/9puLXd1aAcmvmcdJk9m8mD8+PbFmZYNOADEJDz0dsrY+VeagsFBE4QdEYOsQQJAhGbZr5TC2l20+PyaxENdBtng06weScC9POhoDiBYOyIjUpH2QWzc55G7pzbz4c5R497tQ/kvWg2ph/wcx+gGyOO3IluqWThAnv9q3mfXo7LH1bOpWs521z6oyEN0qh7LZF4gIOWptCdJPfBKZogEX5bqY/BPpXJRNQqNKC9+s+U0I755VlLO49nCk1U4SdCHhUhF+WDVmmR9FZUxXrMuacLTvtI6vTtlH8l7FxzpPtJnM1QsmXUH4okiTJvRD8xyi0H5ZEI57vHcUBWq/hGjFG0MhIcsDre1DZCIDP7Q0zmtUSX9Wmtc13nhQHvVeQcGutFOYTgLD31YfB9w3Xb4QJj5gGaDJz4+ccE7QhHWkiJjIMjqNEOQwsT3wfs5PYySDRJQZbIJGAdxg9K64XetPeWWrzjHBJBecXoeXSntD2J3GlUaib6ve6SmcxJU1cQ7yNpQpEdizQeUSL5WaH5OFYggsxnWu891MIF9hedgfpHM8BDywvbKCwT/ImxDByGkFzsqvTY5zKTiTVtF4DYTcC46+vF084ZwTDPAjJlCQyo81wsyxG/QnpkvYAxTvuAkoh3CRICm2amjuXu1ysLTgyxysJakMRpJYyr3Ddrw0wLv0KNI+8kS491YNj0OlAbBuxQcVEEhFngGYmyRWOE22tla7ktnQl3dxY1QG35weMATn8q+XIAEB3b+MzzJGvrsW9p7ugE0FXbl67Np+rX3visXDo4djwcElguQ8gLndeTZB3PO0yyexrXS4DssVkKuUBUo8JVlZVdklR9DNEy7JTLIxuiUhBhzBEkSa9BCRHp1ByU2huqGhmpMMhA8y+InPTLTvetjWxL5bWVGlEcGjlkOwa+RGplwTLTPwPpA69D0+B7jAVJTerweHxJOqKLoNmE206Pf5vqh68lSzc8JfEYxzYYlvaqC0p5Rfjhp+tnJM4sj8uuhCGS34792aH/KOSmUaLTNy8/tMXg5CoihafLlqOU11/6/D+Vbh55qOFqeQKRXouLwwBEykeTJkWS8s4smI66VWtQgv6jFiEhUkGia9b4JLKvT3zy5Ik0= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f45942f-3f43-43e0-f625-08d9ea937e82 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2022 23:42:25.4333 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hTftBOgNLPir1A/l8FcGwnTF/SNZVNSlQC40zlSzLunUiKNEKuww7ZFmLbmcaAxOUrbGtKNIQVc4synLGCfvcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB7377 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Instead of reading a pseudo-rom mac address from the device tree, just use whatever we get from write_hwaddr. This has the effect of using the mac address from the environment (or from the device tree, if it is specified). Signed-off-by: Sean Anderson Reviewed-by: Simon Glass Acked-by: Ramon Fried --- arch/sandbox/dts/sandbox.dts | 1 - arch/sandbox/dts/sandbox64.dts | 1 - arch/sandbox/dts/test.dts | 5 ----- drivers/net/sandbox.c | 10 ++-------- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 127f168f02..840b8b503f 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -63,7 +63,6 @@ eth@10002000 { compatible = "sandbox,eth"; reg = <0x10002000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 00]; }; i2c_0: i2c@0 { diff --git a/arch/sandbox/dts/sandbox64.dts b/arch/sandbox/dts/sandbox64.dts index ec53106af9..3eb0457089 100644 --- a/arch/sandbox/dts/sandbox64.dts +++ b/arch/sandbox/dts/sandbox64.dts @@ -58,7 +58,6 @@ eth@10002000 { compatible = "sandbox,eth"; reg = <0x0 0x10002000 0x0 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 00]; }; i2c_0: i2c@0 { diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 48ca3e1e47..5f3332a417 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -506,31 +506,26 @@ eth@10002000 { compatible = "sandbox,eth"; reg = <0x10002000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 00]; }; eth_5: eth@10003000 { compatible = "sandbox,eth"; reg = <0x10003000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 11]; }; eth_3: sbe5 { compatible = "sandbox,eth"; reg = <0x10005000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 33]; }; eth@10004000 { compatible = "sandbox,eth"; reg = <0x10004000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 22]; }; dsa_eth0: dsa-test-eth { compatible = "sandbox,eth"; reg = <0x10006000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 66]; }; dsa-test { diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index 37459dfa0a..13022addb6 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -395,9 +395,11 @@ static void sb_eth_stop(struct udevice *dev) static int sb_eth_write_hwaddr(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); + struct eth_sandbox_priv *priv = dev_get_priv(dev); debug("eth_sandbox %s: Write HW ADDR - %pM\n", dev->name, pdata->enetaddr); + memcpy(priv->fake_host_hwaddr, pdata->enetaddr, ARP_HLEN); return 0; } @@ -419,16 +421,8 @@ static int sb_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct eth_sandbox_priv *priv = dev_get_priv(dev); - const u8 *mac; pdata->iobase = dev_read_addr(dev); - - mac = dev_read_u8_array_ptr(dev, "fake-host-hwaddr", ARP_HLEN); - if (!mac) { - printf("'fake-host-hwaddr' is missing from the DT\n"); - return -EINVAL; - } - memcpy(priv->fake_host_hwaddr, mac, ARP_HLEN); priv->disabled = false; priv->tx_handler = sb_default_handler;