From: Simon Arlott <simon@fire.lp0.eu> To: Florian Fainelli <f.fainelli@gmail.com>, linux-watchdog@vger.kernel.org Cc: Guenter Roeck <linux@roeck-us.net>, "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, Ralf Baechle <ralf@linux-mips.org>, Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net>, Marc Zyngier <marc.zyngier@arm.com>, Kevin Cernekee <cernekee@gmail.com>, Wim Van Sebroeck <wim@iguana.be>, Maxime Bizon <mbizon@freebox.fr>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, linux-mips@linux-mips.org, Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>, Ian Campbell <ijc+devicetree@hellion.org.uk>, Kumar Gala <galak@codeaurora.org>, Jonas Gorski <jogo@openwrt.org> Subject: [PATCH (v3) 6/11] watchdog: bcm63xx_wdt: Obtain watchdog clock HZ from "periph" clk Date: Wed, 25 Nov 2015 22:47:59 +0000 [thread overview] Message-ID: <56563A9F.5000901@simon.arlott.org.uk> (raw) In-Reply-To: <5654E7DE.4020400@gmail.com> Instead of using a fixed clock HZ in the driver, obtain it from the "periph" clk that the watchdog timer uses. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> --- Patch 7 split into two patches. On 24/11/15 22:42, Florian Fainelli wrote: > On 24/11/15 14:12, Simon Arlott wrote: >> Instead of using a fixed clock HZ in the driver, obtain it from the >> "periph" clk that the watchdog timer uses. >> >> Signed-off-by: Simon Arlott <simon@fire.lp0.eu> > > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > Changed because of the reordering of timer/watchdog register calls. drivers/watchdog/bcm63xx_wdt.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c index 2257924..0a19731 100644 --- a/drivers/watchdog/bcm63xx_wdt.c +++ b/drivers/watchdog/bcm63xx_wdt.c @@ -13,6 +13,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/clk.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/kernel.h> @@ -32,12 +33,14 @@ #define PFX KBUILD_MODNAME -#define WDT_HZ 50000000 /* Fclk */ +#define WDT_CLK_NAME "periph" struct bcm63xx_wdt_hw { struct watchdog_device wdd; raw_spinlock_t lock; void __iomem *regs; + struct clk *clk; + unsigned long clock_hz; bool running; }; @@ -54,7 +57,7 @@ static int bcm63xx_wdt_start(struct watchdog_device *wdd) unsigned long flags; raw_spin_lock_irqsave(&hw->lock, flags); - bcm_writel(wdd->timeout * WDT_HZ, hw->regs + WDT_DEFVAL_REG); + bcm_writel(wdd->timeout * hw->clock_hz, hw->regs + WDT_DEFVAL_REG); bcm_writel(WDT_START_1, hw->regs + WDT_CTL_REG); bcm_writel(WDT_START_2, hw->regs + WDT_CTL_REG); hw->running = true; @@ -118,7 +121,7 @@ static void bcm63xx_wdt_isr(void *data) die(PFX ": watchdog timer expired\n", get_irq_regs()); } - ms = timeleft / (WDT_HZ / 1000); + ms = timeleft / (hw->clock_hz / 1000); dev_alert(hw->wdd.dev, "warning timer fired, reboot in %ums\n", ms); } @@ -162,6 +165,25 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) return -ENXIO; } + hw->clk = devm_clk_get(&pdev->dev, WDT_CLK_NAME); + if (IS_ERR(hw->clk)) { + if (PTR_ERR(hw->clk) != -EPROBE_DEFER) + dev_err(&pdev->dev, "unable to request clock\n"); + return PTR_ERR(hw->clk); + } + + hw->clock_hz = clk_get_rate(hw->clk); + if (!hw->clock_hz) { + dev_err(&pdev->dev, "unable to fetch clock rate\n"); + return -EINVAL; + } + + ret = clk_prepare_enable(hw->clk); + if (ret) { + dev_err(&pdev->dev, "unable to enable clock\n"); + return ret; + } + raw_spin_lock_init(&hw->lock); hw->running = false; @@ -169,7 +191,7 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) wdd->ops = &bcm63xx_wdt_ops; wdd->info = &bcm63xx_wdt_info; wdd->min_timeout = 1; - wdd->max_timeout = 0xffffffff / WDT_HZ; + wdd->max_timeout = 0xffffffff / hw->clock_hz; wdd->timeout = min(30U, wdd->max_timeout); platform_set_drvdata(pdev, hw); @@ -180,7 +202,7 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) ret = watchdog_register_device(wdd); if (ret < 0) { dev_err(&pdev->dev, "failed to register watchdog device\n"); - return ret; + goto disable_clk; } ret = bcm63xx_timer_register(TIMER_WDT_ID, bcm63xx_wdt_isr, hw); @@ -198,6 +220,9 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) unregister_watchdog: watchdog_unregister_device(wdd); + +disable_clk: + clk_disable_unprepare(hw->clk); return ret; } @@ -207,6 +232,7 @@ static int bcm63xx_wdt_remove(struct platform_device *pdev) bcm63xx_timer_unregister(TIMER_WDT_ID); watchdog_unregister_device(&hw->wdd); + clk_disable_unprepare(hw->clk); return 0; } -- 2.1.4 -- Simon Arlott
WARNING: multiple messages have this Message-ID (diff)
From: Simon Arlott <simon-A6De1vDTPLDsq35pWSNszA@public.gmane.org> To: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>, "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, Ralf Baechle <ralf-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org>, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>, Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org>, Kevin Cernekee <cernekee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Wim Van Sebroeck <wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org>, Maxime Bizon <mbizon-MmRyKUhfbQ9GWvitb5QawA@public.gmane.org>, Linux Kernel Mailing List <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>, Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>, Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>, Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>, Jonas Gorski <jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> Subject: [PATCH (v3) 6/11] watchdog: bcm63xx_wdt: Obtain watchdog clock HZ from "periph" clk Date: Wed, 25 Nov 2015 22:47:59 +0000 [thread overview] Message-ID: <56563A9F.5000901@simon.arlott.org.uk> (raw) In-Reply-To: <5654E7DE.4020400-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Instead of using a fixed clock HZ in the driver, obtain it from the "periph" clk that the watchdog timer uses. Signed-off-by: Simon Arlott <simon-A6De1vDTPLDsq35pWSNszA@public.gmane.org> --- Patch 7 split into two patches. On 24/11/15 22:42, Florian Fainelli wrote: > On 24/11/15 14:12, Simon Arlott wrote: >> Instead of using a fixed clock HZ in the driver, obtain it from the >> "periph" clk that the watchdog timer uses. >> >> Signed-off-by: Simon Arlott <simon-A6De1vDTPLDsq35pWSNszA@public.gmane.org> > > Reviewed-by: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > Changed because of the reordering of timer/watchdog register calls. drivers/watchdog/bcm63xx_wdt.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c index 2257924..0a19731 100644 --- a/drivers/watchdog/bcm63xx_wdt.c +++ b/drivers/watchdog/bcm63xx_wdt.c @@ -13,6 +13,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/clk.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/kernel.h> @@ -32,12 +33,14 @@ #define PFX KBUILD_MODNAME -#define WDT_HZ 50000000 /* Fclk */ +#define WDT_CLK_NAME "periph" struct bcm63xx_wdt_hw { struct watchdog_device wdd; raw_spinlock_t lock; void __iomem *regs; + struct clk *clk; + unsigned long clock_hz; bool running; }; @@ -54,7 +57,7 @@ static int bcm63xx_wdt_start(struct watchdog_device *wdd) unsigned long flags; raw_spin_lock_irqsave(&hw->lock, flags); - bcm_writel(wdd->timeout * WDT_HZ, hw->regs + WDT_DEFVAL_REG); + bcm_writel(wdd->timeout * hw->clock_hz, hw->regs + WDT_DEFVAL_REG); bcm_writel(WDT_START_1, hw->regs + WDT_CTL_REG); bcm_writel(WDT_START_2, hw->regs + WDT_CTL_REG); hw->running = true; @@ -118,7 +121,7 @@ static void bcm63xx_wdt_isr(void *data) die(PFX ": watchdog timer expired\n", get_irq_regs()); } - ms = timeleft / (WDT_HZ / 1000); + ms = timeleft / (hw->clock_hz / 1000); dev_alert(hw->wdd.dev, "warning timer fired, reboot in %ums\n", ms); } @@ -162,6 +165,25 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) return -ENXIO; } + hw->clk = devm_clk_get(&pdev->dev, WDT_CLK_NAME); + if (IS_ERR(hw->clk)) { + if (PTR_ERR(hw->clk) != -EPROBE_DEFER) + dev_err(&pdev->dev, "unable to request clock\n"); + return PTR_ERR(hw->clk); + } + + hw->clock_hz = clk_get_rate(hw->clk); + if (!hw->clock_hz) { + dev_err(&pdev->dev, "unable to fetch clock rate\n"); + return -EINVAL; + } + + ret = clk_prepare_enable(hw->clk); + if (ret) { + dev_err(&pdev->dev, "unable to enable clock\n"); + return ret; + } + raw_spin_lock_init(&hw->lock); hw->running = false; @@ -169,7 +191,7 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) wdd->ops = &bcm63xx_wdt_ops; wdd->info = &bcm63xx_wdt_info; wdd->min_timeout = 1; - wdd->max_timeout = 0xffffffff / WDT_HZ; + wdd->max_timeout = 0xffffffff / hw->clock_hz; wdd->timeout = min(30U, wdd->max_timeout); platform_set_drvdata(pdev, hw); @@ -180,7 +202,7 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) ret = watchdog_register_device(wdd); if (ret < 0) { dev_err(&pdev->dev, "failed to register watchdog device\n"); - return ret; + goto disable_clk; } ret = bcm63xx_timer_register(TIMER_WDT_ID, bcm63xx_wdt_isr, hw); @@ -198,6 +220,9 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) unregister_watchdog: watchdog_unregister_device(wdd); + +disable_clk: + clk_disable_unprepare(hw->clk); return ret; } @@ -207,6 +232,7 @@ static int bcm63xx_wdt_remove(struct platform_device *pdev) bcm63xx_timer_unregister(TIMER_WDT_ID); watchdog_unregister_device(&hw->wdd); + clk_disable_unprepare(hw->clk); return 0; } -- 2.1.4 -- Simon Arlott -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-11-25 22:48 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-21 19:02 [PATCH 1/4] clocksource: Add brcm,bcm6345-timer device tree binding Simon Arlott 2015-11-21 19:02 ` Simon Arlott 2015-11-21 19:03 ` [PATCH 2/4] MIPS: bmips: Add bcm6345-l2-timer interrupt controller Simon Arlott 2015-11-21 19:04 ` [PATCH 3/4] watchdog: Add brcm,bcm6345-wdt device tree binding Simon Arlott 2015-11-22 22:13 ` Rob Herring 2015-11-22 22:13 ` Rob Herring 2015-11-21 19:05 ` [PATCH 4/4] MIPS: bmips: Convert bcm63xx_wdt to use WATCHDOG_CORE Simon Arlott 2015-11-21 19:05 ` Simon Arlott 2015-11-21 21:32 ` Guenter Roeck 2015-11-21 21:44 ` Simon Arlott 2015-11-21 21:44 ` Simon Arlott 2015-11-22 2:32 ` Guenter Roeck 2015-11-22 14:02 ` [PATCH 4/10] (Was: [PATCH 4/4]) " Simon Arlott 2015-11-22 14:05 ` [PATCH 4/10] watchdog: bcm63xx_wdt: Handle hardware interrupt and remove software timer Simon Arlott 2015-11-24 18:21 ` Guenter Roeck 2015-11-24 18:21 ` Guenter Roeck 2015-11-24 18:21 ` Guenter Roeck 2015-11-25 20:14 ` Jonas Gorski 2015-11-25 20:14 ` Jonas Gorski 2015-11-25 20:28 ` Simon Arlott 2015-11-25 20:28 ` Simon Arlott 2015-11-25 22:33 ` [PATCH (v2) " Simon Arlott 2015-11-25 22:33 ` Simon Arlott 2015-11-22 14:06 ` [PATCH 5/10] watchdog: bcm63xx_wdt: Use WATCHDOG_CORE Simon Arlott 2015-11-22 14:06 ` Simon Arlott 2015-11-25 2:44 ` Guenter Roeck 2015-11-25 2:44 ` Guenter Roeck 2015-11-25 13:02 ` Simon Arlott 2015-11-25 14:10 ` Guenter Roeck 2015-11-25 14:10 ` Guenter Roeck 2015-11-25 19:43 ` Simon Arlott 2015-11-25 19:43 ` Simon Arlott 2015-11-25 22:40 ` [PATCH (v3) 5/11] " Simon Arlott 2015-11-25 22:40 ` Simon Arlott 2015-11-22 14:07 ` [PATCH 6/10] watchdog: bcm63xx_wdt: Obtain watchdog clock HZ from "periph" clk Simon Arlott 2015-11-22 14:07 ` Simon Arlott 2015-11-23 15:02 ` Jonas Gorski 2015-11-23 15:02 ` Jonas Gorski 2015-11-23 18:19 ` Florian Fainelli 2015-11-23 18:19 ` Florian Fainelli 2015-11-23 19:00 ` Simon Arlott 2015-11-23 19:00 ` Simon Arlott 2015-11-24 22:12 ` [PATCH (v2) " Simon Arlott 2015-11-24 22:42 ` Florian Fainelli 2015-11-24 22:42 ` Florian Fainelli 2015-11-25 22:47 ` Simon Arlott [this message] 2015-11-25 22:47 ` [PATCH (v3) 6/11] " Simon Arlott 2015-11-22 14:09 ` [PATCH 7/10] watchdog: bcm63xx_wdt: Add get_timeleft function Simon Arlott 2015-11-22 14:09 ` Simon Arlott 2015-11-24 22:15 ` [PATCH (v2) " Simon Arlott 2015-11-24 22:15 ` Simon Arlott 2015-11-24 22:43 ` Florian Fainelli 2015-11-24 22:43 ` Florian Fainelli 2015-11-25 2:51 ` Guenter Roeck 2015-11-25 2:51 ` Guenter Roeck 2015-11-25 8:17 ` Simon Arlott 2015-11-25 8:17 ` Simon Arlott 2015-11-25 22:50 ` [PATCH (v3) 7/11] " Simon Arlott 2015-11-25 22:50 ` Simon Arlott 2015-11-25 22:54 ` [PATCH (v4) " Simon Arlott 2015-11-25 22:54 ` Simon Arlott 2015-11-25 22:57 ` [PATCH (v4) 8/11] watchdog: bcm63xx_wdt: Warn if the watchdog is currently running Simon Arlott 2015-11-25 22:57 ` Simon Arlott 2015-11-22 14:11 ` [PATCH 8/10] watchdog: bcm63xx_wdt: Remove dependency on mach-bcm63xx functions/defines Simon Arlott 2015-11-22 14:11 ` Simon Arlott 2015-11-22 14:12 ` [PATCH 9/10] watchdog: bcm63xx_wdt: Use bcm63xx_timer interrupt directly Simon Arlott 2015-11-22 14:12 ` Simon Arlott 2015-11-25 23:03 ` [PATCH (v2) 10/11] " Simon Arlott 2015-11-25 23:03 ` Simon Arlott 2015-11-22 14:14 ` [PATCH 10/10] watchdog: bcm63xx_wdt: Use brcm,bcm6345-wdt device tree binding Simon Arlott 2015-11-22 14:14 ` Simon Arlott 2015-11-25 23:09 ` [PATCH (v2) 11/11] " Simon Arlott 2015-11-25 23:09 ` Simon Arlott 2015-11-22 22:12 ` [PATCH 1/4] clocksource: Add brcm,bcm6345-timer " Rob Herring 2015-11-23 15:33 ` Jonas Gorski 2015-11-23 18:55 ` [PATCH (v2) 1/10] " Simon Arlott 2015-11-23 18:55 ` Simon Arlott 2015-11-23 18:57 ` [PATCH (v2) 2/10] MIPS: bmips: Add bcm6345-l2-timer interrupt controller Simon Arlott 2015-11-23 18:57 ` Simon Arlott 2015-11-24 22:10 ` [PATCH (v3) " Simon Arlott 2015-11-24 22:10 ` Simon Arlott 2015-11-24 22:36 ` Florian Fainelli 2015-11-24 22:36 ` Florian Fainelli 2015-11-26 22:32 ` [PATCH (v4) 2/11] " Simon Arlott 2015-11-27 8:37 ` Thomas Gleixner 2015-11-27 8:37 ` Thomas Gleixner 2015-11-28 12:26 ` [PATCH (v5) 3/11] " Simon Arlott 2015-11-28 12:26 ` Simon Arlott 2015-12-01 0:22 ` Guenter Roeck 2015-12-01 0:22 ` Guenter Roeck 2016-05-09 12:01 ` Álvaro Fernández Rojas 2016-05-09 13:06 ` Guenter Roeck 2016-05-09 13:06 ` Guenter Roeck 2016-05-11 6:40 ` [PATCH 2/4] " Álvaro Fernández Rojas 2015-11-25 3:05 ` [PATCH (v2) 1/10] clocksource: Add brcm,bcm6345-timer device tree binding Rob Herring
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=56563A9F.5000901@simon.arlott.org.uk \ --to=simon@fire.lp0.eu \ --cc=cernekee@gmail.com \ --cc=devicetree@vger.kernel.org \ --cc=f.fainelli@gmail.com \ --cc=galak@codeaurora.org \ --cc=ijc+devicetree@hellion.org.uk \ --cc=jason@lakedaemon.net \ --cc=jogo@openwrt.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=mbizon@freebox.fr \ --cc=pawel.moll@arm.com \ --cc=ralf@linux-mips.org \ --cc=robh+dt@kernel.org \ --cc=tglx@linutronix.de \ --cc=wim@iguana.be \ /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.