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 D9C51C433EF for ; Sun, 8 May 2022 09:30:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E8B9B83C10; Sun, 8 May 2022 11:30:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=solid-run.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=solid-run-com.20210112.gappssmtp.com header.i=@solid-run-com.20210112.gappssmtp.com header.b="Qat/tmpz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF2AE83C1B; Sun, 8 May 2022 11:30:48 +0200 (CEST) Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AC3A680104 for ; Sun, 8 May 2022 11:30:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=solid-run.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=josua@solid-run.com Received: by mail-wr1-x429.google.com with SMTP id t6so15660859wra.4 for ; Sun, 08 May 2022 02:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solid-run-com.20210112.gappssmtp.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=S4PwTKlbmtKeMJUJovsknvjLhpvDQYr0HThGJp8IZSQ=; b=Qat/tmpz1HnmhfA0k6lV798hL3g/iw9HRtWYMbvg7uyy9bi5eTv3XmaRYz81VAF3Db 2bzHpbHPAorjxVkMXfqV265174vmj36mWjLHp6XadWgGwfZsDAZCS8hEYr8AMs5x+zmM IaNyPKNE9K1rg4/gi5yi4MAtXvDJjvOALZqOYcWq2t0wJCyiYVlzPiS9dprd3XZbVlwM W/2nj55g0ntiFgBuclDMwwK/P51+HIv3DlXIevPkbocQ4dkRhE+ljBYbn/ptikVf1yol AU7pzgMlbJeooBviA8nnTf1RBqkBlP0BfP2m7MK4Z4mDtm+5WCdlx8+9VgkrTxvu2cxM QFbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=S4PwTKlbmtKeMJUJovsknvjLhpvDQYr0HThGJp8IZSQ=; b=Xgk4/+KJ6/HkA9hE3NnyBD9rAeeYpICTuinxpJDA9NaTDw8BoX72VI+kJFmSbEcpvb 1cwxv6iWQdf0RFb6CmmKITASy42/ZdQIPgPK8u+fi8a6HGc/4Of0WfVlstBge4E6osfD DgrRUtwYKDh3EY0fbG8h8jqOkaphZObiwLbZJvMQZhVzies+KY5FCJwlMdO0gA9mKHxV KdOMhv2DXgerfZIgyqDBqhTec7wEtr2qOAjnq422kmqJazcbilQK16zuv/KAbDQT0gB8 /25iDTI5pHw8i6wKg07NVlsTjHPuYY0QDewGVdIl2lKVUpqciFgSretpXiQuWJYUc4Ru GLpg== X-Gm-Message-State: AOAM533CY9/KWe9x7VwP9KvTQIFgCFO5Tt2dfolRYq48z5Zkj25gGJq1 gXrEp7z/O7AvmPaDK0JhIzyH1MfMqMM0sCcn X-Google-Smtp-Source: ABdhPJxcoGcp8bl3UwKLtO/lbvYbYmELTzBJfhFYLr3jhGJ9BLZEPhwP1Yhke8NOa1cFsk8NkKZhUg== X-Received: by 2002:a5d:49d0:0:b0:20a:de8b:8fc0 with SMTP id t16-20020a5d49d0000000b0020ade8b8fc0mr9286481wrs.79.1652002245197; Sun, 08 May 2022 02:30:45 -0700 (PDT) Received: from [192.168.17.225] (bzq-82-81-222-124.cablep.bezeqint.net. [82.81.222.124]) by smtp.gmail.com with ESMTPSA id g6-20020a5d4886000000b0020c5253d901sm8132904wrq.77.2022.05.08.02.30.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 May 2022 02:30:44 -0700 (PDT) Message-ID: Date: Sun, 8 May 2022 12:30:42 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH] phy: adin: fix broken support for adi,phy-mode-override Content-Language: en-US To: Nate Drude , u-boot@lists.denx.de Cc: rfried.dev@gmail.com, joe.hershberger@ni.com, alvaro.karsz@solid-run.com, eran.m@variscite.com References: <20220506215213.4176804-1-nate.d@variscite.com> From: Josua Mayer In-Reply-To: <20220506215213.4176804-1-nate.d@variscite.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 Hi Nate, That was quick! I have rebased my changes on top of this patch, and can confirm that the adin phy driver compiles, and still works. I did not test setting adi,[rt]x-internal-delay-ps in dts though. So, I guess you can add my superficial Tested-By: Josua Mayer [PATCH 0/5] mx6cuboxi: add eth support for SoMs revision 1.9+ patches 2-5 apply cleanly, so I won't immediately roll a v2. Am 07.05.22 um 00:52 schrieb Nate Drude: > 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); - Josua Mayer