From nobody Mon Feb 9 09:08:33 2026 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 8E976311961; Wed, 22 Oct 2025 09:09:04 +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=1761124146; cv=none; b=EXj6s1NpqW0mS9f/OI3R+o4Oc8oIYcukwVWuhjH2a3fzchd14U0GJRFgouXQe7wjieXRTEumxAekNs7i6jvZUz27izBNhulLXKbFM1tMA9Y6xvAapkJbPzKsSYtSTWWcMTK7MYfqmpbSVYJQybNu+M+MJMfWKtCBXApjcIq5TF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761124146; c=relaxed/simple; bh=g1YAmeMzN6ozffVqPzQIrrVPv3nv4gUq1NT+8X3Q6hI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KcFllm76h3aIEWlM39ZLcSrWuYUrySdVT7Dv/5TYSRIZEy65kwAegul0WMzxCXvUDjj0tgHm6lEZ6EQjEf/AJJS1L3FnnpQ8X3ybPXQ+HwieNAL3FzSgt99j7bHUJ7dvoyBaWjGujaYB2LweXV8UOSzh5enNzYpUHA8mssKtows= 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=VshWH/Ut; 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="VshWH/Ut" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id 2BAA2A0AC2; Wed, 22 Oct 2025 11:08:57 +0200 (CEST) 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=Hqjddm9r/QWkPQVUfT2f uPoj7hfgEt2/ZG9yAxvwVhQ=; b=VshWH/UtJ9R9xro2kFmjb6fxaSehvNTjail/ EWiAMfPh5HiRCpH8SEkPtyLMQovG9aBiQbQdFokCLSD7SZcfy3J3KTh3rnsFoDsh RDTPfsf3m51zjjww+4RBU6NT7nAsLg1q4yfwHRTRPTZksPXd0ZosnHEJcOIj8Vi1 n7u8IinhXIhaRfVwH8rhXsCKbnvmBT8aBEK5ZVxBsPQgyAOHuvYM47LY1HhMzA9q wiFrYzrJlHQImfUFAU4GU2d83FhBhYNCUnijTPPmpfcbFhbTSeWNL+oz8RyqSEmy NjzTDmZhoCsfb1FFOVkND8Hsp2cMN7gkILQoJeEDF2TerwZ4bLLOVWvJXUh2EvIP fTBrRzBoLnti42IGCog4SEWjWm56c+onX+oQ1LyIZl+GhTNZAp+XT/oBrr9mm8uP rtA2XrRpjl0AET5r1MuEbylufF0Qp9HOCcx85YTOSr941rgsor/OklT1Wi2JZQRx y1c/iuq9gHVmHU7//cFaVddr3hNRm0zasT7NoAY7piquKJrIUem4G/bHDeNnv515 ig+76YJAOyMsGtAKeVToFvX79Imf+9tWMr7k4ZpGiurIruzNM9o6ulpfWSWx/HTc FkrzakBaEOqZq18ky1OB4WdiLhGN3eQ9bWr3AIhAaYQxGS48DcfAd/PFCqBwCkB6 YMsTIeM= 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 v4 1/4] net: mdio: common handling of phy reset properties Date: Wed, 22 Oct 2025 11:08:50 +0200 Message-ID: <58dd6c6e6684e2dc8e7a97e9ebc086a1cb273735.1761124022.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=1761124136;VERSION=8000;MC=2712308536;ID=130158;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A2998FD515F647D62 Content-Type: text/plain; charset="utf-8" Reset properties of an `mdio_device` are initialized in multiple source files and multiple functions: - `reset_assert_delay` and `reset_deassert_delay` are in fwnode_mdio.c - `reset_gpio` and `reset_ctrl` are in mdio_bus.c, but handled by different functions This patch unifies the handling of all these properties into two functions. mdiobus_register_gpiod() and mdiobus_register_reset() are removed, while mdio_device_register_reset() and mdio_device_unregister_reset() are introduced instead. These functions handle both reset-controllers and reset-gpios, and also read the corresponding properties from the device tree. These changes should make tracking the reset properties easier. The reset logic is unaltered, and should work as it did before. Signed-off-by: Buday Csaba --- V3 -> V4: unmodified V2 -> V3: fixed kernel-doc warnings V1 -> V2: the return value of mdio_device_unregister_reset() is made void --- drivers/net/mdio/fwnode_mdio.c | 5 ---- drivers/net/phy/mdio_bus.c | 39 ++----------------------- drivers/net/phy/mdio_device.c | 52 ++++++++++++++++++++++++++++++++++ include/linux/mdio.h | 2 ++ 4 files changed, 56 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..fb1cb7a26 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -74,6 +74,58 @@ 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)) + 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