From patchwork Thu May 5 17:11:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1627057 X-Patchwork-Delegate: trini@ti.com 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=cVe5yq3O; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KvKyt72Nmz9sCq for ; Fri, 6 May 2022 03:13:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 29192840DA; Thu, 5 May 2022 19:12:24 +0200 (CEST) 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="cVe5yq3O"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2722E8408D; Thu, 5 May 2022 19:12:18 +0200 (CEST) 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 EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::605]) (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 C285B83FF8 for ; Thu, 5 May 2022 19:12:14 +0200 (CEST) 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=UF5mDW8Itd5bOngnXt+Da6R6DP559cqIzX8IRysibIvKXPUhMHCV7Ifs92tQZ6Ih4hLudfNZHvHSgt0GMn/V2d/kgUV3tx7VqaeNXMuHIC8U4r0blN4MNpQm+nrUAFPAQHn4GOThm9FQAWDTyT7pkEQjB5ig6ZkDwfL5u56Dr0hFCpbBrbxbwlAkXmmE5DHzoqj6bqZDGSIYbm3qOm5OGYPxaLwWy0PN+FIFdbOTkr5C/SNUIefhBuQl7lvNPbPnV+y/18Upn8MmWw+Li7S/BzrAc6nrh6gr9OYYNxOSJIDCMwAyA+J/dQgrsiyDDrLnMu06ravMN1sUGMxGXKbIEA== 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=HV59IGXP9hmzXp+7/tsq+GqWaK7eZ7MK2v+IGooEV1c=; b=NRO2r5RYcnu7Lpz3aRyhMaBVj5pIRzQphQDOf9N0S6MTY2Ypds6eLfr7HOPmd9t4n9PXnzKpR56FwblemlIW8/EPWGK7s2Ccm3UGMaD8lcSjDYZ0NaiPesESsjCTviSOJPZ+96A4W/PsFrWj8GJ1MzZn7S4v2XnqJeWtOtoQCRqxMVc/VrAV2x2HeragBd31bGbLwg+zQofdEYgoRX9fS+G3YLNII/d5GDImFxvS4fvNRn5dlnXx7v5hyVfIrqnARx3Veg6l12HQlSFggClytbFMfCTsDw+l6qvCgcmBrt+EpwEkVHBVW65LTPxGF284zNCDr4hhJjZ9FG+QxQTbzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; 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=HV59IGXP9hmzXp+7/tsq+GqWaK7eZ7MK2v+IGooEV1c=; b=cVe5yq3OcBS9EXK22JMdvSmzXjYD1g/v3nGyA4tRyJmiSY2LYa21Wvp2AytkHIHUQgrRCzPLr3lqLDoH1m6ElLUJKv2wefyY/vNke6BRpdjp3F+mc5Z2VAmF+HEpl+Oou2JVv6YmEGkYZsnt4PdNj2xi6p7VDvt15SCHGHvcIqeDpxZbHZhh5dmZKeBt3zfIN4sLw0yi3SNamhqiKtthWxkc7EAz9TfzoQDKYqD/0Xj0Q/NSrXwOYRG3H51bT8cmsGbZD99Y7eJ6Ek4z/Ld3z1A3AB8lx9FeVrfsoWoCknyprSDtKpePQl70X8Bf1JhjsM3tEIfzWxt5tPNkO82MHg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from VI1PR03MB4973.eurprd03.prod.outlook.com (2603:10a6:803:c5::12) by VI1PR03MB4397.eurprd03.prod.outlook.com (2603:10a6:803:51::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.27; Thu, 5 May 2022 17:12:13 +0000 Received: from VI1PR03MB4973.eurprd03.prod.outlook.com ([fe80::dc24:d72c:4fe6:847e]) by VI1PR03MB4973.eurprd03.prod.outlook.com ([fe80::dc24:d72c:4fe6:847e%7]) with mapi id 15.20.5206.027; Thu, 5 May 2022 17:12:13 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Simon Glass Cc: Heinrich Schuchardt , Mario Six , Ramon Fried , Tom Rini , Joe Hershberger , Sean Anderson Subject: [PATCH v4 04/16] sandbox: net: Remove fake-host-hwaddr Date: Thu, 5 May 2022 13:11:33 -0400 Message-Id: <20220505171146.557773-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220505171146.557773-1-sean.anderson@seco.com> References: <20220505171146.557773-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR05CA0044.namprd05.prod.outlook.com (2603:10b6:208:236::13) To VI1PR03MB4973.eurprd03.prod.outlook.com (2603:10a6:803:c5::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c457ded-c260-47c6-bec5-08da2eba65f0 X-MS-TrafficTypeDiagnostic: VI1PR03MB4397:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4+nj5ZKC31p2DedHSHwS8aC06ETc8mIhHpfUQBCnucDyrmSMSeJJYkQlsHW7Qjv9mu82Ax5hpNuoJ3KS+eBIja9uxucoEoYWHIjJCXFymTi7bDMOXMviTCmd20KqMcXn6ewVEuFimaLW5i1N9WpoFrrDiHjCrmu14gBfG5RdE9PHlqKDpzCrXH/KggyygSydm+5XHnV2YHe16hcFsab8Ms3qndymMn+HGYYh1KQI24hCy6Vmjrxt9YINosLFV/H47kQcvdhtPQp6zw4I9/OvzstYKWtLTiuQq3P1lEbWF/+NsW8cFkZE8MG2hFW0E+/XB1nQQlVjpUVYThWXOBekI7J7TYwY7IRr50v7CxbZpxTvrhSpi78mdaDeWvod6r8fT0PyZZPe8+0xig3QFyoUB/IhY5+Ja7n1Ab2B7WeEu9WsNlTmqfBX84ZtqH7JJSxj7j5DxSsC5vXkVDWpMNhqnAZE9UxfGPkAkE2OTySxJhdE67nrHlVj2/4Pu/56AJB7w9AUmG9aAEm2eI72ogzSrySz96gAvmgJHT+5onLyxCkxNr2SO4LteI0Ktpu39fJmLYqRdU2MVWiMhNjpb7AhaK7gdzwDjYU7OA+zqhPewf9apnQTLpARRPHuDxkCXhnBsqGgaU07DLmixpf+G9bQfNWHKJ9qDov0VEZwId8iO45TS7H0sOLgIgchFRGNy8na3O4U/GAdACrcz8lhG3hn/Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR03MB4973.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(8936002)(4326008)(66476007)(86362001)(66946007)(66556008)(8676002)(44832011)(2906002)(5660300002)(38350700002)(38100700002)(52116002)(54906003)(6916009)(508600001)(316002)(186003)(26005)(2616005)(6506007)(6512007)(6666004)(6486002)(1076003)(107886003)(83380400001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Epqwc7UJiSVXOymxYCjbK1Np+zzYvtFlQFlKLVIr7kmXpWX0XZFKuAB2hbY7SnHdHWdWuEhJwVzZauUVuBL3kC52rCHI/amffXj/kOhpIvCRjnpdYialR/pwKtsAWwNfwtibBmVrG4Ue57EX6/GSzMIPA3Lkh94e3rUUpTRM5qQD0Qq55vY5RYJlpaRFPrC32pWI0dNCzI0dD/ux6iKcYfwNxDMIf/qMgL4UMf/lgW8NAPtMw4gVQPdM89yiBtkOLj0QKurUqmUxJHxG18svp3varbXs0YsrfBbg19CpLPN46sQwRxKBRqpua0xo2Jw9ehEUZLhl2TspBdP8QCybTBDer6fj5+s+DMFx2JljUVG/grZEutWH3Tr/ZZ5igD9k/34Nc13id5BJhMOIVx8WUvzveC5+kWBAQiRSTzXHIB54KQtlIh/PMYf+JUxopQEYEjtagdRsxmBLoWSXwDiIyf/FzG8SrmAwmho0xUgvdXRISmxrd52fQJdzOBMN3Md7mM/D7ATTSdpObAqEeGflxplwen7yX7yA795O7VI52UfVGvLnVHsQ08Kx2KdU8CPfayUr/FJX9MVNYLgRMoRrAV+FEuH0zg3RfoHktnDFAMB4XYB0bY4LSLXjbdnGZRxkC0mz1EdfsojpOmc/gJu6eo4r+zn4MuYgM+mlN9NV1oaDiH1rU8kDT4LUqzVAN77COoIkmCkifRuwJ0W0SrbDPIr+HdtDi33dYMoCDOsepTFZMg51t+ONRUv6iN5L5Cv0xVFKTF3ZMob4+w19zHy46TfIlYuvna4+QCWyO71FmjWrqQyYif6B6li1oG/MX5ev2M7Ta0iAV6F8030rk8KcCS88Q1ckUknITdSKcwhCaYzvAg6yRka2LBFewpTsyAPdG5UdMYPrrHiimkDKyRkUqO7rqQox2KZ8guStsOlJq8sWMPnmj85bgD1Q0kExvZYNFy2ezlLQ1uR+h7u85avJvSK7s/MJbNI57AKtz6pogifSVjNWQmnrY/xvDG7QIu0asOhL/6AvNpzAEbOETW5rfmwKYHDqj4t0qHvQJ70AaeTJirPCPhSB8/60+Xfb2GB+LFbIeqdk9ovnKqz6xVAYXXJBajkiJus/pFvI+SGxs1qmBgnoZoSpOa5I4x42LUIbh8kZkQs6J/nbwz4EctVtIh084BZP6AM+Z3UWPZekhY/3TZy74U9btaUIgolq6Zua+M8KC0b3AlJSRxm9j3YTa7N+U8T148J3N9pTFQKGIaoA6uvHmz9KfbjVVbckY3LDKzwB8MyREhgKYRjgKVKFJ+N7dVJL1QrdnOtQstG7xCGqxwFc6w1HjUHg1+kmW5kqGYOVjtJT8KBsnT8c8n5O5FR0UzqrGQZN1VTQBrINxVJ8MeBskeRO4FUXMwMx0ISVVyWS57JkKDm5UUTrt+L85CDB1HQHm6+stPP+X89MoHq+HgQ5y1mxKoRogfYkL13x9QDazwsevocKEMR+NSn4AeYwg69p9jmpJRjcy1b0UGvQAx3neuZmQpicHDoV0MR/Mxx+JcHjauIHNcQjgDix69A2PyF4PfOUF+o6B6qwUJuJYsGQCveuMXcmld8FY8/TG88CjfxsZHxnSrPf5Un31ax3cZSQhv3bqA5aVWijomiEavh6Znhp4dvz3aIlN2fMDx6kJZ4P+Jb8/W91Fs8VHp856Z/gsMFdjDQQ1oMBe356pUTtaK+r+QoP9jTqDC/flhlHrKzZHZoSSVeFzdaiDAv8HFTAj/DStMjixq5eyKA= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c457ded-c260-47c6-bec5-08da2eba65f0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 17:12:13.6823 (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: h5B44SCycRpyqyi4A2tIxmLbcJQZOR8HQe6UtqIzI1mUwve7odG9J0G9RrkuNAqoqkcCq6PNLZj8aPW5PEkJwQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB4397 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 --- (no changes since v1) arch/sandbox/dts/sandbox.dts | 1 - arch/sandbox/dts/sandbox64.dts | 1 - arch/sandbox/dts/test.dts | 6 ------ drivers/net/sandbox.c | 10 ++-------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 18fde1c8c6..21f00fcab5 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]; }; host-fs { 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 c0b1d76cdb..e486bdb531 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -527,31 +527,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]; }; phy_eth0: phy-test-eth { compatible = "sandbox,eth"; reg = <0x10007000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 77]; phy-handle = <ðphy1>; phy-mode = "2500base-x"; }; @@ -559,7 +554,6 @@ 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;