Messages in this thread | | | Date | Sun, 21 Jun 2020 17:38:42 +0200 | From | Quentin Schulz <> | Subject | Re: [PATCH net-next v3 4/8] net: phy: mscc: take into account the 1588 block in MACsec init |
| |
Hi Antoine,
On 2020-06-19 14:22, Antoine Tenart wrote: > 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));
Do we have more info on this 0x8? Where does it come from? What does it mean?
Also this starts to get a little bit hard to read. Would it make sense to have two temp variables? e.g.:
padding = bank == HOST_MAC ? MSCC_MAC_CFG_PKTINF_CFG_ENABLE_TX_PADDING : 0; ptp_stall_clks = IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING) ? MSCC_MAC_CFG_PKTINF_CFG_MACSEC_BYPASS_NUM_PTP_STALL_CLKS(0x8) : 0;
vsc8584_macsec_phy_write(phydev, bank, MSCC_MAC_CFG_PKTINF_CFG, MSCC_MAC_CFG_PKTINF_CFG_STRIP_FCS_ENA | MSCC_MAC_CFG_PKTINF_CFG_INSERT_FCS_ENA | MSCC_MAC_CFG_PKTINF_CFG_LPI_RELAY_ENA | MSCC_MAC_CFG_PKTINF_CFG_STRIP_PREAMBLE_ENA | MSCC_MAC_CFG_PKTINF_CFG_INSERT_PREAMBLE_ENA | padding | ptp_stall_clks);
Thanks, Quentin
| |