From nobody Sun Dec 14 18:07:31 2025 Received: from fw2.prolan.hu (fw2.prolan.hu [193.68.50.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D577336EEF; Wed, 29 Oct 2025 10:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.68.50.107 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733439; cv=none; b=mXQ/yAZ4yrS1cr/llJl+ft1UEAmQQDQVzJEcXplOw1XRq3XbkfeZjty55I38ROywX6PB3fuSmPfVdwC4CrWyaGKkI/swVB5f1ctHrnQuK9UjrhoL6Wov7Lbcm1PHDLADPNHlgf0WiRdteCeFAY8f/GGvJCdHdHrs1Y2y0QkQqxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733439; c=relaxed/simple; bh=N3CjMvJm810Tzw8+vLep/nynn+c6CzgdHtQQv1ih6gE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NjzwTjH6nb8HN2zoCTI2Sfcwi04AoWGX3SkhdLhX1G5ypXWjgW4s80+MT3RLYBC5Q1bjP6D6NISV7N0A5pW+hWZRI/oKzfNgVlwVZspKicCSaNiP68MPGKdc4PqKQnJVyDDOqSgrcHswhX7nm2YwSiP466lV/raxCWQWP8XkgWs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu; spf=pass smtp.mailfrom=prolan.hu; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b=K4cmsBdD; arc=none smtp.client-ip=193.68.50.107 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=prolan.hu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b="K4cmsBdD" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id E7D54A05A6; Wed, 29 Oct 2025 11:23:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prolan.hu; h=cc :cc:content-transfer-encoding:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mail; bh=xpe494TUf12sWea7iMN8 Pf4yZH2UjtnChHKj5WZ93kk=; b=K4cmsBdDGtRNQIdGYURVlBhAZELQjQnox+0M bfZsVccdDPEQ2hcJ72lf93ZOe1CtQMKFtS46mpWWybJv2Xdwlu6hO/CD6VYKs4nW lU1ZkLI/ULm+bMQRf95zCh9ZkomHV9y7buTZIEfGsi1imWkVr2j1xkmlvjutuqiz kH07AfJ1AokpiVtWvUMqkq/Eg2ZNtOo2NzO0kWx0WX2VmBeiaTaBPkEzXPZ1qjeg T+FHy1MwRL1hifd5qkfX7Ce2657jGV75k0CerrbLoKoR8cgzIGU9UcbqdhvA5ESb f83UDIWDb0kYCQwcRs2IfsP6p7UWHnjjDWVk0AIyVDC2sLX5d/fIUI84H6QRz2lL pWXbsSXsfP48vfuPbHeYxBrE+9hcV8CmA01u/IDTpRQo6YaxDs2oQ48d/ghc1lA6 +zf7JE+3h/Tq+ykHQ37iqEBYUiRCk+fOmaA0pDDEIX8aQLaEYM98sFPSKqdWXlzC jhnXvXpyXxZnrHIdyRYsrsSIi0kJ55d08lmqN4nbWchR4nqrExSqLgTiOQMoctrk XhpBcNLQtMkz2LZpg15/LilQ6lj99OaImxtYqUgWCnBSONGOhpBohTFX4SIjWgOk AINYpBNN099Ua8+WPkb1FxSgrmYTwXKXSFmkrHBgMMBrRtsgHsUmWiRLq4ZfvkU7 7byRh08= From: Buday Csaba To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Philipp Zabel , , CC: Buday Csaba Subject: [PATCH net-next v5 1/4] net: mdio: common handling of phy reset properties Date: Wed, 29 Oct 2025 11:23:41 +0100 Message-ID: X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1761733431;VERSION=8000;MC=766825136;ID=148162;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A296767155F677066 Content-Type: text/plain; charset="utf-8" Unify the handling of reset properties for an `mdio_device`. Replace mdiobus_register_gpiod() and mdiobus_register_reset() with mdio_device_register_reset() and mdio_device_unregister_reset(), and move them from mdio_bus.c to mdio_device.c, where they belong. The new functions handle both reset-controllers and reset-gpios, and also read the corresponding firmware properties from the device tree, which were previously handled in fwnode_mdio.c. This makes tracking the reset properties easier. The reset logic is unaltered, and should work as it did before. Signed-off-by: Buday Csaba --- V4 -> V5: - fixed possible leak in mdio_device_register_reset() if both a reset-gpio and a reset-controller are present. - fixed whitespace - updated commit message V3 -> V4: unmodified V2 -> V3: fixed kernel-doc warnings V1 -> V2: changed the return value of mdio_device_unregister_reset() to void --- drivers/net/mdio/fwnode_mdio.c | 5 ---- drivers/net/phy/mdio_bus.c | 39 ++----------------------- drivers/net/phy/mdio_device.c | 53 ++++++++++++++++++++++++++++++++++ include/linux/mdio.h | 2 ++ 4 files changed, 57 insertions(+), 42 deletions(-) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index 9b41d4697..ba7091518 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -92,11 +92,6 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *m= dio, if (fwnode_property_read_bool(child, "broken-turn-around")) mdio->phy_ignore_ta_mask |=3D 1 << addr; =20 - fwnode_property_read_u32(child, "reset-assert-us", - &phy->mdio.reset_assert_delay); - fwnode_property_read_u32(child, "reset-deassert-us", - &phy->mdio.reset_deassert_delay); - /* Associate the fwnode with the device structure so it * can be looked up later */ diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index cad6ed3aa..cc3f9cfb1 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -33,33 +33,6 @@ #define CREATE_TRACE_POINTS #include =20 -static int mdiobus_register_gpiod(struct mdio_device *mdiodev) -{ - /* Deassert the optional reset signal */ - mdiodev->reset_gpio =3D gpiod_get_optional(&mdiodev->dev, - "reset", GPIOD_OUT_LOW); - if (IS_ERR(mdiodev->reset_gpio)) - return PTR_ERR(mdiodev->reset_gpio); - - if (mdiodev->reset_gpio) - gpiod_set_consumer_name(mdiodev->reset_gpio, "PHY reset"); - - return 0; -} - -static int mdiobus_register_reset(struct mdio_device *mdiodev) -{ - struct reset_control *reset; - - reset =3D reset_control_get_optional_exclusive(&mdiodev->dev, "phy"); - if (IS_ERR(reset)) - return PTR_ERR(reset); - - mdiodev->reset_ctrl =3D reset; - - return 0; -} - int mdiobus_register_device(struct mdio_device *mdiodev) { int err; @@ -68,16 +41,9 @@ int mdiobus_register_device(struct mdio_device *mdiodev) return -EBUSY; =20 if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY) { - err =3D mdiobus_register_gpiod(mdiodev); + err =3D mdio_device_register_reset(mdiodev); if (err) return err; - - err =3D mdiobus_register_reset(mdiodev); - if (err) - return err; - - /* Assert the reset signal */ - mdio_device_reset(mdiodev, 1); } =20 mdiodev->bus->mdio_map[mdiodev->addr] =3D mdiodev; @@ -91,8 +57,7 @@ int mdiobus_unregister_device(struct mdio_device *mdiodev) if (mdiodev->bus->mdio_map[mdiodev->addr] !=3D mdiodev) return -EINVAL; =20 - gpiod_put(mdiodev->reset_gpio); - reset_control_put(mdiodev->reset_ctrl); + mdio_device_unregister_reset(mdiodev); =20 mdiodev->bus->mdio_map[mdiodev->addr] =3D NULL; =20 diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index f64176e0e..b56a75ee3 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -74,6 +74,59 @@ struct mdio_device *mdio_device_create(struct mii_bus *b= us, int addr) } EXPORT_SYMBOL(mdio_device_create); =20 +/** + * mdio_device_register_reset - Read and initialize the reset properties of + * an mdio device + * @mdiodev: mdio_device structure + * + * Return: Zero if successful, negative error code on failure + */ +int mdio_device_register_reset(struct mdio_device *mdiodev) +{ + struct reset_control *reset; + + /* Read optional firmware properties */ + fwnode_property_read_u32(dev_fwnode(&mdiodev->dev), "reset-assert-us", + &mdiodev->reset_assert_delay); + fwnode_property_read_u32(dev_fwnode(&mdiodev->dev), "reset-deassert-us", + &mdiodev->reset_deassert_delay); + + /* reset-gpio, bring up deasserted */ + mdiodev->reset_gpio =3D gpiod_get_optional(&mdiodev->dev, "reset", + GPIOD_OUT_LOW); + if (IS_ERR(mdiodev->reset_gpio)) + return PTR_ERR(mdiodev->reset_gpio); + + if (mdiodev->reset_gpio) + gpiod_set_consumer_name(mdiodev->reset_gpio, "PHY reset"); + + reset =3D reset_control_get_optional_exclusive(&mdiodev->dev, "phy"); + if (IS_ERR(reset)) { + gpiod_put(mdiodev->reset_gpio); + return PTR_ERR(reset); + } + + mdiodev->reset_ctrl =3D reset; + + /* Assert the reset signal */ + mdio_device_reset(mdiodev, 1); + + return 0; +} +EXPORT_SYMBOL(mdio_device_register_reset); + +/** + * mdio_device_unregister_reset - uninitialize the reset properties of + * an mdio device + * @mdiodev: mdio_device structure + */ +void mdio_device_unregister_reset(struct mdio_device *mdiodev) +{ + gpiod_put(mdiodev->reset_gpio); + reset_control_put(mdiodev->reset_ctrl); +} +EXPORT_SYMBOL(mdio_device_unregister_reset); + /** * mdio_device_register - Register the mdio device on the MDIO bus * @mdiodev: mdio_device structure to be added to the MDIO bus diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 42d6d47e4..d81b63fc7 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -90,6 +90,8 @@ static inline void *mdiodev_get_drvdata(struct mdio_devic= e *mdio) =20 void mdio_device_free(struct mdio_device *mdiodev); struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr); +int mdio_device_register_reset(struct mdio_device *mdiodev); +void mdio_device_unregister_reset(struct mdio_device *mdiodev); int mdio_device_register(struct mdio_device *mdiodev); void mdio_device_remove(struct mdio_device *mdiodev); void mdio_device_reset(struct mdio_device *mdiodev, int value); --=20 2.39.5 From nobody Sun Dec 14 18:07:31 2025 Received: from fw2.prolan.hu (fw2.prolan.hu [193.68.50.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33F82336EDB; Wed, 29 Oct 2025 10:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.68.50.107 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733438; cv=none; b=qC0e9qm2sC0KcJheAQgUnZqfU3QF6mWJPfzEgP1X4mggPG2EdFbo8cSV6naOHJgFt4Ngn4TdLArD1tTxHaKr3G+uyQisVpi+Who5Le3QIV6D6wJcT7aAX2hc3bAU5Lx6bHuatehWGyHnKzCuhwCd70BzKQwlW0aaO1Vl0/1LOtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733438; c=relaxed/simple; bh=oUKGnYgilFynlf9RWW9QBJA89qHTYZqr78X8jl0gFLA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sYZ+xIgz6X8vofwM2H+G/SxmTgXlBeRoUGHlSlrdEbL2vc+6ZJv1q/Off69kiah4POL/6wgay0Xkv5P3lcrp2VljbR1nnzHqx+b+1I7KsUL2HS8G0Wa39N76/E7YWi1xNG614AhGRt+VbdWpCjeFq8OvL2w2TTl3OEnpqxiDrl4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu; spf=pass smtp.mailfrom=prolan.hu; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b=hpvQrGwa; arc=none smtp.client-ip=193.68.50.107 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=prolan.hu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b="hpvQrGwa" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id 9BD3BA09F6; Wed, 29 Oct 2025 11:23:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prolan.hu; h=cc :cc:content-transfer-encoding:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mail; bh=hNi+oxh7uhqsLj8vmj9s Wtx8Z68XKdLsNBP74idH4aE=; b=hpvQrGwaBrr/YcsYMuEZb0xxCx479u+mxJUE 9eTMnDiEiZiLPQgRNlDmHBQ866l7KpdxbV9PvzhCG0nu+0+DlWOQ5co6mlpodwsg DJ1J+geuShI1VSBLggBLPpMqTjb3ggl1uC/JCHFxF91R3tjMplQi6xx2/wtqoWxk qUWFId2/KgnqLm7icI9416B/OammxIb9X8rtAlIyh5mKjTaUaf0ft/EaBxX4tEy4 8ChikJWmRDM4FzeYDIlchrxhMXaociiP63tqDpQV+9TgW3vb8lodzXuvx5qL1/PD DT9t2KtnVVSyiLbWmJGoJ+o3vKIPBGcD00kyjYXWmXt3gFWZRnDcAS2LwsS3K5Fp Wxxw8FwGykk0gOaOPYDfSV0CBm0obNZYsRVcO5VfYX0K2HuAtUaAZYSuhOmlAd3W 3r5FGOMjj4drLXzp+j5uZEbzGYaGYviXkvVRHVlOSuC2MHIBITwou8FYKL+DO1rg blV/pIO9kWimcmLvtQ0njgVGC4+xO212jC15CvBlHp8Wm+xswWmeJdY2RM5AJB0g iB6o8Koh+C/ADpkd6sgTEukv5y2AlZXVl9etkscZc1qXhTR1XyoF6K2daTGieMFa /tJ+YY6rJeh1bcR/SCWl5ikpjuj6vuI4ZF1bOHfBjK4GigYN2DFBYQhwapsb/2cR U9H03KA= From: Buday Csaba To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Philipp Zabel , , CC: Buday Csaba Subject: [PATCH net-next v5 2/4] net: mdio: change property read from fwnode_property_read_u32() to device_property_read_u32() Date: Wed, 29 Oct 2025 11:23:42 +0100 Message-ID: <2609ecfcd2987e9d41b1e1c7c13c1b438b37e297.1761732347.git.buday.csaba@prolan.hu> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1761733432;VERSION=8000;MC=2670981356;ID=148163;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A296767155F677066 Content-Type: text/plain; charset="utf-8" Change fwnode_property_read_u32() in mdio_device_register_reset() to device_property_read_u32(), which is more appropriate here. Signed-off-by: Buday Csaba Reviewed-by: Andrew Lunn --- V4 -> V5: tweaked commit message V3 -> V4: unmodified V2 -> V3: unmodified V1 -> V2: added new patch based on maintainer request --- drivers/net/phy/mdio_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index b56a75ee3..e24bce474 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -86,9 +86,9 @@ int mdio_device_register_reset(struct mdio_device *mdiode= v) struct reset_control *reset; =20 /* Read optional firmware properties */ - fwnode_property_read_u32(dev_fwnode(&mdiodev->dev), "reset-assert-us", + device_property_read_u32(&mdiodev->dev, "reset-assert-us", &mdiodev->reset_assert_delay); - fwnode_property_read_u32(dev_fwnode(&mdiodev->dev), "reset-deassert-us", + device_property_read_u32(&mdiodev->dev, "reset-deassert-us", &mdiodev->reset_deassert_delay); =20 /* reset-gpio, bring up deasserted */ --=20 2.39.5 From nobody Sun Dec 14 18:07:31 2025 Received: from fw2.prolan.hu (fw2.prolan.hu [193.68.50.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1472336EE6; Wed, 29 Oct 2025 10:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.68.50.107 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733438; cv=none; b=HIHNbqOlcKfoPaQoGkCBdEe+JR3j2StN9bkNLmOZV6iH70vC/AfPKyJ0Bf87kBeMV+ot8793BrAtWsypsuWakrvkTZTgEqkU8fnTafmijAnt+FD5Xo7ZfH0ec07GFatEMn10XcX1s3sCnPFc5j6tQBJr2eQ+pGvOzZ4Hvfu8a90= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733438; c=relaxed/simple; bh=gdDyCJFwXhEzN5BdFc3KdmJ+d9teKB6ElyWgJOpoEnI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BPXxnZWtK/ReY5T0F70/ACJABlP45mgklg1tu7YTDk5GBZpny1AqTjfDXm0m3Oedagk2UkJm2YWu7/4Ff7iMldxkVUH4m3Xpb2MM8br1/LlDj8ek/Iqgr+DW+KwbqvGZpmYlUFQxqrQdP4Ia/pP6QXvRlNGww1ZNxgQJv84p4XE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu; spf=pass smtp.mailfrom=prolan.hu; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b=CnnkWMw9; arc=none smtp.client-ip=193.68.50.107 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=prolan.hu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b="CnnkWMw9" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id 05AACA103D; Wed, 29 Oct 2025 11:23:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prolan.hu; h=cc :cc:content-transfer-encoding:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mail; bh=WZc19MxEdOgnJCHscmbM xcyD19MjLAKNwWL8Njb/7d8=; b=CnnkWMw990cF1ir2vyXC4pHUz3iPpgpXyfbL UZMthiHCl0JoX/ahk3X3BWls6Gi0gQzIAme4nz1qBCO1NE00wQhWqa9GKesLvxfh RiOfH6lnyvF2ywM2kNTR779+o97kIUwbnqlPQnTI3r6IPpafkMtOSiy3KhamocMP wwk8qo9ddab+k3rpxls61+hrEqt8Gk8d95C/H7HDrMCngasguKbpEX6RPCfk4c20 KM8pntKL/vT01ypy4Jp+qSfwETO8+Xqv7j1hei5TAix/nZi5pUPw5bEmbjWvBd2L JwBg5/yM+N54/zK4yBde1y37irNLFklvfGgxAo+G8K5hhPTNfBANpVt8dAg1YyEW /dqJ6dGhOT26aKtkB5WXTVAchku8C+nwZqPqlxEISECRIGP4qaG5pu5A/Ji7CkVu h2oOb0QISEtsRXym2OlS5PSDfSbPHwrMTn70Ma7IrVrTBJwkPn4MfkjAhTlcGevO meLvMH9HY/oUhpIHo4Dkb6bxaDmHIIvIoxDg0jIwYxpNvQPb6yARtxXn9ovVuDL/ ruINkIo0WNHecZtzdGrmo7qKQq3flXOUBC7aeEfVyxMhr4WtQ2cx0nvwPUWu91VU v85TEQyzbtPpYcLQTRPXPjhB7K4eJkZ//f20eBfapYQ6FU/wPh5u0DkaOQ19SzNW zgW4jbo= From: Buday Csaba To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Philipp Zabel , , CC: Buday Csaba Subject: [PATCH net-next v5 3/4] net: mdio: reset PHY before attempting to access registers in fwnode_mdiobus_register_phy Date: Wed, 29 Oct 2025 11:23:43 +0100 Message-ID: <5f8d93021a7aa6eeb4fb67ab27ddc7de9101c59f.1761732347.git.buday.csaba@prolan.hu> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1761733432;VERSION=8000;MC=2688889924;ID=148164;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A296767155F677066 Content-Type: text/plain; charset="utf-8" When the ID of an Ethernet PHY is not provided by the 'compatible' string in the device tree, its actual ID is read via the MDIO bus. For some PHYs this could be unsafe, since a hard reset may be necessary to safely access the MDIO registers. Add a fallback mechanism for these devices: when reading the ID fails, the reset will be asserted, and the ID read is retried. Signed-off-by: Buday Csaba --- V4 -> V5: - when fwnode_reset_phy() returns with -EPROBE_DEFER, that error is now propagated upstream instead of being discarded. - info message removed (it will be a separate commit) - 'err' variable changed to 'rc' in fwnode_reset_phy() - removed last fwnode_handle_put() in fwnode_reset_phy() The cleanup is performed by mdio_device_free(). V3 -> V4: dropped DT property `phy-id-read-needs-reset` to control the reset behaviour, asserting reset as a fallback mechanism instead. Added info level message for resetting. V2 -> V3: kernel-doc replaced with a comment (fixed warning) V1 -> V2: - renamed fwnode_reset_phy_before_probe() to fwnode_reset_phy() - added kernel-doc for fwnode_reset_phy() - improved error handling in fwnode_reset_phy() --- drivers/net/mdio/fwnode_mdio.c | 38 +++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index ba7091518..9669da2b7 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -114,6 +114,34 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus = *mdio, } EXPORT_SYMBOL(fwnode_mdiobus_phy_device_register); =20 +/* Hard-reset a PHY before registration */ +static int fwnode_reset_phy(struct mii_bus *bus, u32 addr, + struct fwnode_handle *phy_node) +{ + struct mdio_device *tmpdev; + int rc; + + tmpdev =3D mdio_device_create(bus, addr); + if (IS_ERR(tmpdev)) + return PTR_ERR(tmpdev); + + fwnode_handle_get(phy_node); + device_set_node(&tmpdev->dev, phy_node); + rc =3D mdio_device_register_reset(tmpdev); + if (rc) { + mdio_device_free(tmpdev); + return rc; + } + + mdio_device_reset(tmpdev, 1); + mdio_device_reset(tmpdev, 0); + + mdio_device_unregister_reset(tmpdev); + mdio_device_free(tmpdev); + + return 0; +} + int fwnode_mdiobus_register_phy(struct mii_bus *bus, struct fwnode_handle *child, u32 addr) { @@ -129,8 +157,16 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, return PTR_ERR(mii_ts); =20 is_c45 =3D fwnode_device_is_compatible(child, "ethernet-phy-ieee802.3-c45= "); - if (is_c45 || fwnode_get_phy_id(child, &phy_id)) + if (is_c45 || fwnode_get_phy_id(child, &phy_id)) { phy =3D get_phy_device(bus, addr, is_c45); + if (IS_ERR(phy)) { + rc =3D fwnode_reset_phy(bus, addr, child); + if (rc =3D=3D -EPROBE_DEFER) + goto clean_mii_ts; + else if (!rc) + phy =3D get_phy_device(bus, addr, is_c45); + } + } else phy =3D phy_device_create(bus, addr, phy_id, 0, NULL); if (IS_ERR(phy)) { --=20 2.39.5 From nobody Sun Dec 14 18:07:31 2025 Received: from fw2.prolan.hu (fw2.prolan.hu [193.68.50.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F105230ACFD; Wed, 29 Oct 2025 10:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.68.50.107 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733438; cv=none; b=WXwLCjJ8aD8RFnP11ovCerAR5rAQeKTpsiXynfmE0oLdZJJPbCYxZgt/tiQ+DTK1tRzcoidwdeVW2a45n0BYtjGTSiTEDGCWr/6J9/bkLyxMZJnqNh84wmlpDi/b7hMsjl5dFK6U3euxTH/ob25H6Ca/CGmunpmnFd2AkuFwSy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733438; c=relaxed/simple; bh=LWorVN0z+K6kgceBcQg4hnxyitdv/Bg0r2zhT2rt2I8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZIgeTVBSJ7dq2z2dsPdE9uTEtcJJhVlfVyaqKPx4TaHEdwzMd8395KmOpG8RHCayzoAw7k/9xBP8SzBM4fa3v2Mm2/1clXgvyiwO88u2yU+mP+yN2vbxh7axeaTE6fMinZ7Ss4AqkVhQCOOFj6AWWHm0Emht/rf0BByPJ7VWncw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu; spf=pass smtp.mailfrom=prolan.hu; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b=Mp/RIP2R; arc=none smtp.client-ip=193.68.50.107 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=prolan.hu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b="Mp/RIP2R" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id 3EB0EA08A7; Wed, 29 Oct 2025 11:23:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prolan.hu; h=cc :cc:content-transfer-encoding:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mail; bh=2z5QiMzrrCSkR3IZJVVV A5sX7Ppj2SIi4n51Kw6tQiQ=; b=Mp/RIP2RTvl8NnemkKMMEu1dBi+YaMPW9RNg 9V+w6F2wpb++gvB5ezQpzy/CjFkLqe1f0BG1IjcR6NTy1XvYWlC806DXD4AdeKRK KzqavfYiL7iPftqytwQP7NGeFDroDuAISevkU0/BGGwy70LG3nA75DGYtnd9dq8c T9AWzxpnTQnT3Z0mEOk+pqP2LKi1H4/+ZANXpImvmz069OnNNTbdBb92v4jOlW2V YOdczkk1Hneh84K8+dBNIimdU/cd6+QK+OEC0Pedrwd2GCQHLqEPdzsNh6h9GgN3 OhXBV7alzgaGgUGiH6cKlVA88UFiyvfCm6MPundjYdGAPqPHuG8hCrs9WhDUGFP/ q0TGLAdOi56GJGWbnKt2no8eAh+BZKgv64TvZ/cJQoghv3gizCa8rOe8zhN9ggBt mWDDJymR9CJyXiRHZkeOEqM4blMbzpQp4LPKwNNLdjmHBf77g7dRHNph88Nd+gzV zCvx5kx+3n9upajmoUwF56t7jqpBcd8ld0csP3tVax/zhrv+P95CYixrfbYHt6Nd wccKdD0fswUcMgjPLGNpU6R3TX0YgXLHmSOZww0tCfF/7cci279zWUZMUqqdneiS C6D+/umzSfUZvwa8LWwTsMaIUxvfHZhkR34sTurOQaW/xgPGYdgoQapqnbBsBgXW lVa1xeU= From: Buday Csaba To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Philipp Zabel , , CC: Buday Csaba Subject: [PATCH net-next v5 4/4] net: mdio: add message when resetting a PHY before registration Date: Wed, 29 Oct 2025 11:23:44 +0100 Message-ID: <30736cb54c803e8992c9c4fd3ab38960a85dbc80.1761732347.git.buday.csaba@prolan.hu> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1761733432;VERSION=8000;MC=1456441996;ID=148165;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A296767155F677066 Content-Type: text/plain; charset="utf-8" Add an info level message when resetting a PHY before registration. Signed-off-by: Buday Csaba --- V4 -> V5: moved the info message to a separate commit --- drivers/net/mdio/fwnode_mdio.c | 9 +++++++-- drivers/net/phy/mdio_device.c | 13 +++++++++++++ include/linux/mdio.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index 9669da2b7..d753ebd37 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -133,8 +133,13 @@ static int fwnode_reset_phy(struct mii_bus *bus, u32 a= ddr, return rc; } =20 - mdio_device_reset(tmpdev, 1); - mdio_device_reset(tmpdev, 0); + if (mdio_device_has_reset(tmpdev)) { + dev_info(&bus->dev, + "PHY device at address %d not detected, resetting PHY.\n", + addr); + mdio_device_reset(tmpdev, 1); + mdio_device_reset(tmpdev, 0); + } =20 mdio_device_unregister_reset(tmpdev); mdio_device_free(tmpdev); diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index e24bce474..f2cbcb6bb 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -171,6 +171,19 @@ void mdio_device_remove(struct mdio_device *mdiodev) } EXPORT_SYMBOL(mdio_device_remove); =20 +/** + * mdio_device_has_reset - Check if an MDIO device has reset properties de= fined + * @mdiodev: mdio_device structure + * + * Return: non-zero if the device has a reset GPIO or reset controller, + * zero otherwise. + */ +int mdio_device_has_reset(struct mdio_device *mdiodev) +{ + return (mdiodev->reset_gpio || mdiodev->reset_ctrl); +} +EXPORT_SYMBOL(mdio_device_has_reset); + void mdio_device_reset(struct mdio_device *mdiodev, int value) { unsigned int d; diff --git a/include/linux/mdio.h b/include/linux/mdio.h index d81b63fc7..83cfc051e 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -92,6 +92,7 @@ void mdio_device_free(struct mdio_device *mdiodev); struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr); int mdio_device_register_reset(struct mdio_device *mdiodev); void mdio_device_unregister_reset(struct mdio_device *mdiodev); +int mdio_device_has_reset(struct mdio_device *mdiodev); int mdio_device_register(struct mdio_device *mdiodev); void mdio_device_remove(struct mdio_device *mdiodev); void mdio_device_reset(struct mdio_device *mdiodev, int value); --=20 2.39.5