diff options
| author | Grygorii Strashko <grygorii.strashko@ti.com> | 2016-12-06 18:00:45 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-07 11:13:48 -0500 |
| commit | 20138cf9efc1a761a17839581b0130d8e4209882 (patch) | |
| tree | 922593476d473306781aeed5be9ded19b0ce81f1 /drivers/net/ethernet/ti/cpts.c | |
| parent | 88f0f0b0bebfbe086dda853f591ae3a014b19e40 (diff) | |
| download | linux-stable-20138cf9efc1a761a17839581b0130d8e4209882.tar.gz linux-stable-20138cf9efc1a761a17839581b0130d8e4209882.tar.bz2 linux-stable-20138cf9efc1a761a17839581b0130d8e4209882.zip | |
net: ethernet: ti: cpts: fix overflow check period
The CPTS drivers uses 8sec period for overflow checking with
assumption that CPTS retclk will not exceed 500MHz. But that's not
true on some TI platforms (Kesytone 2). As result, it is possible that
CPTS counter will overflow more than once between two readings.
Hence, fix it by selecting overflow check period dynamically as
max_sec_before_overflow/2, where
max_sec_before_overflow = max_counter_val / rftclk_freq.
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/cpts.c')
| -rw-r--r-- | drivers/net/ethernet/ti/cpts.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index ebd413a1cf56..0c0d48e5bea4 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -245,7 +245,7 @@ static void cpts_overflow_check(struct work_struct *work) cpts_ptp_gettime(&cpts->info, &ts); pr_debug("cpts overflow check at %lld.%09lu\n", ts.tv_sec, ts.tv_nsec); - schedule_delayed_work(&cpts->overflow_work, CPTS_OVERFLOW_PERIOD); + schedule_delayed_work(&cpts->overflow_work, cpts->ov_check_period); } static int cpts_match(struct sk_buff *skb, unsigned int ptp_class, @@ -378,8 +378,7 @@ int cpts_register(struct cpts *cpts) } cpts->phc_index = ptp_clock_index(cpts->clock); - schedule_delayed_work(&cpts->overflow_work, CPTS_OVERFLOW_PERIOD); - + schedule_delayed_work(&cpts->overflow_work, cpts->ov_check_period); return 0; err_ptp: @@ -423,6 +422,11 @@ static void cpts_calc_mult_shift(struct cpts *cpts) if (maxsec > 10) maxsec = 10; + /* Calc overflow check period (maxsec / 2) */ + cpts->ov_check_period = (HZ * maxsec) / 2; + dev_info(cpts->dev, "cpts: overflow check period %lu (jiffies)\n", + cpts->ov_check_period); + if (cpts->cc.mult || cpts->cc.shift) return; |