lkml.org 
[lkml]   [2023]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH net-next 7/7] net: stmmac: Make PTP reference clock references more clear
ptp_clock is an overloaded term, and in some instances it is used to
represent the clk_ptp_rate variable. Just use that name as it is
clear that it represents the rate of the PTP reference clock.

Signed-off-by: Andrew Halaney <ahalaney@redhat.com>
---
drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 +++--
drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index bd607da65037..ba92b10cff0e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -523,8 +523,9 @@ struct stmmac_ops {
/* PTP and HW Timer helpers */
struct stmmac_hwtimestamp {
void (*config_hw_tstamping) (void __iomem *ioaddr, u32 data);
- void (*config_sub_second_increment)(void __iomem *ioaddr, u32 ptp_clock,
- int gmac4, u32 *sub_second_inc);
+ void (*config_sub_second_increment)(void __iomem *ioaddr,
+ u32 clk_ptp_rate,
+ int gmac4, u32 *sub_second_inc);
int (*init_systime) (void __iomem *ioaddr, u32 sec, u32 nsec);
int (*config_addend) (void __iomem *ioaddr, u32 addend);
int (*adjust_systime) (void __iomem *ioaddr, u32 sec, u32 nsec,
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
index 29fd51bb853d..cc0386ee6dee 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
@@ -24,7 +24,7 @@ static void config_hw_tstamping(void __iomem *ioaddr, u32 data)
}

static void config_sub_second_increment(void __iomem *ioaddr,
- u32 ptp_clock, int gmac4, u32 *sub_second_inc)
+ u32 clk_ptp_rate, int gmac4, u32 *sub_second_inc)
{
u32 value = readl(ioaddr + PTP_TCR);
unsigned long data;
@@ -34,14 +34,14 @@ static void config_sub_second_increment(void __iomem *ioaddr,
* increment to twice the number of nanoseconds of a clock cycle.
* The calculation of the default_addend value by the caller will set it
* to mid-range = 2^31 when the remainder of this division is zero,
- * which will make the accumulator overflow once every 2 ptp_clock
+ * which will make the accumulator overflow once every 2 clk_ptp_rate
* cycles, adding twice the number of nanoseconds of a clock cycle :
- * 2 * NSEC_PER_SEC / ptp_clock.
+ * 2 * NSEC_PER_SEC / clk_ptp_rate.
*/
if (value & PTP_TCR_TSCFUPDT)
- data = (2 * NSEC_PER_SEC / ptp_clock);
+ data = (2 * NSEC_PER_SEC / clk_ptp_rate);
else
- data = (NSEC_PER_SEC / ptp_clock);
+ data = (NSEC_PER_SEC / clk_ptp_rate);

/* 0.465ns accuracy */
if (!(value & PTP_TCR_TSCTRLSSR))
--
2.41.0

\
 
 \ /
  Last update: 2023-08-24 20:36    [W:0.746 / U:0.160 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site