summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarini Katakam <harini.katakam@xilinx.com>2023-04-11 18:07:12 +0530
committerJakub Kicinski <kuba@kernel.org>2023-04-13 22:16:09 -0700
commit8c0d0fe04449b9ea2654bf435e51171fbf2a71ac (patch)
tree6e0d2f378a1ef68c6881c3e6693be8a9651b49d6
parentee4e92c26c60b7344b7261035683a37da5a6119b (diff)
downloadlinux-stable-8c0d0fe04449b9ea2654bf435e51171fbf2a71ac.tar.gz
linux-stable-8c0d0fe04449b9ea2654bf435e51171fbf2a71ac.tar.bz2
linux-stable-8c0d0fe04449b9ea2654bf435e51171fbf2a71ac.zip
net: macb: Optimize reading HW timestamp
The seconds input from BD (6 bits) just needs to be ORed with the upper bits from timer in this function. Avoid addition operation every single time. Seconds rollover handling is left untouched. Signed-off-by: Harini Katakam <harini.katakam@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/ethernet/cadence/macb_ptp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c
index f962a95068a0..51d26fa190d7 100644
--- a/drivers/net/ethernet/cadence/macb_ptp.c
+++ b/drivers/net/ethernet/cadence/macb_ptp.c
@@ -258,6 +258,8 @@ static int gem_hw_timestamp(struct macb *bp, u32 dma_desc_ts_1,
*/
gem_tsu_get_time(&bp->ptp_clock_info, &tsu, NULL);
+ ts->tv_sec |= ((~GEM_DMA_SEC_MASK) & tsu.tv_sec);
+
/* If the top bit is set in the timestamp,
* but not in 1588 timer, it has rolled over,
* so subtract max size
@@ -266,8 +268,6 @@ static int gem_hw_timestamp(struct macb *bp, u32 dma_desc_ts_1,
!(tsu.tv_sec & (GEM_DMA_SEC_TOP >> 1)))
ts->tv_sec -= GEM_DMA_SEC_TOP;
- ts->tv_sec += ((~GEM_DMA_SEC_MASK) & tsu.tv_sec);
-
return 0;
}