Skip to contentSkip to conversation

net: fec: optionally reset PHY via a reset-controller

PATCH In review Sven Van Asbroeck 2 participants 6 messages Jul 15, 2019 – Jul 18, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: fec: optionally reset PHY via a reset-controller

The current fec driver allows the PHY to be reset via a gpio, specified in the devicetree. However, some PHYs need to be reset in a more complex way.

To accommodate such PHYs, allow an optional reset controller in the fec devicetree. If no reset controller is found, the fec will fall back to the legacy reset behaviour.

Example:

&fec {
	phy-mode = "rgmii";
	resets = <&phy_reset>;
	reset-names = "phy";
	status = "okay";
};

---

Will send a Documentation patch if this receives a positive review.

 drivers/net/ethernet/freescale/fec_main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/fec_main.c +5 -1
index 38f10f7dcbc3..5a5f3ed6f16d 100644
@@ -61,6 +61,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/if_vlan.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/reset.h>
 #include <linux/prefetch.h>
 #include <soc/imx/cpuidle.h>
 
@@ -3335,6 +3336,7 @@ static int fec_enet_get_irq_cnt(struct platform_device *pdev)
 static int
 fec_probe(struct platform_device *pdev)
 {
+	struct reset_control *phy_reset;
 	struct fec_enet_private *fep;
 	struct fec_platform_data *pdata;
 	struct net_device *ndev;
@@ -3490,7 +3492,9 @@ fec_probe(struct platform_device *pdev)
 	pm_runtime_set_active(&pdev->dev);
 	pm_runtime_enable(&pdev->dev);
 
-	ret = fec_reset_phy(pdev);
+	phy_reset = devm_reset_control_get_exclusive(&pdev->dev, "phy");
+	ret = IS_ERR(phy_reset) ? fec_reset_phy(pdev) :
+			reset_control_reset(phy_reset);
 	if (ret)
 		goto failed_reset;
 
Signature · 1 line
2.17.1
#1 lore raw

From: Sven Van Asbroeck <[email protected]> Sent: Tuesday, July 16, 2019 5:05 AM

Quoted 44 lines

The current fec driver allows the PHY to be reset via a gpio, specified in the devicetree. However, some PHYs need to be reset in a more complex way.

To accommodate such PHYs, allow an optional reset controller in the fec devicetree. If no reset controller is found, the fec will fall back to the legacy reset behaviour.

Example:

&fec {
        phy-mode = "rgmii";
        resets = <&phy_reset>;
        reset-names = "phy";
        status = "okay";
};

---

Will send a Documentation patch if this receives a positive review.

 drivers/net/ethernet/freescale/fec_main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/fec_main.c +2 -0
index 38f10f7dcbc3..5a5f3ed6f16d 100644
@@ -61,6 +61,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/if_vlan.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/reset.h>
 #include <linux/prefetch.h>
 #include <soc/imx/cpuidle.h>
 
@@ -3335,6 +3336,7 @@ static int fec_enet_get_irq_cnt(struct
 platform_device *pdev)  static int  fec_probe(struct platform_device *pdev)
 {
+       struct reset_control *phy_reset;
        struct fec_enet_private *fep;
        struct fec_platform_data *pdata;
        struct net_device *ndev;

drivers/net/ethernet/freescale/fec_main.c fec_probe(struct platform_device *pdev) · line 3500

Quoted 10 lines
drivers/net/ethernet/freescale/fec_main.c +3 -1
@@ -3490,7 +3492,9 @@ fec_probe(struct platform_device *pdev)
        pm_runtime_set_active(&pdev->dev);
        pm_runtime_enable(&pdev->dev);
 
-       ret = fec_reset_phy(pdev);
+       phy_reset = devm_reset_control_get_exclusive(&pdev->dev,
 "phy");
+       ret = IS_ERR(phy_reset) ? fec_reset_phy(pdev) :
+                       reset_control_reset(phy_reset);
        if (ret)
                goto failed_reset;

The patch looks fine.
But the reset mechanism in the driver should be abandoned since the phylib already can handle mii bus reset and phy device reset like below piece code:

of_mdiobus_register()

    of_mdiobus_register_phy()
        phy_device_register()
            mdiobus_register_device()
                /* Assert the reset signal */
                mdio_device_reset(mdiodev, 1);
            /* Deassert the reset signal */
            mdio_device_reset(&phydev->mdio, 0);

dts:

        ethernet-phy@0 {
            compatible = "ethernet-phy-id0141.0e90", "ethernet-phy-ieee802.3-c45";
            interrupt-parent = <&PIC>;
            interrupts = <35 1>;
            reg = <0>;

            resets = <&rst 8>;
            reset-names = "phy";
            reset-gpios = <&gpio1 4 1>;
            reset-assert-us = <1000>;
            reset-deassert-us = <2000>;
        };
    };

Please refer to doc:
Documentation/devicetree/bindings/net/ethernet-phy.yaml

Quoted 3 lines

--
2.17.1

#2 lore raw

Hi Andy,

Quoted 2 lines · Andy Duan

the phylib already can handle mii bus reset and phy device reset

That's a great suggestion, thank you !! I completely overlooked that code. What will happen to the legacy phy reset code in fec? Are there many users left?

#3 lore raw

From: Sven Van Asbroeck <[email protected]> Sent: Tuesday, July 16, 2019 9:19 PM

Quoted 10 lines

Hi Andy,

Quoted 2 lines · Andy Duan

the phylib already can handle mii bus reset and phy device reset

That's a great suggestion, thank you !! I completely overlooked that code. What will happen to the legacy phy reset code in fec? Are there many users left?

Yes, so the old legacy code is kept there. But it is better to clean up all if there have enough boards to verify them.

#4 lore raw
Quoted 3 lines · Andy Duan

Yes, so the old legacy code is kept there. But it is better to clean up all if there have enough boards to verify them.

Would it make sense to print a warning message to the log whenever someone tries to use the legacy phy reset on the fec?

#5 lore raw

From: Sven Van Asbroeck <[email protected]> Sent: Wednesday, July 17, 2019 8:48 PM

Quoted 7 lines · Andy Duan
Quoted 3 lines

Yes, so the old legacy code is kept there. But it is better to clean up all if there have enough boards to verify them.

Would it make sense to print a warning message to the log whenever someone tries to use the legacy phy reset on the fec?

It is feasible, just as reminder to drop such usage.