From: Grygorii Strashko <grygorii.strashko@ti.com> To: "David S. Miller" <davem@davemloft.net>, <netdev@vger.kernel.org>, Mugunthan V N <mugunthanvnm@ti.com>, Richard Cochran <richardcochran@gmail.com> Cc: Sekhar Nori <nsekhar@ti.com>, <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>, Rob Herring <robh+dt@kernel.org>, <devicetree@vger.kernel.org>, Murali Karicheri <m-karicheri2@ti.com>, Wingman Kwok <w-kwok2@ti.com>, Grygorii Strashko <grygorii.strashko@ti.com>, John Stultz <john.stultz@linaro.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH v2 13/13] net: ethernet: ti: cpts: fix overflow check period Date: Mon, 28 Nov 2016 17:03:37 -0600 [thread overview] Message-ID: <20161128230337.6731-14-grygorii.strashko@ti.com> (raw) In-Reply-To: <20161128230337.6731-1-grygorii.strashko@ti.com> 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> --- drivers/net/ethernet/ti/cpts.c | 10 +++++++--- drivers/net/ethernet/ti/cpts.h | 4 +--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 4761d8c..c96a94a 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, @@ -379,8 +379,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: @@ -421,6 +420,11 @@ static void cpts_calc_mult_shift(struct cpts *cpts) if (maxsec > 600 && cpts->cc.mask > UINT_MAX) maxsec = 600; + /* 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; diff --git a/drivers/net/ethernet/ti/cpts.h b/drivers/net/ethernet/ti/cpts.h index 5da23af..c96eca2 100644 --- a/drivers/net/ethernet/ti/cpts.h +++ b/drivers/net/ethernet/ti/cpts.h @@ -97,9 +97,6 @@ enum { CPTS_EV_TX, /* Ethernet Transmit Event */ }; -/* This covers any input clock up to about 500 MHz. */ -#define CPTS_OVERFLOW_PERIOD (HZ * 8) - #define CPTS_FIFO_DEPTH 16 #define CPTS_MAX_EVENTS 32 @@ -127,6 +124,7 @@ struct cpts { struct list_head events; struct list_head pool; struct cpts_event pool_data[CPTS_MAX_EVENTS]; + unsigned long ov_check_period; }; void cpts_rx_timestamp(struct cpts *cpts, struct sk_buff *skb); -- 2.10.1
WARNING: multiple messages have this Message-ID (diff)
From: Grygorii Strashko <grygorii.strashko@ti.com> To: "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org, Mugunthan V N <mugunthanvnm@ti.com>, Richard Cochran <richardcochran@gmail.com> Cc: Sekhar Nori <nsekhar@ti.com>, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Rob Herring <robh+dt@kernel.org>, devicetree@vger.kernel.org, Murali Karicheri <m-karicheri2@ti.com>, Wingman Kwok <w-kwok2@ti.com>, Grygorii Strashko <grygorii.strashko@ti.com>, John Stultz <john.stultz@linaro.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH v2 13/13] net: ethernet: ti: cpts: fix overflow check period Date: Mon, 28 Nov 2016 17:03:37 -0600 [thread overview] Message-ID: <20161128230337.6731-14-grygorii.strashko@ti.com> (raw) In-Reply-To: <20161128230337.6731-1-grygorii.strashko@ti.com> 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> --- drivers/net/ethernet/ti/cpts.c | 10 +++++++--- drivers/net/ethernet/ti/cpts.h | 4 +--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 4761d8c..c96a94a 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, @@ -379,8 +379,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: @@ -421,6 +420,11 @@ static void cpts_calc_mult_shift(struct cpts *cpts) if (maxsec > 600 && cpts->cc.mask > UINT_MAX) maxsec = 600; + /* 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; diff --git a/drivers/net/ethernet/ti/cpts.h b/drivers/net/ethernet/ti/cpts.h index 5da23af..c96eca2 100644 --- a/drivers/net/ethernet/ti/cpts.h +++ b/drivers/net/ethernet/ti/cpts.h @@ -97,9 +97,6 @@ enum { CPTS_EV_TX, /* Ethernet Transmit Event */ }; -/* This covers any input clock up to about 500 MHz. */ -#define CPTS_OVERFLOW_PERIOD (HZ * 8) - #define CPTS_FIFO_DEPTH 16 #define CPTS_MAX_EVENTS 32 @@ -127,6 +124,7 @@ struct cpts { struct list_head events; struct list_head pool; struct cpts_event pool_data[CPTS_MAX_EVENTS]; + unsigned long ov_check_period; }; void cpts_rx_timestamp(struct cpts *cpts, struct sk_buff *skb); -- 2.10.1
next prev parent reply other threads:[~2016-11-28 23:08 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-28 23:03 [PATCH v2 00/13] net: ethernet: ti: cpts: update and fixes Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-28 23:03 ` [PATCH v2 01/13] net: ethernet: ti: cpts: switch to readl/writel_relaxed() Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 9:38 ` Richard Cochran 2016-11-28 23:03 ` [PATCH v2 02/13] net: ethernet: ti: allow cpts to be built separately Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 9:37 ` Richard Cochran 2016-11-28 23:03 ` [PATCH v2 03/13] net: ethernet: ti: cpsw: minimize direct access to struct cpts Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-28 23:03 ` [PATCH v2 04/13] net: ethernet: ti: cpts: fix unbalanced clk api usage in cpts_register/unregister Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 9:48 ` Richard Cochran 2016-11-29 9:48 ` Richard Cochran 2016-11-28 23:03 ` [PATCH v2 05/13] net: ethernet: ti: cpts: fix registration order Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 9:48 ` Richard Cochran 2016-11-29 9:48 ` Richard Cochran 2016-11-28 23:03 ` [PATCH v2 06/13] net: ethernet: ti: cpts: disable cpts when unregistered Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 9:49 ` Richard Cochran 2016-11-29 9:49 ` Richard Cochran 2016-11-28 23:03 ` [PATCH v2 07/13] net: ethernet: ti: cpts: rework initialization/deinitialization Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 10:07 ` Richard Cochran 2016-11-29 10:07 ` Richard Cochran 2016-11-29 15:50 ` Grygorii Strashko 2016-11-29 15:50 ` Grygorii Strashko 2016-11-29 15:50 ` Grygorii Strashko 2016-11-30 18:30 ` Grygorii Strashko 2016-11-30 18:30 ` Grygorii Strashko 2016-11-30 18:30 ` Grygorii Strashko 2016-11-28 23:03 ` [PATCH v2 08/13] net: ethernet: ti: cpts: move dt props parsing to cpts driver Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 10:11 ` Richard Cochran 2016-11-29 15:54 ` Grygorii Strashko 2016-11-29 15:54 ` Grygorii Strashko 2016-11-28 23:03 ` [PATCH v2 09/13] net: ethernet: ti: cpts: clean up event list if event pool is empty Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 10:13 ` Richard Cochran 2016-11-28 23:03 ` [PATCH v2 10/13] net: ethernet: ti: cpts: drop excessive writes to CTRL and INT_EN regs Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 10:14 ` Richard Cochran 2016-11-29 10:14 ` Richard Cochran 2016-11-28 23:03 ` [PATCH v2 11/13] clocksource: export the clocks_calc_mult_shift to use by timestamp code Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 9:08 ` Thomas Gleixner 2016-11-29 9:08 ` Thomas Gleixner 2016-11-28 23:03 ` [PATCH v2 12/13] net: ethernet: ti: cpts: calc mult and shift from refclk freq Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko 2016-11-29 10:34 ` Richard Cochran 2016-11-29 10:34 ` Richard Cochran 2016-11-29 16:22 ` Grygorii Strashko 2016-11-29 16:22 ` Grygorii Strashko 2016-11-28 23:03 ` Grygorii Strashko [this message] 2016-11-28 23:03 ` [PATCH v2 13/13] net: ethernet: ti: cpts: fix overflow check period Grygorii Strashko 2016-11-30 9:12 ` Richard Cochran
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20161128230337.6731-14-grygorii.strashko@ti.com \ --to=grygorii.strashko@ti.com \ --cc=davem@davemloft.net \ --cc=devicetree@vger.kernel.org \ --cc=john.stultz@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=m-karicheri2@ti.com \ --cc=mugunthanvnm@ti.com \ --cc=netdev@vger.kernel.org \ --cc=nsekhar@ti.com \ --cc=richardcochran@gmail.com \ --cc=robh+dt@kernel.org \ --cc=tglx@linutronix.de \ --cc=w-kwok2@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.