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 1F645C433EF for ; Wed, 13 Apr 2022 21:46:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F60D83DEA; Wed, 13 Apr 2022 23:46:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="s9QqfPLE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BB64B83ABC; Wed, 13 Apr 2022 23:46:20 +0200 (CEST) Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) (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 5577E839A1 for ; Wed, 13 Apr 2022 23:46:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf36.google.com with SMTP id c1so2657729qvl.3 for ; Wed, 13 Apr 2022 14:46:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=EBS4m8030gTrc2F6rnG7+MTU+2yxi2BtQbAUdDj6MWU=; b=s9QqfPLEWy6RNx4K6KvCr2thebRe739Z2TdXbs9IXBHWuWQi4ED/nRuQNjL4Qo1uGl QvU5m63Jj6XiM+8ucF6f3kKLOErGAq68dYiq/Jbt/pyQ4SMyQ0Jz3jN39LxqB8bmj/Kz YJdVazMdtgr1RtW4oaTh8zk1iPtOR1DnF6ARc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=EBS4m8030gTrc2F6rnG7+MTU+2yxi2BtQbAUdDj6MWU=; b=RS07WFFmDe3OqpqpEqfOTUkdCtJosCor1X4uCmlEx1MYueFmbrFLB/XMxP0nLh+tD1 FHuMeeTYC+9QwO5EEykA4h3O571vZIIm6cRW0oqH0TgtSUcnw5bkabQGpMrWddYQsQd6 2vAIiVUgP4DRa9J9FZwQ4M2XMyg2E8feQnL8m4mRn6SWzeSQQ8tAifFhFhDi65vQLlBN 75Frnw01vqoOlDyPMECkGV9sGMEsKXj5MX8Rx+z0s5NlZrRYT+gsMQJH0ogwdJt6bFcE mfCXnunhD/WyiWFfU9Go9X6wAUInUkX8V9V6zO4loXF3a2pkRYyLXK1zewRL1BVbuWFw 2A7w== X-Gm-Message-State: AOAM530Z0miD1/6JO4FgcMmJZhy86R7q8joWbN1sQBl9p1HJL06QxM2o REFmisK6Q1nCvKV3dFnC1EcW7g== X-Google-Smtp-Source: ABdhPJyPFtF2urDdnDQzGoje5eJePD/Sz6Hz/7R9GEFgnPARJLsSmBCQ0F6QCuuyuVUXQgDiv1JHJA== X-Received: by 2002:a05:6214:20a1:b0:42d:6f51:46e2 with SMTP id 1-20020a05621420a100b0042d6f5146e2mr10258429qvd.67.1649886375904; Wed, 13 Apr 2022 14:46:15 -0700 (PDT) Received: from bill-the-cat (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id y5-20020a05620a0e0500b0069c28a4e8ddsm35219qkm.72.2022.04.13.14.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 14:46:13 -0700 (PDT) Date: Wed, 13 Apr 2022 17:46:11 -0400 From: Tom Rini To: Marek =?iso-8859-1?Q?Beh=FAn?= , Simon Glass , q@bill-the-cat Cc: Joe Hershberger , Ramon Fried , u-boot@lists.denx.de, Marek =?iso-8859-1?Q?Beh=FAn?= Subject: Re: [PATCH u-boot-net v4 03/14] net: introduce helpers to get PHY ofnode from MAC Message-ID: <20220413214611.GA2612709@bill-the-cat> References: <20220406223308.9833-1-kabel@kernel.org> <20220406223308.9833-4-kabel@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="xHFwDpU9dbj6ez1V" Content-Disposition: inline In-Reply-To: <20220406223308.9833-4-kabel@kernel.org> X-Clacks-Overhead: GNU Terry Pratchett 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 --xHFwDpU9dbj6ez1V Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 07, 2022 at 12:32:57AM +0200, Marek Beh=FAn wrote: > From: Marek Beh=FAn >=20 > Add helpers ofnode_get_phy_node() and dev_get_phy_node() and use it in > net/mdio-uclass.c function dm_eth_connect_phy_handle(). Also add > corresponding UT test. >=20 > This is useful because other part's of U-Boot may want to get PHY ofnode > without connecting a PHY. >=20 > Signed-off-by: Marek Beh=FAn > Reviewed-by: Ramon Fried > Reviewed-by: Simon Glass > --- > arch/sandbox/dts/test.dts | 13 +++++++++++++ > drivers/core/ofnode.c | 21 +++++++++++++++++++++ > drivers/core/read.c | 5 +++++ > include/dm/ofnode.h | 14 ++++++++++++++ > include/dm/read.h | 19 +++++++++++++++++++ > net/mdio-uclass.c | 24 ++++++------------------ > test/dm/ofnode.c | 18 ++++++++++++++++++ > 7 files changed, 96 insertions(+), 18 deletions(-) >=20 > diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts > index 05c1cd5e1a..e536943503 100644 > --- a/arch/sandbox/dts/test.dts > +++ b/arch/sandbox/dts/test.dts > @@ -530,6 +530,13 @@ > fake-host-hwaddr =3D [00 00 66 44 22 22]; > }; > =20 > + phy_eth0: phy-test-eth { > + compatible =3D "sandbox,eth"; > + reg =3D <0x10007000 0x1000>; > + fake-host-hwaddr =3D [00 00 66 44 22 77]; > + phy-handle =3D <ðphy1>; > + }; > + > dsa_eth0: dsa-test-eth { > compatible =3D "sandbox,eth"; > reg =3D <0x10006000 0x1000>; > @@ -1555,6 +1562,12 @@ > =20 > mdio: mdio-test { > compatible =3D "sandbox,mdio"; > + #address-cells =3D <1>; > + #size-cells =3D <0>; > + > + ethphy1: ethernet-phy@1 { > + reg =3D <1>; > + }; > }; > =20 > pm-bus-test { > diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c > index 8042847f3c..445b7ad5ad 100644 > --- a/drivers/core/ofnode.c > +++ b/drivers/core/ofnode.c > @@ -1198,3 +1198,24 @@ const char *ofnode_conf_read_str(const char *prop_= name) > =20 > return ofnode_read_string(node, prop_name); > } > + > +ofnode ofnode_get_phy_node(ofnode node) > +{ > + /* DT node properties that reference a PHY node */ > + static const char * const phy_handle_str[] =3D { > + "phy-handle", "phy", "phy-device", > + }; > + struct ofnode_phandle_args args =3D { > + .node =3D ofnode_null() > + }; > + int i; > + > + assert(ofnode_valid(node)); > + > + for (i =3D 0; i < ARRAY_SIZE(phy_handle_str); i++) > + if (!ofnode_parse_phandle_with_args(node, phy_handle_str[i], > + NULL, 0, 0, &args)) > + break; > + > + return args.node; > +} > diff --git a/drivers/core/read.c b/drivers/core/read.c > index 31f9e78a06..7ff100218d 100644 > --- a/drivers/core/read.c > +++ b/drivers/core/read.c > @@ -398,3 +398,8 @@ int dev_decode_display_timing(const struct udevice *d= ev, int index, > { > return ofnode_decode_display_timing(dev_ofnode(dev), index, config); > } > + > +ofnode dev_get_phy_node(const struct udevice *dev) > +{ > + return ofnode_get_phy_node(dev_ofnode(dev)); > +} > diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h > index 744dffe0a2..429aee2812 100644 > --- a/include/dm/ofnode.h > +++ b/include/dm/ofnode.h > @@ -1217,4 +1217,18 @@ int ofnode_conf_read_int(const char *prop_name, in= t default_val); > */ > const char *ofnode_conf_read_str(const char *prop_name); > =20 > +/** > + * ofnode_get_phy_node() - Get PHY node for a MAC (if not fixed-link) > + * > + * This function parses PHY handle from the Ethernet controller's ofnode > + * (trying all possible PHY handle property names), and returns the PHY = ofnode. > + * > + * Before this is used, ofnode_phy_is_fixed_link() should be checked fir= st, and > + * if the result to that is true, this function should not be called. > + * > + * @eth_node: ofnode belonging to the Ethernet controller > + * Return: ofnode of the PHY, if it exists, otherwise an invalid ofnode > + */ > +ofnode ofnode_get_phy_node(ofnode eth_node); > + > #endif > diff --git a/include/dm/read.h b/include/dm/read.h > index 233af3c063..899eb813fd 100644 > --- a/include/dm/read.h > +++ b/include/dm/read.h > @@ -743,6 +743,20 @@ int dev_read_pci_bus_range(const struct udevice *dev= , struct resource *res); > int dev_decode_display_timing(const struct udevice *dev, int index, > struct display_timing *config); > =20 > +/** > + * dev_get_phy_node() - Get PHY node for a MAC (if not fixed-link) > + * > + * This function parses PHY handle from the Ethernet controller's ofnode > + * (trying all possible PHY handle property names), and returns the PHY = ofnode. > + * > + * Before this is used, ofnode_phy_is_fixed_link() should be checked fir= st, and > + * if the result to that is true, this function should not be called. > + * > + * @dev: device representing the MAC > + * Return: ofnode of the PHY, if it exists, otherwise an invalid ofnode > + */ > +ofnode dev_get_phy_node(const struct udevice *dev); > + > #else /* CONFIG_DM_DEV_READ_INLINE is enabled */ > #include > =20 > @@ -1092,6 +1106,11 @@ static inline int dev_decode_display_timing(const = struct udevice *dev, > return ofnode_decode_display_timing(dev_ofnode(dev), index, config); > } > =20 > +static inline ofnode dev_get_phy_node(const struct udevice *dev) > +{ > + return ofnode_get_phy_node(dev_ofnode(dev)); > +} > + > #endif /* CONFIG_DM_DEV_READ_INLINE */ > =20 > /** > diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c > index 649dc60f73..233b70171b 100644 > --- a/net/mdio-uclass.c > +++ b/net/mdio-uclass.c > @@ -20,11 +20,6 @@ static const char * const phy_mode_str[] =3D { > "phy-mode", "phy-connection-type" > }; > =20 > -/* DT node properties that reference a PHY node */ > -static const char * const phy_handle_str[] =3D { > - "phy-handle", "phy", "phy-device" > -}; > - > void dm_mdio_probe_devices(void) > { > struct udevice *it; > @@ -137,23 +132,16 @@ static struct phy_device *dm_eth_connect_phy_handle= (struct udevice *ethdev, > u32 phy_addr; > struct udevice *mdiodev; > struct phy_device *phy; > - struct ofnode_phandle_args phandle =3D {.node =3D ofnode_null()}; > ofnode phynode; > - int i; > =20 > if (CONFIG_IS_ENABLED(PHY_FIXED) && > ofnode_phy_is_fixed_link(dev_ofnode(ethdev), &phynode)) { > phy =3D phy_connect(NULL, 0, ethdev, interface); > - phandle.node =3D phynode; > goto out; > } > =20 > - for (i =3D 0; i < ARRAY_SIZE(phy_handle_str); i++) > - if (!dev_read_phandle_with_args(ethdev, phy_handle_str[i], NULL, > - 0, 0, &phandle)) > - break; > - > - if (!ofnode_valid(phandle.node)) { > + phynode =3D dev_get_phy_node(ethdev); > + if (!ofnode_valid(phynode)) { > dev_dbg(ethdev, "can't find PHY node\n"); > return NULL; > } > @@ -162,16 +150,16 @@ static struct phy_device *dm_eth_connect_phy_handle= (struct udevice *ethdev, > * reading 'reg' directly should be fine. This is a PHY node, the > * address is always size 1 and requires no translation > */ > - if (ofnode_read_u32(phandle.node, "reg", &phy_addr)) { > + if (ofnode_read_u32(phynode, "reg", &phy_addr)) { > dev_dbg(ethdev, "missing reg property in phy node\n"); > return NULL; > } > =20 > if (uclass_get_device_by_ofnode(UCLASS_MDIO, > - ofnode_get_parent(phandle.node), > + ofnode_get_parent(phynode), > &mdiodev)) { > dev_dbg(ethdev, "can't find MDIO bus for node %s\n", > - ofnode_get_name(ofnode_get_parent(phandle.node))); > + ofnode_get_name(ofnode_get_parent(phynode))); > return NULL; > } > =20 > @@ -179,7 +167,7 @@ static struct phy_device *dm_eth_connect_phy_handle(s= truct udevice *ethdev, > =20 > out: > if (phy) > - phy->node =3D phandle.node; > + phy->node =3D phynode; > =20 > return phy; > } > diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c > index dab0480a42..500c63aef5 100644 > --- a/test/dm/ofnode.c > +++ b/test/dm/ofnode.c > @@ -447,3 +447,21 @@ static int dm_test_ofnode_string_err(struct unit_tes= t_state *uts) > return 0; > } > DM_TEST(dm_test_ofnode_string_err, UT_TESTF_LIVE_TREE); > + > +static int dm_test_ofnode_get_phy(struct unit_test_state *uts) > +{ > + ofnode eth_node, phy_node; > + u32 reg; > + > + eth_node =3D ofnode_path("/phy-test-eth"); > + ut_assert(ofnode_valid(eth_node)); > + > + phy_node =3D ofnode_get_phy_node(eth_node); > + ut_assert(ofnode_valid(phy_node)); > + > + reg =3D ofnode_read_u32_default(phy_node, "reg", -1U); > + ut_asserteq_64(0x1, reg); > + > + return 0; > +} > +DM_TEST(dm_test_ofnode_get_phy, 0); So this patch consistently leads to: https://source.denx.de/u-boot/u-boot/-/jobs/423690#L222 on current master. I did have to manually merge a few changes, but I think I did that correctly. I don't see _why_ this leads to failure. Simon, any ideas? --=20 Tom --xHFwDpU9dbj6ez1V Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmJXRJ8ACgkQFHw5/5Y0 tyyrWgv/W21WMRfL5BQ2nFhXHyt5ba0xDZfyF882cVDJgG4WBeSVDkPeIZA2SBEG NchKq5DOiRFwSn2aRuyGwnwYk8uubwPAvKRZUnTdL+vpUAM4y0fSiJIpuTwnGnJo cjvmOFaeSb1Z1qLdaCxoYjlXv8X9mtMacqlhBiA+QlilA/0T/YjZGcbFZjUl8lfQ kbkHqqijhXhHhf4Xs3As2NYU2c7xTqgiTqaSXIPie5qiUwxZ8T+siAYUQdLOuFyO uCafn1VgOrzS+FcjiFF8ttA1mjsHy2ueybwjcNmxImf9gT5vlc0gsnrdlPAEuyRr 5Skl5FauGsqdNu7YzGRpzUwJCL/LwBKS/HZOuX/55ASMblFquJf6YzH9BjF0FE0p b2FkjACeA5ZrBYWOYGdGMyouhwrdOXYN26eTb62VIurLbKVQlNf26mzC1717JvlM N/+M+OOBhUOJI4ZbefXDVSmxuGcE+AqoY4rZ9/KAnpybqeEfGl17cR2hKVxlRmCJ 37GlTEB+ =Ahlm -----END PGP SIGNATURE----- --xHFwDpU9dbj6ez1V--