From patchwork Thu May 5 17:11:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1627054 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=olpyGwZe; 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 4KvKy62d2cz9sCq for ; Fri, 6 May 2022 03:12:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EA4598405B; Thu, 5 May 2022 19:12:15 +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="olpyGwZe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4978884057; Thu, 5 May 2022 19:12:14 +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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on060c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::60c]) (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 782B183FF8 for ; Thu, 5 May 2022 19:12:09 +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=PA6B3rx3v678jnkSzpRe9gcbzY8ssKqplodKenUC4hy9rds2QtWE6c0gI0ljyUWS50b8Ew9DNQYnn6tMW4AXSC3E+d7ygrDFmfMb6xEXxwPFpaMPCA0z/5GvFKcG2t8VYhEpCVURiwADGO062QD9vIxC0pzcOWoNoZdejR1Aru4uCrrlb6hW7spRrDDCtNlSR4VTsllyJp7yVaBdei26iuPwe73oaRC5yUvCRxXuHXj8U2FgX2acRTLNb9huAiXY29Nh7MfdvuR3RuKEp4Qauam/yrljMfNRFL6WUdPVcdBE+4n9hHnj3QsoOo+Jzm9EbOupQyO3YTxi1acatW6UcA== 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=1IwEpmWNGCs8UioSiyK95Ve75a3kpe8YieRE6P6qR5E=; b=A5zp5ZByE1QTNbNzbNAvelFX2K0VOzyavb8cNYzoJXexYxPdIIhh174FGqpBKN/BGclqTniRl9ANidDJwxvOKjv3V/jmalnyQFzAodGr+bWNL2M/djoiTTTu16wcOiR2tjp8G93Hvl9CqxD6dTMe0WqjL7YGUqPcyUeUaelnXNhY/agN/n0Jtp57Eaed5p9BmOUoI0FsSgIySmtl68qAXBhj5ERmCTgjnst0AKH4hZj6em1I63ZVwto+H7qoq2FKhlXJfUixQq3LGyGkZTy3Y14QVIdkPpL8BjoNs5X4Z/2nyV7Bf5vXk1WhBfiAdbfvtE86xETU0G+zPhBdrbBddw== 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=1IwEpmWNGCs8UioSiyK95Ve75a3kpe8YieRE6P6qR5E=; b=olpyGwZelR5ukOKCi34DPi502ZT1VVGOkFr0Y81ga2Hv3q6SxCdLMRcZip6QNt/n+hL7mXs1XzL9XsJ9R4RCzqaiOFs6OQjRZqtp/fea/c2tTOiwbaiG2E35h45eQqBhvbEfjhEFSYeXZ8/yzhXNc4IFMDwO6vMOP6sNpBbptGbHoMxHNoxAMC5s56T+N1hS5+cND2il5L8EGCB8wPGxQcnqtT8rP6U3oxaU0JRkjkDScnJoqmSsprXEqMvr/jqdpqVmCuIAp3j060TI55+n4J1C0R4USxYlCxyzAU9pEfhdPwYyKX6aeB2mrlVyJQD0KzmAZ6lDbbNHZr0+DYF6pw== 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 AM0PR03MB6212.eurprd03.prod.outlook.com (2603:10a6:20b:15a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.25; Thu, 5 May 2022 17:12:08 +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:08 +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 , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH v4 01/16] sandbox: net: Add aliases for ethernet devices Date: Thu, 5 May 2022 13:11:30 -0400 Message-Id: <20220505171146.557773-2-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: 1506be99-88c9-4b79-3daf-08da2eba62ba X-MS-TrafficTypeDiagnostic: AM0PR03MB6212: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: KZIxP7RardgJJ0W4nN2APIKSJWl4FzEEwqg39Qq7N4knT8JmmY/KO2coAXKCRHlee+el63SApSDHlQ68M49pO+idgQC2xiTHu7YpPEvTaPt/99RQBqNBdT+WKtrq70OSe1al/kbGXPNpF7enNd98D2r1IFTS7NMjlX/6471RFd6XMaYOmvAq3SPd3XF5NBmIKekX4KdVXQGRbaVoZTdt3CKUw4fG+AaxvmTMXxm4xDFmYQsr/o7pnnApEDARU7TtKuVgN4FHVQdwtCPNSla1tYd3yUCEYEk3Jcy1HSJTYD62x1F5NDbhVyMTqDbmWMhfhoeKAGk05CqmU9fwvyPJkVloNA4/WMT4IGErhmcfztn33dGDBULgzkkxXAnzfBI/RpcIeWbQoxcirueClLfmA87H1SeWFvKHYc/Si2/K74B3Kne5/vDXryBTS+wVfiYK9ko2BDpVKQPN1G87TMEtWV1NUPPwwjwU5JcicVmotRCDjL5nkWxPiMQ1ETMJq7/xtQ5/BW5ahUQeVHTX4FJ4H9CjS93DUpeIa4PtKPiHTdVssLlSZ9pKcl6yklAnQkL5ArwW9uhd50M6TtLLoxDkaQL+j762W2LDgVlqwlZjQMdo6ZclWKbCvlzJdqHGhCP681KKPQYHq66e/KUSv9eSamc1YCufW7cRd0xD19Rbw5p3hGMYqgCEIYdDjZnyleHXCdK39pe/zdz+paxpIFp8BA== 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)(26005)(508600001)(6512007)(186003)(5660300002)(36756003)(6916009)(316002)(54906003)(1076003)(66556008)(38100700002)(38350700002)(4326008)(6486002)(8676002)(66476007)(2616005)(66946007)(86362001)(2906002)(52116002)(83380400001)(8936002)(6666004)(44832011)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?dxi/I22xDv/WKJziMISkiRqGpYEV?= =?utf-8?q?62/fymRxndGYtvO23rlz0QU3odGssQ6S47x3NORPwDXt9JhVAuewZ734kyhrCyOEa?= =?utf-8?q?ObxZjAXAcFiHLsEi/PLbyQhjJWKft3xBEsFFakfOmtvPHvqK1vHPriHE5bPnaDni/?= =?utf-8?q?zas8nHW2jdVQKo8NW6qM+3Rsn1C+TafZyd83WVxFzvO4nrpeWEgp4kgYzW9X5XLoy?= =?utf-8?q?8DU4pyy6oN3upDSamtg9c375bd01Y+4Xk9O3z3Hp5Sk+TPB3g+L69YXTNSWTCc9o7?= =?utf-8?q?Y6QbUFnfuQgmVcGw7bO3oHFg/v8ZaApDRGCZXSDHa+DFz/T7PBBmT5Ld1Exu7hM+U?= =?utf-8?q?LZmhClXc0krjVaaxgRMvhxEjYJUFlnZJ7jQ8ykcYoFW04dqn26sK7NdSaQi8hHlKs?= =?utf-8?q?uTgJAN4n1sHa9Fq2DfQdbx7AZw3mri4DTp4wizuwGotCYuUyEiLJMI3nuDjFOYk5G?= =?utf-8?q?jcdwXHWVnkfzI6fATV42aze/fwPQSvSFm0Fl+vF5hiQsHtzxGapBOgvwvsRM0K01m?= =?utf-8?q?RXQIBZp4wFefD7U6UPe61wbRxJQSZeZKvrvVzo/4M40lH69p5KIKKbGx+A3I6MS5G?= =?utf-8?q?g1963k+uvuzvxmP5nxjgSxGN4aRndRYFqKIJSc76R8p60dDgUaqHyFiYWvNMO9BNr?= =?utf-8?q?uRObY+CZ/pIY1hc+ae/QH1sVUQ85Dfd+d4l0q/30TL0LrwQ/05RFNh5gfq+1A1YlA?= =?utf-8?q?FtDLjjb3m/H+3Ib9CQ5dXjFDZ3BeLS+ptcahHnUQZf2pnbin4mSolBGuSB6hcHRAn?= =?utf-8?q?wsGGlQAo6wONXz5D+/7n9nXH0WhF0rP+PwiPNAU/hjkoEc8HTymOBLxIBtFL8sFHu?= =?utf-8?q?Ycu3iVH9kr8G6ATmv09tSyu8ZSVKGzZPwQc7/qyYN5OoztjhgxAqCtRMcdOd1fDaH?= =?utf-8?q?IjFdQ36pTFxuqVa3b97RAB54Qsj5CMk42AE1nJwTzvdtzAJCRTA5EZepsKsYRZrVA?= =?utf-8?q?D/erMEbPWvJ50iLrHftAaos9MsoHLYqKkNAf81oG0HRc5bLFC1J+EQ+bM/TePWfE9?= =?utf-8?q?XRy8KtHNuW87vLW3HqjehSv4XZyscGwQBP3SCRoT/OfP6k+GFiTviydkeHvDSJauF?= =?utf-8?q?gh5nS/Yt0M04s4yeWdIZXWVYW+MC+y9xjI3y0VwDFMwSf+1XL8nWjbAekJdnFDLnl?= =?utf-8?q?p9bciF7ia3xtX7g/S1rm8PYsSwz63nHcDTswQCpt1u/Y6zrX9fYwj9a329TGsqoWx?= =?utf-8?q?bUZnzgcyhmMSToe79F4DxaPFm09Sj9ckPmWqlAkJCStlaGs20PT72cQ8Ma5k6t3vy?= =?utf-8?q?qN/aPP3VyZXY+2hf9z0FDFyFqjblxgtOWH+1RQmsDkQs8s25YF+6+Mkug1VjlsLpV?= =?utf-8?q?S79L4sXFM7QY935SO0qTrf0dAuii5OLcQSAEAWnJAgxLxtEGIEvjY0btTnLBj9WTG?= =?utf-8?q?GmNSx0U4HKMRYkfjct+RsON2tpuHnqh+qBjtj+UrKzP0Bu6bsTbJiyykUhIYX6+wI?= =?utf-8?q?lXS0ehzIM42Pe85aBzcwwKswqMZWBetanF0ehUq1BpPx3g6M7jMGrXg52WoHCYWMV?= =?utf-8?q?VxuO1lQlM7F61tECK3kYI3ldXmpdtWOFdp4HCOIEnH4lh4tC2A2nwoQpyn2/Ffw9l?= =?utf-8?q?mksqPFwAfqvoymG26GZ9G+XoWiDVrHGr3zPqUeX7KLclyGvKWNkAv5Yx2sk9sbW5g?= =?utf-8?q?lS7PmmGPcigEMknaRZl4RoQNH31rT8LVWARcaMCQady3laZY9+K1w=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1506be99-88c9-4b79-3daf-08da2eba62ba 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:08.2763 (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: NhPfyIQyeugZwMrl334puC8/VYz4Y4B9ZKk4dkOrfzqJTO5lkH357I+qA6b83s0MVHwwPoZCysh6QlIevDrgCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB6212 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 Commit f3dd213e15 ("net: introduce helpers to get PHY ofnode from MAC") changed the ethernet sequence assignment from uclass 36: ethernet 0 * eth@10002000 @ 05813460, seq 0 1 * eth@10003000 @ 05813550, seq 5 2 * sbe5 @ 05813640, seq 3 3 * eth@10004000 @ 05813730, seq 6 4 * dsa-test-eth @ 05813820, seq 4 5 * lan0 @ 05813a30, seq 2 6 * lan1 @ 05813b50, seq 7 to uclass 36: ethernet 0 * eth@10002000 @ 03813630, seq 0 1 * eth@10003000 @ 03813720, seq 5 2 * sbe5 @ 03813810, seq 3 3 * eth@10004000 @ 03813900, seq 6 4 phy-test-eth @ 038139f0, seq 7 5 * dsa-test-eth @ 03813ae0, seq 4 6 * lan0 @ 03813cf0, seq 2 7 * lan1 @ 03813e10, seq 8 This caused the mac address assignment to switch around. Avoid this in the future by assigning aliases for all ethernet devices. This reverts the sequence to what it was before the aformentioned commit (with phy-test-eth as seq 8). There is no ethernet1 for whatever reason. Signed-off-by: Sean Anderson --- Changes in v4: - Fix dm_test_alias_highest_id test failing because we changed the number of aliases Changes in v3: - New arch/sandbox/dts/test.dts | 3 +++ test/dm/test-fdt.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index a8a86bc715..c0b1d76cdb 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -28,6 +28,9 @@ ethernet3 = ð_3; ethernet4 = &dsa_eth0; ethernet5 = ð_5; + ethernet6 = "/eth@10004000"; + ethernet7 = &swp_1; + ethernet8 = &phy_eth0; gpio1 = &gpio_a; gpio2 = &gpio_b; gpio3 = &gpio_c; diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index e1de066226..f9e8174759 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -184,7 +184,7 @@ static int dm_test_alias_highest_id(struct unit_test_state *uts) int ret; ret = dev_read_alias_highest_id("ethernet"); - ut_asserteq(5, ret); + ut_asserteq(8, ret); ret = dev_read_alias_highest_id("gpio"); ut_asserteq(3, ret);