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

Commit 98870943 authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: Fix stmmac_get_rx_hwtstamp() 



When using GMAC4 the valid timestamp is from CTX next desc but
we are passing the previous desc to get_rx_timestamp_status()
callback.

Fix this and while at it rework a little bit the function logic.

Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c8080d0

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

+6 −7
Original line number Diff line number Diff line
@@ -473,19 +473,18 @@ static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv, struct dma_desc *p, 
				   struct dma_desc *np, struct sk_buff *skb)

{

	struct skb_shared_hwtstamps *shhwtstamp = NULL;

	struct dma_desc *desc = p;

	u64 ns;



	if (!priv->hwts_rx_en)

		return;



	/* Check if timestamp is available */

	if (priv->hw->desc->get_rx_timestamp_status(p, priv->adv_ts)) {

	/* For GMAC4, the valid timestamp is from CTX next desc. */

	if (priv->plat->has_gmac4)

			ns = priv->hw->desc->get_timestamp(np, priv->adv_ts);

		else

			ns = priv->hw->desc->get_timestamp(p, priv->adv_ts);

		desc = np;



	/* Check if timestamp is available */

	if (priv->hw->desc->get_rx_timestamp_status(desc, priv->adv_ts)) {

		ns = priv->hw->desc->get_timestamp(desc, priv->adv_ts);

		netdev_dbg(priv->dev, "get valid RX hw timestamp %llu\n", ns);

		shhwtstamp = skb_hwtstamps(skb);

		memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));