Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be9b3174 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: fix ptp init for gmac4 



The gmac 4.x version has not extended descriptors
(that are available on 3.x instead of).
While initializing the PTP module, the advanced PTP was
enabled in case of extended descriptors. This cannot be
applied for 4.x version where only the hardware capability
register has to show if the feature is present.
Patch also adds some extra netdev_(debug/inof) to better
dump the configuration.

Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre TORGUE <alexandre.torgue@st.com>
Cc: Rayagond Kokatanur <rayagond@vayavyalabs.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4e99131

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+12 −5
Original line number Diff line number Diff line
@@ -650,20 +650,27 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) 
	if (IS_ERR(priv->clk_ptp_ref)) {

		priv->clk_ptp_rate = clk_get_rate(priv->stmmac_clk);

		priv->clk_ptp_ref = NULL;

		netdev_dbg(priv->dev, "PTP uses main clock\n");

	} else {

		clk_prepare_enable(priv->clk_ptp_ref);

		priv->clk_ptp_rate = clk_get_rate(priv->clk_ptp_ref);

		netdev_dbg(priv->dev, "PTP rate %d\n", priv->clk_ptp_rate);

	}



	priv->adv_ts = 0;

	if (priv->dma_cap.atime_stamp && priv->extend_desc)

	/* Check if adv_ts can be enabled for dwmac 4.x core */

	if (priv->plat->has_gmac4 && priv->dma_cap.atime_stamp)

		priv->adv_ts = 1;

	/* Dwmac 3.x core with extend_desc can support adv_ts */

	else if (priv->extend_desc && priv->dma_cap.atime_stamp)

		priv->adv_ts = 1;



	if (netif_msg_hw(priv) && priv->dma_cap.time_stamp)

		pr_debug("IEEE 1588-2002 Time Stamp supported\n");

	if (priv->dma_cap.time_stamp)

		netdev_info(priv->dev, "IEEE 1588-2002 Timestamp supported\n");



	if (netif_msg_hw(priv) && priv->adv_ts)

		pr_debug("IEEE 1588-2008 Advanced Time Stamp supported\n");

	if (priv->adv_ts)

		netdev_info(priv->dev,

			    "IEEE 1588-2008 Advanced Timestamp supported\n");



	priv->hw->ptp = &stmmac_ptp;

	priv->hwts_tx_en = 0;