diff options
| author | Antoine Tenart <antoine.tenart@bootlin.com> | 2020-06-23 16:30:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-24 14:33:16 -0700 |
| commit | 4c8c5dc57ae8226ceb7e72fb7a5cfa8e743c0a2b (patch) | |
| tree | c7f55dc80ab3f20d3ede71a96d5973ddd9eba582 | |
| parent | 6705b58daf844f219ca85231c69d019fbc30b992 (diff) | |
| download | linux-4c8c5dc57ae8226ceb7e72fb7a5cfa8e743c0a2b.tar.gz linux-4c8c5dc57ae8226ceb7e72fb7a5cfa8e743c0a2b.tar.bz2 linux-4c8c5dc57ae8226ceb7e72fb7a5cfa8e743c0a2b.zip | |
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>
| -rw-r--r-- | drivers/net/phy/mscc/mscc_macsec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c index c0eeb62cb940..713c62b1d1f0 100644 --- 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; |