Commit 7cd01399 authored by Vince Bridgers's avatar Vince Bridgers Committed by David S. Miller

stmmac: Fix incorrect spinlock release and PTP cap detection.

This patch corrects a problem in stmmac_ptp.c, functions
stmmac_adjust_time and stmmac_adjust_freq where the incorrect spinlocks
were released. This patch also addresses a problem in stmmac_main,
function stmmac_init_ptp where the capability detection for
advanced timestamping was masked by message masking.

This patch was touch tested using linuxptp, and runs without the previously
observed instabilities. More extensive testing is ongoing.

Vince
Signed-off-by: default avatarVince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33c133cc
...@@ -622,17 +622,15 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) ...@@ -622,17 +622,15 @@ static int stmmac_init_ptp(struct stmmac_priv *priv)
if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp)) if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (netif_msg_hw(priv)) { priv->adv_ts = 0;
if (priv->dma_cap.time_stamp) { if (priv->dma_cap.atime_stamp && priv->extend_desc)
pr_debug("IEEE 1588-2002 Time Stamp supported\n"); priv->adv_ts = 1;
priv->adv_ts = 0;
} if (netif_msg_hw(priv) && priv->dma_cap.time_stamp)
if (priv->dma_cap.atime_stamp && priv->extend_desc) { pr_debug("IEEE 1588-2002 Time Stamp supported\n");
pr_debug
("IEEE 1588-2008 Advanced Time Stamp supported\n"); if (netif_msg_hw(priv) && priv->adv_ts)
priv->adv_ts = 1; pr_debug("IEEE 1588-2008 Advanced Time Stamp supported\n");
}
}
priv->hw->ptp = &stmmac_ptp; priv->hw->ptp = &stmmac_ptp;
priv->hwts_tx_en = 0; priv->hwts_tx_en = 0;
......
...@@ -56,7 +56,7 @@ static int stmmac_adjust_freq(struct ptp_clock_info *ptp, s32 ppb) ...@@ -56,7 +56,7 @@ static int stmmac_adjust_freq(struct ptp_clock_info *ptp, s32 ppb)
priv->hw->ptp->config_addend(priv->ioaddr, addend); priv->hw->ptp->config_addend(priv->ioaddr, addend);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->ptp_lock, flags);
return 0; return 0;
} }
...@@ -91,7 +91,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta) ...@@ -91,7 +91,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
priv->hw->ptp->adjust_systime(priv->ioaddr, sec, nsec, neg_adj); priv->hw->ptp->adjust_systime(priv->ioaddr, sec, nsec, neg_adj);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->ptp_lock, flags);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment