From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A274AC433F5 for ; Mon, 18 Apr 2022 19:38:14 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8FC0F83AE2; Mon, 18 Apr 2022 21:37:41 +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="pHkGiAIl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D331583AD1; Mon, 18 Apr 2022 21:37:32 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0604.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::604]) (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 CAD9E839B2 for ; Mon, 18 Apr 2022 21:37:29 +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=ZRnf0vSGtQXuvuo956E3pFKg3IIsyYvj3RyrzCn/tKXhko+Fk7+NuL8bFJncLFmNhyKs4sVN2AMJeVRjUUR+2hqU0F0EZoyqZGnftimb/hGKeiBXDV2sUwsp0lDvl1nNNV53CyrpBjAy9OTeJMoIL9bbOMlNC76KAZVR3NNLoYkT9Qx20HTkuVa1kdTPfnlrVeg4VBvIH8lx1mCcKAiXA6dYc2ukfMt+9yX9edNQPNkqqNNI7WskwO3lyfHLiQNxlYNpbF5/vPDuynuC+T3CNYpD2obJwtleUHAhiSHtuKjYSiUgZGdTt7w4ecbvvVxIycEfTnEeiSkK0H+TMm9DnA== 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=4/i7ch9J742P2r0Zh7tEvwxJ6TqcbQSXTIqyagl9WIg=; b=USueMSKAdAtA6q69zQE0iFN77+cbtDJvLW5PRgNBZ9pO85XpRbKrsnPES3xmzx1wTYMQkWrS8wlkIXv3FYGRP2Rnbe8/0zHmvDBvRatipUyA1P2UmrfnuARgjuexlwqE45ET+6j622vLy82ZoFbJld7TnTw7SC8jvh8wrqlF4d9itxO7NFbpn4euZ29urSW29fBabGbOVjGUG0k9Xn9J8RD1NVRAG2wyarrbqnSFGb85bA1HKMJeRnEUYdA4naEgvpAlcaH28gNFqaCdW/4zB3mNZFW2e2EGyWhmWvNJ0bvRd2B7yyhYWlRqPTTcJhJXBFQQR8bEeilUvkHHU/Wu1w== 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=4/i7ch9J742P2r0Zh7tEvwxJ6TqcbQSXTIqyagl9WIg=; b=pHkGiAIlw/H/lXzPL1uswXhbQO1/4WfV/2VGbx0H7K06RTb+S57VhUgzv5Wo4AfiHcSYq5iTFilJ9agPwWPblnBvyUgfUWy8z75+gNA7tXLu+Sio7VAQ/C92QcOFCAJOlClnGAswq9fE89jaay0QsgYR38ILfqUqSTl/uQojC6veNFRnxTaOniFq0QC4y1m84M6qf6wW8vm8KAET37HBIzNex+TNCO9Ft8AyBNsrvMCoqGPTh2JUTELYgwnWl066WmRmmsbdAT+iz24ak0dcP168UqDSZ+fHqBwb0I6cGe0dnwM4LnvMKQZmhSnyQnvLNaelEEHYIz9fjCcS/+Kp8Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by DB7PR03MB4330.eurprd03.prod.outlook.com (2603:10a6:10:15::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Mon, 18 Apr 2022 19:37:28 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::fd2d:a04b:de07:33f8]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::fd2d:a04b:de07:33f8%6]) with mapi id 15.20.5164.025; Mon, 18 Apr 2022 19:37:28 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Simon Glass Cc: Mario Six , Ramon Fried , Heinrich Schuchardt , Tom Rini , Joe Hershberger , Sean Anderson Subject: [PATCH v3 04/13] sandbox: net: Remove fake-host-hwaddr Date: Mon, 18 Apr 2022 15:36:50 -0400 Message-Id: <20220418193659.3677824-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220418193659.3677824-1-sean.anderson@seco.com> References: <20220418193659.3677824-1-sean.anderson@seco.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MN2PR10CA0022.namprd10.prod.outlook.com (2603:10b6:208:120::35) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7822f014-68dc-4530-6a1a-08da2172df8d X-MS-TrafficTypeDiagnostic: DB7PR03MB4330: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: 54nMspJdioRRhaSfUQCko+N51ChtZW3ApSp3P//ClhbuWDq9mdVazNJOBfyRMvY6YBKJ016zyNArLqlpbzFnq75PC2K2ZxoOhKK6TSsBKyKu0/smDR98C4YjEL20ekx8ivjnYUO+OpP/MmUpjuC1PXbu1bTzKJNZZGojzjhpeaqQcV1qieTqhiXcQ3UciK5QInsyn0Y8zpc5H/l8RDHgw+lLTMRoptukDbLiEVDJVc+F4ihL5wQkP8VeJuVZkdTCQzDvFFfajPIObn7enhgE82Gdj5VWeVesVV4PmOAnlxMHRM1wHxNeq0WYPc0D4P1UZjBX3tvH0C/JIi0743FeVGFGxCnZ/kjYwg61qHa3hu+496wwmCE4QpkEbT3z8eel7wZ7Z+9+EdUumzvCR9gO5FB432DZ9VqjBOL31JuHNUXhQ+W4WSb7y5z4hegoJhM+R5ATOoQP4HGh4zrys9JNJPJVYc+lu85kJrgzL/b0WyS8/vmsryRxgBlKnvfuvdgzaBi28S370A1oIKujQHmvepsoeEL8xiRh1OutbGAQ7xESzSvrp5wzZJN1PFfmypqgSJf48WuY3Y351YwXUEjXrGIJw15KIc0Edzdwz8EjdENQb46/zA+56TDRkkCP1P+OGgVyql+XOf6tXTCjfYaOwWgKHnMBLUI2tSwqxkSOqqnrjJ1DtJEGwdd+zVNNjDeUeXe8E5E+GFxgyiYwnSP+NQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6486002)(6916009)(316002)(4326008)(66946007)(66476007)(8676002)(36756003)(66556008)(186003)(1076003)(8936002)(86362001)(5660300002)(38100700002)(54906003)(38350700002)(2906002)(83380400001)(44832011)(2616005)(26005)(6512007)(6506007)(6666004)(52116002)(107886003)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Sd9g3Cf+AN2LWGZxzK7Lu2KSrCswKtb+w81P+3Acn+Xrr0t6GvEEdeaB7Ku0?= =?us-ascii?Q?8VCQrJv5w863WIYoxYNtJp5MDW8anKcQTSsV4LoPtY8xWLvyE9BEW9kbOyWM?= =?us-ascii?Q?4QkjxarHw0+YMqvXe1N5ONtyAUF8uTs4yT9PrkkhLEaRwrNiK8i4peMKOn+n?= =?us-ascii?Q?09N1uBbRbc3FbC97XS58303PuwU9DcjrdQRFJjlu0qJg8yTmwMtbQJhZGw4o?= =?us-ascii?Q?d/962aEkg543d7df6vL0Q8C4z6hdoBOukjUWqF1hqTaRzxfkBpvET5IWZe+q?= =?us-ascii?Q?tr7LFASjUG8gZ7ijaZtQ2iZ1CLYIjtCM+gNp/tDS4vZWbMZ/9bJMmDxlYpIZ?= =?us-ascii?Q?Om9ntQC3SVlC3Bu//pgEvveoo6EjlNTzy4rNAmfph2UpJWbt+LJiAiszkvCn?= =?us-ascii?Q?gUO+3OseTEEfa1n9cHMYUfY9qF8N2i+u4NQUJmq0wMTgRhx+sQDMemB+vKQp?= =?us-ascii?Q?zNAeApsmBchEnFuHjjjo1iJI0RQ2bd1ZY7dxQhB9KhUoVT+vLQBEis52BUaQ?= =?us-ascii?Q?mxif9oSsoZijweiXriBylfgzFQElLnYmGX4f0/IZFLUNkGTy8uWsyAo0N/bi?= =?us-ascii?Q?9U6wlomh9hV46D/GEutOIOC6AqxbMmuRU1ZAlq04hK/5bpGAM3yJCWZ8XTin?= =?us-ascii?Q?AKPqU+oRwJKGm7etF9kseGp98ZiSlbCt0/xXLCkVSNWNFuTjnZSQzNgWDTGl?= =?us-ascii?Q?eONQvcreRVBwQCkkQxg6lQjZVT85yICSkvl91TQrIui3CnCDzOc2TvHohSb6?= =?us-ascii?Q?Mx3rdMpy1/LUAECHku9k7HBXFjUHD27vOZWTtPsWGQXqKB2fmZrtIilLZbnQ?= =?us-ascii?Q?a/UWG6ZiLgzvt3EsspFS0/p7eX0XLF2JmVDSKf6sTvquXIMJ93KRWT/m3d+k?= =?us-ascii?Q?PCC43Alpz7cHQAQQ6PUbzfxDn26+MXzzZ+KrC5HuEsN47mRhJ3JQnwSReVWE?= =?us-ascii?Q?xMjzsjLZ/Uvg4yn9uO31sO/0TDDSuT4VwsL9H7/teoQYxd2c6ZmKz2AWmsHl?= =?us-ascii?Q?LzdKuvswpnXAj31y9tdSKXc5Mdm9VtKxfzKA2F7krhjUG7QpFw21iXk68nrD?= =?us-ascii?Q?nGeiZ2BKRTfUENO+XvTJJbiC53Z5GZQhJC3M2B+tLRO7sBLYyOlT2w5j53Vn?= =?us-ascii?Q?Ym9jsl9Mw/iiRL3dLgOpF5GIjQ/OywVACvFTb23rNPOS41Z1XnxNxLvK+HxX?= =?us-ascii?Q?k4zLJ3PqdJd3qzhLOg1eSqOtZeatY1KGX5rZFa8mlm/hfq6WaPQkqazAbYf5?= =?us-ascii?Q?OTB9gcWzsTcJWmMNTMoW3Ek5b8Y6TT8349n35N65kUevXK9KSZzb2dGDSxyo?= =?us-ascii?Q?+AxE9vRnVLO4EfC8HnxntFT/No74bzvPU4u1CZOfJkZ6dbbRp7OQh7UvEAX+?= =?us-ascii?Q?1H1VHFN/dtJgjKXgiPWY8e93ACd03IymVUWDM2oO6xl+ufj4EQMeyC8yhG2C?= =?us-ascii?Q?TFFi7P38DFH8lvzCH0mvW7hmiQmZMq+LvuztFDcfWpmvgGHPx+bK/i+KefS2?= =?us-ascii?Q?j5+ZwmNcRV6ARiV9/CW0ehwQhI5Stxe7ugWOZ+wLdCeqcmHxXXXtMEmQPJml?= =?us-ascii?Q?N79nazfqHUtvvsDBvz7NEuolDxno8MOlFS7FJSZ2nvge8xcnImWS9XGIvQbN?= =?us-ascii?Q?Z0Alfab9vxbb75ow5ClySbVScKnRufhfJO2xTg9GTTbarY5R0Vhasv7VP/NJ?= =?us-ascii?Q?jaIajE2OwqMqgD3tV+nIMYrJTzTzh0d3//g7tJK0jHYdpPt1sDmAcZz4QrVr?= =?us-ascii?Q?9X181bXEJrDzuUjVNWz7BDiiqnt9l5Y=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7822f014-68dc-4530-6a1a-08da2172df8d X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2022 19:37:28.8484 (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: BaqoMEmIHgXehqwGdMR/zEXNhgq8WwZ0dPGij+61E4C9Ju+XHKzh5PoN72Yvvi1R7LTnHzmrATSKXTNTvm7ZhA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB4330 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 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 e480f6aff9..9c3a19f576 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -512,31 +512,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"; }; @@ -544,7 +539,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; -- 2.35.1.1320.gc452695387.dirty