net: phylink: add functions to block/unblock rx clock stop

Some MACs require the PHY receive clock to be running to complete setup
actions. This may fail if the PHY has negotiated EEE, the MAC supports
receive clock stop, and the link has entered LPI state. Provide a pair
of APIs that MAC drivers can use to temporarily block the PHY disabling
the receive clock.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tvO6k-008Vjt-MZ@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 82860cf153aec192cfd16fc31f2eabfcc397a59a..b870a450e2a0bd3fbfa55c6ec940a13e97b06e26 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -87,6 +87,7 @@ struct phylink {
        bool mac_enable_tx_lpi;
        bool mac_tx_clk_stop;
        u32 mac_tx_lpi_timer;
+       u8 mac_rx_clk_stop_blocked;
 
        struct sfp_bus *sfp_bus;
        bool sfp_may_have_phy;
@@ -2435,6 +2436,64 @@ void phylink_stop(struct phylink *pl)
 }
 EXPORT_SYMBOL_GPL(phylink_stop);
 
+/**
+ * phylink_rx_clk_stop_block() - block PHY ability to stop receive clock in LPI
+ * @pl: a pointer to a &struct phylink returned from phylink_create()
+ *
+ * Disable the PHY's ability to stop the receive clock while the receive path
+ * is in EEE LPI state, until the number of calls to phylink_rx_clk_stop_block()
+ * are balanced by calls to phylink_rx_clk_stop_unblock().
+ */
+void phylink_rx_clk_stop_block(struct phylink *pl)
+{
+       ASSERT_RTNL();
+
+       if (pl->mac_rx_clk_stop_blocked == U8_MAX) {
+               phylink_warn(pl, "%s called too many times - ignoring\n",
+                            __func__);
+               dump_stack();
+               return;
+       }
+
+       /* Disable PHY receive clock stop if this is the first time this
+        * function has been called and clock-stop was previously enabled.
+        */
+       if (pl->mac_rx_clk_stop_blocked++ == 0 &&
+           pl->mac_supports_eee_ops && pl->phydev &&
+           pl->config->eee_rx_clk_stop_enable)
+               phy_eee_rx_clock_stop(pl->phydev, false);
+}
+EXPORT_SYMBOL_GPL(phylink_rx_clk_stop_block);
+
+/**
+ * phylink_rx_clk_stop_unblock() - unblock PHY ability to stop receive clock
+ * @pl: a pointer to a &struct phylink returned from phylink_create()
+ *
+ * All calls to phylink_rx_clk_stop_block() must be balanced with a
+ * corresponding call to phylink_rx_clk_stop_unblock() to restore the PHYs
+ * ability to stop the receive clock when the receive path is in EEE LPI mode.
+ */
+void phylink_rx_clk_stop_unblock(struct phylink *pl)
+{
+       ASSERT_RTNL();
+
+       if (pl->mac_rx_clk_stop_blocked == 0) {
+               phylink_warn(pl, "%s called too many times - ignoring\n",
+                            __func__);
+               dump_stack();
+               return;
+       }
+
+       /* Re-enable PHY receive clock stop if the number of unblocks matches
+        * the number of calls to the block function above.
+        */
+       if (--pl->mac_rx_clk_stop_blocked == 0 &&
+           pl->mac_supports_eee_ops && pl->phydev &&
+           pl->config->eee_rx_clk_stop_enable)
+               phy_eee_rx_clock_stop(pl->phydev, true);
+}
+EXPORT_SYMBOL_GPL(phylink_rx_clk_stop_unblock);
+
 /**
  * phylink_suspend() - handle a network device suspend event
  * @pl: a pointer to a &struct phylink returned from phylink_create()

diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index 06f1b649f1731b9612f42ea5d2fcd2f182e7019f..1f5773ab566010e4bc44f3a71dac2d023fcfb8a6 100644 (file)
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -706,6 +706,9 @@ int phylink_pcs_pre_init(struct phylink *pl, struct phylink_pcs *pcs);
 void phylink_start(struct phylink *);
 void phylink_stop(struct phylink *);
 
+void phylink_rx_clk_stop_block(struct phylink *);
+void phylink_rx_clk_stop_unblock(struct phylink *);
+
 void phylink_suspend(struct phylink *pl, bool mac_wol);
 void phylink_prepare_resume(struct phylink *pl);
 void phylink_resume(struct phylink *pl);