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>,
Thomas Gleixner <tglx@linutronix.de>,
Grygorii Strashko <grygorii.strashko@ti.com>
Subject: [PATCH v3 04/13] net: ethernet: ti: cpts: fix unbalanced clk api usage in cpts_register/unregister
Date: Fri, 2 Dec 2016 14:30:14 -0600 [thread overview]
Message-ID: <20161202203023.25526-5-grygorii.strashko@ti.com> (raw)
In-Reply-To: <20161202203023.25526-1-grygorii.strashko@ti.com>
There are two issues with TI CPTS code which are reproducible when TI
CPSW ethX device passes few up/down iterations:
- cpts refclk prepare counter continuously incremented after each
up/down iteration;
- devm_clk_get(dev, "cpts") is called many times.
Hence, fix these issues by using clk_disable_unprepare() in
cpts_clk_release() and skipping devm_clk_get() if cpts refclk has been
acquired already.
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
drivers/net/ethernet/ti/cpts.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index 8cb0369..61198f1 100644
--- a/drivers/net/ethernet/ti/cpts.c
+++ b/drivers/net/ethernet/ti/cpts.c
@@ -230,18 +230,20 @@ static void cpts_overflow_check(struct work_struct *work)
static void cpts_clk_init(struct device *dev, struct cpts *cpts)
{
- cpts->refclk = devm_clk_get(dev, "cpts");
- if (IS_ERR(cpts->refclk)) {
- dev_err(dev, "Failed to get cpts refclk\n");
- cpts->refclk = NULL;
- return;
+ if (!cpts->refclk) {
+ cpts->refclk = devm_clk_get(dev, "cpts");
+ if (IS_ERR(cpts->refclk)) {
+ dev_err(dev, "Failed to get cpts refclk\n");
+ cpts->refclk = NULL;
+ return;
+ }
}
clk_prepare_enable(cpts->refclk);
}
static void cpts_clk_release(struct cpts *cpts)
{
- clk_disable(cpts->refclk);
+ clk_disable_unprepare(cpts->refclk);
}
static int cpts_match(struct sk_buff *skb, unsigned int ptp_class,
--
2.10.1
next prev parent reply other threads:[~2016-12-02 20:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 20:30 [PATCH v3 00/13] net: ethernet: ti: cpts: update and fixes Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 01/13] net: ethernet: ti: cpts: switch to readl/writel_relaxed() Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 02/13] net: ethernet: ti: allow cpts to be built separately Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 03/13] net: ethernet: ti: cpsw: minimize direct access to struct cpts Grygorii Strashko
2016-12-02 20:30 ` Grygorii Strashko [this message]
2016-12-02 20:30 ` [PATCH v3 05/13] net: ethernet: ti: cpts: fix registration order Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 06/13] net: ethernet: ti: cpts: disable cpts when unregistered Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 07/13] net: ethernet: ti: cpts: clean up event list if event pool is empty Grygorii Strashko
2016-12-04 6:09 ` kbuild test robot
2016-12-02 20:30 ` [PATCH v3 08/13] net: ethernet: ti: cpts: drop excessive writes to CTRL and INT_EN regs Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 09/13] net: ethernet: ti: cpts: rework initialization/deinitialization Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 10/13] net: ethernet: ti: cpts: move dt props parsing to cpts driver Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 11/13] clocksource: export the clocks_calc_mult_shift to use by timestamp code Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 12/13] net: ethernet: ti: cpts: calc mult and shift from refclk freq Grygorii Strashko
2016-12-02 20:30 ` [PATCH v3 13/13] net: ethernet: ti: cpts: fix overflow check period Grygorii Strashko
2016-12-03 9:22 ` [PATCH v3 00/13] net: ethernet: ti: cpts: update and fixes Richard Cochran
2016-12-05 18:31 ` Grygorii Strashko
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=20161202203023.25526-5-grygorii.strashko@ti.com \
--to=grygorii.strashko@ti.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).