wr_nic: fix rx timestamps in nic-core.c

commit inspited by commit from spec-sw repo: kernel/wr_nic: fix rx timestamps c246c3ceSigned-off-by: Adam Wujek <adam.wujek@cern.ch>

wr_nic: fix rx timestamps in nic-core.c
commit inspited by commit from spec-sw repo: kernel/wr_nic: fix rx timestamps c246c3ceSigned-off-by: Adam Wujek <adam.wujek@cern.ch>
c2174bde · Adam Wujek · a0edc6f7 · c2174bde
Commit c2174bde authored Oct 30, 2014 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

nic-core.c kernel/wr_nic/nic-core.c +11 -4

No files found.
--- a/kernel/wr_nic/nic-core.c
+++ b/kernel/wr_nic/nic-core.c
@@ -381,8 +381,13 @@ static void __wrn_rx_descriptor(struct wrn_dev *wrn, int desc)
 	wrn_ppsg_read_time(wrn, &counter_ppsg, &utc);
-	if (counter_ppsg < ts_r)
+	if (WR_IS_NODE)
-		utc--;
+		if (counter_ppsg < ts_r)
+			utc--;
+	if (WR_IS_SWITCH)
+		if(counter_ppsg < REFCLK_FREQ/4 && ts_r > 3*REFCLK_FREQ/4)
+			utc--;
 	ts.tv_sec = (s32)utc & 0x7fffffff;
 	cntr_diff = (ts_r & 0xf) - ts_f;
@@ -396,13 +401,15 @@ static void __wrn_rx_descriptor(struct wrn_dev *wrn, int desc)
 	       ts.tv_nsec & 0x7fffffff,
 	       ts.tv_sec & 0x80000000 ? 1 :0);
-	if (1) {
+	if(WR_IS_NODE){
 		/* SPEC: don't do the strange stuff for wr-ptp */
 		ts.tv_sec &= ~0x80000000;
 		ts.tv_nsec &= 0x7fffffff;
 	}
-	if (! (r1 & NIC_RX1_D1_TS_INCORRECT)) {
+	/* If the timestamp was reported as incorrect, pass 0 instead */
+	if (! (r1 & NIC_RX1_D1_TS_INCORRECT)) /* FIXME: bit name possibly? */
+	{
 		hwts = skb_hwtstamps(skb);
 		hwts->hwtstamp = timespec_to_ktime(ts);
 	}