Commit 200922c9 authored by Fredrik Hallenberg's avatar Fredrik Hallenberg Committed by David S. Miller

net: stmmac: Fix TX timestamp calculation

When using GMAC4 the value written in PTP_SSIR should be shifted however
the shifted value is also used in subsequent calculations which results
in a bad timestamp value.
Signed-off-by: default avatarFredrik Hallenberg <megahallon@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3db09601
...@@ -34,6 +34,7 @@ static u32 stmmac_config_sub_second_increment(void __iomem *ioaddr, ...@@ -34,6 +34,7 @@ static u32 stmmac_config_sub_second_increment(void __iomem *ioaddr,
{ {
u32 value = readl(ioaddr + PTP_TCR); u32 value = readl(ioaddr + PTP_TCR);
unsigned long data; unsigned long data;
u32 reg_value;
/* For GMAC3.x, 4.x versions, convert the ptp_clock to nano second /* For GMAC3.x, 4.x versions, convert the ptp_clock to nano second
* formula = (1/ptp_clock) * 1000000000 * formula = (1/ptp_clock) * 1000000000
...@@ -50,10 +51,11 @@ static u32 stmmac_config_sub_second_increment(void __iomem *ioaddr, ...@@ -50,10 +51,11 @@ static u32 stmmac_config_sub_second_increment(void __iomem *ioaddr,
data &= PTP_SSIR_SSINC_MASK; data &= PTP_SSIR_SSINC_MASK;
reg_value = data;
if (gmac4) if (gmac4)
data = data << GMAC4_PTP_SSIR_SSINC_SHIFT; reg_value <<= GMAC4_PTP_SSIR_SSINC_SHIFT;
writel(data, ioaddr + PTP_SSIR); writel(reg_value, ioaddr + PTP_SSIR);
return data; return data;
} }
......
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