The PHY state machine (in drivers/net/phy/phy.c) will unconditionally
call phydev->adjust_link (macb_handle_link_change) when polling in the
PHY_CHANGELINK state. As currently written, macb always ends up
requesting a new tx_clk frequency in macb_handle_link_change. It is a
waste of time to request a new tx_clk frequency if the link state hasn't
changed, as the tx_clk will already be configured properly.

Let's only request a new tx_clk clock frequency when necessary.

Signed-off-by: Jaeden Amero <jaeden.am...@ni.com>
Cc: Josh Cartwright <jo...@ni.com>
Cc: Soren Brinkmann <soren.brinkm...@xilinx.com>
---
 drivers/net/ethernet/cadence/macb.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c 
b/drivers/net/ethernet/cadence/macb.c
index f00be58..a0a04b3 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -293,10 +293,13 @@ static void macb_handle_link_change(struct net_device 
*dev)
 
        spin_unlock_irqrestore(&bp->lock, flags);
 
-       macb_set_tx_clk(bp->tx_clk, phydev->speed, dev);
-
        if (status_change) {
                if (phydev->link) {
+                       /* Update the TX clock rate if and only if the link is
+                        * up and there has been a link change.
+                        */
+                       macb_set_tx_clk(bp->tx_clk, phydev->speed, dev);
+
                        netif_carrier_on(dev);
                        netdev_info(dev, "link up (%d/%s)\n",
                                    phydev->speed,
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to