From: Antoine Tenart <antoine.tenart@bootlin.com>
To: davem@davemloft.net, andrew@lunn.ch, f.fainelli@gmail.com,
hkallweit1@gmail.com, richardcochran@gmail.com,
alexandre.belloni@bootlin.com, UNGLinuxDriver@microchip.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
thomas.petazzoni@bootlin.com, allan.nielsen@microchip.com,
foss@0leil.net, antoine.tenart@bootlin.com
Subject: [PATCH net-next 4/8] net: phy: mscc: take into account the 1588 block in MACsec init
Date: Wed, 27 May 2020 18:41:54 +0200 [thread overview]
Message-ID: <20200527164158.313025-5-antoine.tenart@bootlin.com> (raw)
In-Reply-To: <20200527164158.313025-1-antoine.tenart@bootlin.com>
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>
---
drivers/net/phy/mscc/mscc_macsec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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;
--
2.26.2
next prev parent reply other threads:[~2020-05-27 16:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 16:41 [PATCH net-next 0/8] net: phy: mscc: PHC and timestamping support Antoine Tenart
2020-05-27 16:41 ` [PATCH net-next 1/8] net: phy: add support for a common probe between shared PHYs Antoine Tenart
2020-05-27 16:41 ` [PATCH net-next 2/8] net: phy: mscc: fix copyright and author information in MACsec Antoine Tenart
2020-05-27 16:41 ` [PATCH net-next 3/8] net: phy: mscc: remove the TR CLK disable magic value Antoine Tenart
2020-05-27 16:41 ` Antoine Tenart [this message]
2020-05-27 16:41 ` [PATCH net-next 5/8] net: phy: mscc: 1588 block initialization Antoine Tenart
2020-05-27 17:35 ` Jakub Kicinski
2020-05-28 6:57 ` Antoine Tenart
2020-05-27 22:04 ` kbuild test robot
2020-05-27 16:41 ` [PATCH net-next 6/8] net: phy: mscc: timestamping and PHC support Antoine Tenart
2020-05-28 14:34 ` Richard Cochran
2020-05-28 15:23 ` Antoine Tenart
2020-05-27 16:41 ` [PATCH net-next 7/8] dt-bindings: net: phy: vsc8531: document the load/save GPIO Antoine Tenart
2020-05-27 16:41 ` [PATCH net-next 8/8] MIPS: dts: ocelot: describe " Antoine Tenart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200527164158.313025-5-antoine.tenart@bootlin.com \
--to=antoine.tenart@bootlin.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=allan.nielsen@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=foss@0leil.net \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).