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 2EE1DC433EF for ; Fri, 6 May 2022 21:52:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 214EF840A6; Fri, 6 May 2022 23:52:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=variscite.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=variscite.com header.i=@variscite.com header.b="K68jnpPR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5AD6A84207; Fri, 6 May 2022 23:52:40 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60f]) (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 44B5484011 for ; Fri, 6 May 2022 23:52:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=variscite.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Nate.D@variscite.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LKVrApUGed6U0TOZnMSB6K6aWO9M22C6Tm+uBHN6drg4lMP/GwZ8r1jIFgSC9n7LJJeLwUH7pzK4fLBVHWI3/bae3krURa00LvyVQuESTamXpmqsbPaE6+osS+4bRAquG+PzqLtosbwMnI2uX1Q19hg9lY/GbpQH125AnTr0R01z36HvpM71nejM6hyrOghoE9uPLo9K/xNWkgawtlpU9IHqM4NwnhmK6ASxVtomCZ1mtRDW2eIFe5U8CaVuaxNvleguYH9qavsbI6rl8asCoOi3t7O42RtlzNg5dTwxV0OQchAAxGuWNTSCmHwkKQykwrpa8Bg+rOhqRyBtDWzzbA== 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=7y7mXviyi6xcMrrWrpP1zS5HC/Hzky/qnAQO87R/+UA=; b=MJAl0CBp7m7f3yZmecDySdXuH6Jq+iLd8rWnRqptsttVEJbYUBX9qSiyUnUAST2PXGZlNs+KkkvH/dCGoLkgwqYe2261oEDnP6LYVd5yX6hfnDdB9reM9JJsXYp7+dlFIlgIbml6VaJ6zYmJ747Sy9LxQmgoJYfv+kiI8Pyw409HaQUHsvo7Hg2iDBoxdtRle87LkVM6k7bZjUzQTcQ2VUIUbf0PK+d9o010AeFIQf844iQeTVkH2XuHDp5WD71g+nzza1zZ4ccqc0o/Ify2cLLQyo/MKpYDHLGOSNLv/p+Ks6+DWhnKBFY2qSjaLMQZ3Mny1IDg0QyUEvaiDFoTIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=variscite.com; dmarc=pass action=none header.from=variscite.com; dkim=pass header.d=variscite.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=variscite.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7y7mXviyi6xcMrrWrpP1zS5HC/Hzky/qnAQO87R/+UA=; b=K68jnpPRETVj+P9ho8L/+gBM5+so5g55swDPfqBujYjsB/ompSFrzC5EAlskTdmzOU4bVe2Xdt1KpMnQuvJ1Wc0t37GKOGHSux3czpeA3gpJakyZ4fhzkAsuX2RQP53gmfPUHo4B7oHq4OZjsRFaAcalPsGh3jhNj34JKtwkk2ik/lYNNj94fIAclMZCIubWtSDz3zyqsNsb+j5bYw2DJO1ziQPEin2jvYNuZhziWRLxhK41UP6hsrAQ0bXlJMvl3sqeNmsh26W5cfLJqa1IcUu4JCC+ATsnlYCS+/5+/6TWPG4u1kbXq4PAdAl9uigrsmOXG7k8wAjr9wX5CETwTA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=variscite.com; Received: from PR3PR08MB5754.eurprd08.prod.outlook.com (2603:10a6:102:91::15) by GV1PR08MB7780.eurprd08.prod.outlook.com (2603:10a6:150:58::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Fri, 6 May 2022 21:52:35 +0000 Received: from PR3PR08MB5754.eurprd08.prod.outlook.com ([fe80::95d0:44f9:e5a0:eddd]) by PR3PR08MB5754.eurprd08.prod.outlook.com ([fe80::95d0:44f9:e5a0:eddd%8]) with mapi id 15.20.5206.024; Fri, 6 May 2022 21:52:35 +0000 From: Nate Drude To: u-boot@lists.denx.de Cc: rfried.dev@gmail.com, joe.hershberger@ni.com, josua@solid-run.com, alvaro.karsz@solid-run.com, eran.m@variscite.com, Nate Drude Subject: [PATCH] phy: adin: fix broken support for adi,phy-mode-override Date: Fri, 6 May 2022 16:52:13 -0500 Message-Id: <20220506215213.4176804-1-nate.d@variscite.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: CH0PR03CA0073.namprd03.prod.outlook.com (2603:10b6:610:cc::18) To PR3PR08MB5754.eurprd08.prod.outlook.com (2603:10a6:102:91::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 64718a84-f30d-42bf-5997-08da2faabaa8 X-MS-TrafficTypeDiagnostic: GV1PR08MB7780: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: WZBxA7WmcfTh1hYbPl1E1smT35WAg8jxafBkRY289zxNHzuuXu8FaxggdyP9YnrQfWqhZZjD4eM9AYhM2guKXCBfEV4Wc12NH0STrSh0fpB+r9Fru3iasEfnpzQ2k+zLXfpGyfT37POxsDLgHbuuvKlpCIebzySmkhh8VuatcPYBOcu9fPa/XOfnlypjv52xwXUcym6egpqq/ROxhzi9atzi67erLPbjbJUL6i050KcVsFx5HOCyXiBj6slwvTEnbuDBiC9mBMYjnhWWZDccQBK7pe3vdaNaNieYJWkwps49kqZBFKynvlZXAFvAam0CXM2V0R4U/vlnL+A0PXze8Dg9U5UPxBpwkoITu1TUMrhGtuwZZAVLP9nTIkuTtVRXWJvsLCjuqXQX806FuCqf9O1c1fiTCKqUm2F+ChmDCvHdljH36Ld3Cm2RoXsAOeDaPJ58mArWT9mwG+z64GS4wq+LoYDWgsdLpuxcBx5SB10gvG/MlMiL6Qu46KplJ4UiC7tOLMwMI2BbRQnujy3eJ4qjzU3z9sWHlhlKzhXFfOPQIyiL0zZ0qArxmsHt+1D7Ug0iyusVWeCjcQ2p7D+5V+y6a6MA7TFnMPfBaG1mtHyVuA34b5ZRd4f0944xBVsXTl80oayP0gLxv50yb9y3JtLxMeZwwtjndAEfR8Y9qLimG8WkphdsyOqdRROgveMECn/DUGaHdYQboA2/oQRPPlt8QAaeEtwD5hTbJxTcomJXoHv8IgYKNyo6Twlyx8ttbfGo1UAA455Lv7i7tNFl86UUl5wdVoMbj19nMeZc5MY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR3PR08MB5754.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(346002)(39840400004)(376002)(396003)(136003)(366004)(2906002)(186003)(8936002)(508600001)(6486002)(966005)(6916009)(316002)(36756003)(6512007)(52116002)(83380400001)(86362001)(38350700002)(8676002)(66556008)(38100700002)(66476007)(107886003)(66946007)(2616005)(6666004)(4326008)(1076003)(26005)(6506007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uaF6l7vaLpLpwYiAtDPhYKAQORsoUGXpGYrtVRfEaFjmJGLY2xFh0c7MQEyz?= =?us-ascii?Q?hnepIDnnaVpZjthIQm+8BMhXTzlwvUAp/cbFmUjRWA5l6PJ0vw+pgpNbeiCS?= =?us-ascii?Q?Ip6jRhxPcOOY5iu3bMUSzm1zkC2YaYuKSgf+WCeonGThddWsImzWMn+BrxGt?= =?us-ascii?Q?2ACg/5b6S6CtfFypiHYbV38cs0RX8HE467+cW2QaoPhZDYrHM6f4Qob88F4e?= =?us-ascii?Q?qx9PkNcJQZxo8Sc/df05GrehBqKeHEN+vK1RY6tMhcZipY3vWh9DpBqGT7tC?= =?us-ascii?Q?DCTRC0gpqy6qd+/96qUC5vh+UdZfwhiuB1gnUtSl7VopBZ3smGTxg7fLJY9D?= =?us-ascii?Q?j2FMZjP/qxvufIV+6y6r+QFqOkpuQy4NPM34bSltxLRRP94OpkQPbR6NnE9n?= =?us-ascii?Q?QFrMtJrZ8miJ4s2MMh/HPiry1ocIjLa4xXbqhysVyyYAyOIliXJY0oza7gKt?= =?us-ascii?Q?UgEUU+ro24n0jmbjEo3FbjLECHa+UnkEKHOINmRgsWbSTYfLMOFmrbLUX4tB?= =?us-ascii?Q?VT6sS3f9gB691l6eIsBkBtRomy7/8ETGyu6S4dDZRgeooh3wLTYItZho2UQX?= =?us-ascii?Q?mlefvNSW5xlCm+I/Vt1qWtVVmij7oSrbEvgf78+yYDXDSrH+nhQQadTxfDRz?= =?us-ascii?Q?xMRtRpOcks+rK+7cGDAWnDmDCGscORZeqb3KQWiI5AVutea4/xMJIGdY7h7t?= =?us-ascii?Q?ujF6aod5QyF/DIApYPbEol/js2JJta+PDApJrdjn/blcaxLJhL9wlcDAhJc+?= =?us-ascii?Q?TkKkbLYZZi3vgUH+LVUyCzTLq/CEukD6KW+VMHRHYfZgeRyObZU4scRLS/Ha?= =?us-ascii?Q?FB5SNSclKKdSAJjaoZjeH7AA9pjYvhcfqByvkzg1UnIqQ+SD9kRFVlmQVizQ?= =?us-ascii?Q?baDDmkdyS9C4Lu7kGBakdCLw3orE1it8guW2X7WCVHgyhoD3Ay14ktivO0hP?= =?us-ascii?Q?+/g3OHHqSnUfDFBcm/gL68ev2L5HA1RI9SESV1eBi9DApsOU/ulSllp+Fc0n?= =?us-ascii?Q?4f0Ftsot4kWM2Wmu5OarsQ0HIgvzaODERyXTCqBcJRkTCJewlopP91N2rVfR?= =?us-ascii?Q?0qlsdCk0Gj3ThGNSU5xW4sdZFyYT/AiA4KbtSkA7Fwbjh29g+zKucUWCqL8t?= =?us-ascii?Q?JzraMAOSreXOqK8lAbDgZQyOVTHZRS7+5rz3vVzNuRaubME5egh/uIrchn4w?= =?us-ascii?Q?W+qBz25KDv1z1G4n6wpGh6ktqv63weO9W9ur6QxYMVhlThhZ1Zho4dhaT8mS?= =?us-ascii?Q?WLUNdanJQS1+t27fw6Z2UuMuD9XgpyBppDY6flHkPB+aHNoSlfmG9wPU9Nry?= =?us-ascii?Q?5801GTH1jVqW3A4ZXj/6Tq2kiMEYs0BulimzDw5bbjWWPOE4cTCOKW83QQfs?= =?us-ascii?Q?K/0xrO9nu3EOGzJJ+kddoOwT4L74R1AzZ35PmiiePFzl/aHTc960P5CXgg3D?= =?us-ascii?Q?+jIiQ32TQPFDAl5Zdko2aa7SwVWGFJc3zzJR68sRvTN/9qeUkD1Ypv1T2PG3?= =?us-ascii?Q?RfIkMfvvcTjNbu/dggmLgOCFEMe4I1WAtWp6a4z08Yr7y0bLv2NLjtKq3Zlv?= =?us-ascii?Q?SQlE5Wlh2rXT/IdpyVCLuKiE5c8ijcK3Yk2IiJWoe/+bxdP5ETelcs6xDigX?= =?us-ascii?Q?mjUcThxxVZJU7uNZJxORQH9cOuzXcVFRCw4Pu6ZfaghubRs8hF8UUtGQKZmE?= =?us-ascii?Q?kYfE48OnfhwssxiIKQOHbPtdCyEpS+alcz9TqycujXKxpu+Wc6Ph1pfg/FV7?= =?us-ascii?Q?4IdNQn8Fkg=3D=3D?= X-OriginatorOrg: variscite.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64718a84-f30d-42bf-5997-08da2faabaa8 X-MS-Exchange-CrossTenant-AuthSource: PR3PR08MB5754.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2022 21:52:35.2011 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 399ae6ac-38f4-4ef0-94a8-440b0ad581de X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 76paJDh7kQBRQq6G6q19ZVY9mUS7gQFoZL2AYGGVvtFYlTNFHiopAMKF4+PkCxmb2GEGGK83vduJmmX2xLKuGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB7780 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 Currently, the adin driver fails to compile. The original patch introducing the adin driver used the function phy_get_interface_by_name to support the adi,phy-mode-override property. Unfortunately, a few days before the adin patch was accepted, another patch removed support for phy_get_interface_by_name: https://github.com/u-boot/u-boot/commit/123ca114e07ecf28aa2538748d733e2b22d8b8b5 This patch refactors adin_get_phy_mode_override, implementing the logic in the new function, ofnode_read_phy_mode, from the patch above. Signed-off-by: Nate Drude --- drivers/net/phy/adin.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index cff841ab3d..e60f288b9b 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -100,27 +100,27 @@ static u32 adin_get_reg_value(struct phy_device *phydev, * The function gets phy-mode string from property 'adi,phy-mode-override' * and return its index in phy_interface_strings table, or -1 in error case. */ -int adin_get_phy_mode_override(struct phy_device *phydev) +phy_interface_t adin_get_phy_mode_override(struct phy_device *phydev) { ofnode node = phy_get_ofnode(phydev); const char *phy_mode_override; const char *prop_phy_mode_override = "adi,phy-mode-override"; - int override_interface; + int i; phy_mode_override = ofnode_read_string(node, prop_phy_mode_override); if (!phy_mode_override) - return -ENODEV; + return PHY_INTERFACE_MODE_NA; debug("%s: %s = '%s'\n", __func__, prop_phy_mode_override, phy_mode_override); - override_interface = phy_get_interface_by_name(phy_mode_override); + for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) + if (!strcmp(phy_mode_override, phy_interface_strings[i])) + return (phy_interface_t) i; - if (override_interface < 0) - printf("%s: %s = '%s' is not valid\n", - __func__, prop_phy_mode_override, phy_mode_override); + printf("%s: Invalid PHY interface '%s'\n", __func__, phy_mode_override); - return override_interface; + return PHY_INTERFACE_MODE_NA; } static u16 adin_ext_read(struct phy_device *phydev, const u32 regnum) @@ -148,10 +148,10 @@ static int adin_config_rgmii_mode(struct phy_device *phydev) { u16 reg_val; u32 val; - int phy_mode_override = adin_get_phy_mode_override(phydev); + phy_interface_t phy_mode_override = adin_get_phy_mode_override(phydev); - if (phy_mode_override >= 0) { - phydev->interface = (phy_interface_t) phy_mode_override; + if (phy_mode_override != PHY_INTERFACE_MODE_NA) { + phydev->interface = phy_mode_override; } reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG); -- 2.25.1