This patch improves the XLG configuration function, to only update the
XLG configuration register when a change is needed. This helps not
writing over and over the same XLG configuration each time phylink
request the MAC to be configured. This mimics the GMAC configuration
function.

Signed-off-by: Antoine Tenart <antoine.ten...@bootlin.com>
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c 
b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index b27966355df9..59ee9e7545b0 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4506,10 +4506,11 @@ static void mvpp2_mac_an_restart(struct net_device *dev)
 static void mvpp2_xlg_config(struct mvpp2_port *port, unsigned int mode,
                             const struct phylink_link_state *state)
 {
-       u32 ctrl0, ctrl4;
+       u32 old_ctrl0, ctrl0;
+       u32 old_ctrl4, ctrl4;
 
-       ctrl0 = readl(port->base + MVPP22_XLG_CTRL0_REG);
-       ctrl4 = readl(port->base + MVPP22_XLG_CTRL4_REG);
+       old_ctrl0 = ctrl0 = readl(port->base + MVPP22_XLG_CTRL0_REG);
+       old_ctrl4 = ctrl4 = readl(port->base + MVPP22_XLG_CTRL4_REG);
 
        if (state->pause & MLO_PAUSE_TX)
                ctrl0 |= MVPP22_XLG_CTRL0_TX_FLOW_CTRL_EN;
@@ -4525,8 +4526,10 @@ static void mvpp2_xlg_config(struct mvpp2_port *port, 
unsigned int mode,
        ctrl4 |= MVPP22_XLG_CTRL4_FWD_FC | MVPP22_XLG_CTRL4_FWD_PFC |
                 MVPP22_XLG_CTRL4_EN_IDLE_CHECK;
 
-       writel(ctrl0, port->base + MVPP22_XLG_CTRL0_REG);
-       writel(ctrl4, port->base + MVPP22_XLG_CTRL4_REG);
+       if (old_ctrl0 != ctrl0)
+               writel(ctrl0, port->base + MVPP22_XLG_CTRL0_REG);
+       if (old_ctrl4 != ctrl4)
+               writel(ctrl4, port->base + MVPP22_XLG_CTRL4_REG);
 }
 
 static void mvpp2_gmac_config(struct mvpp2_port *port, unsigned int mode,
-- 
2.20.1

Reply via email to