net: phy: mscc: take into account the 1588 block in MACsec init

This patch takes in account the use of the 1588 block in the MACsec
initialization, as a conditional configuration has to be done (when the
1588 block is used).

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c
index c0eeb62..713c62b 100644 (file)
--- a/drivers/net/phy/mscc/mscc_macsec.c
+++ b/drivers/net/phy/mscc/mscc_macsec.c
@@ -285,7 +285,9 @@ static void vsc8584_macsec_mac_init(struct phy_device *phydev,
                                 MSCC_MAC_CFG_PKTINF_CFG_STRIP_PREAMBLE_ENA |
                                 MSCC_MAC_CFG_PKTINF_CFG_INSERT_PREAMBLE_ENA |
                                 (bank == HOST_MAC ?
-                                 MSCC_MAC_CFG_PKTINF_CFG_ENABLE_TX_PADDING : 0));
+                                 MSCC_MAC_CFG_PKTINF_CFG_ENABLE_TX_PADDING : 0) |
+                                (IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING) ?
+                                 MSCC_MAC_CFG_PKTINF_CFG_MACSEC_BYPASS_NUM_PTP_STALL_CLKS(0x8) : 0));
 
        val = vsc8584_macsec_phy_read(phydev, bank, MSCC_MAC_CFG_MODE_CFG);
        val &= ~MSCC_MAC_CFG_MODE_CFG_DISABLE_DIC;