Re: [Linaro-acpi] [PATCH v2 6/7] Watchdog: introduce ARM SBSA watchdog driver

Hi Guenter,

Thanks for review :-)

On 21 May 2015 at 18:34, Guenter Roeck linux@roeck-us.net wrote:

On 05/21/2015 01:32 AM, fu.wei@linaro.org wrote:

...

From: Fu Wei fu.wei@linaro.org

This driver bases on linux kernel watchdog framework, and use "pretimeout" in the framework. It supports getting timeout and pretimeout from parameter and FDT at the driver init stage. In first timeout(WS0), the interrupt routine run panic to save system context.

Signed-off-by: Fu Wei fu.wei@linaro.org

drivers/watchdog/Kconfig | 12 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/sbsa_gwdt.c | 476 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 489 insertions(+) create mode 100644 drivers/watchdog/sbsa_gwdt.c

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index e5e7c55..25a0df1 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -152,6 +152,18 @@ config ARM_SP805_WATCHDOG ARM Primecell SP805 Watchdog timer. This will reboot your system when the timeout is reached.

+config ARM_SBSA_WATCHDOG

•   tristate "ARM SBSA Generic Watchdog"
  

•   depends on ARM || ARM64 || COMPILE_TEST
  

•   depends on ARM_ARCH_TIMER
  

•   select WATCHDOG_CORE
  

•   help
  

•     ARM SBSA Generic Watchdog timer. This has two Watchdog Signals
  

•     (WS0/WS1), will trigger a warning interrupt(do panic) at the
  

first

•     timeout(WS0); will reboot your system when the second
  

timeout(WS1)

•     is reached.
  

I think it would be better to keep the WS0/WS1 out of the help text. It is an implementation detail, and no user will be able to make sense of it.

I don't mind to delete it , but those are in SBSA spec, is that an implementation detail ?

Sorry , just try to re-confirm it :-)

...

•     More details: DEN0029B - Server Base System Architecture (SBSA)
  

• config AT91RM9200_WATCHDOG tristate "AT91RM9200 watchdog" depends on SOC_AT91RM9200 && MFD_SYSCON

diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 5c19294..471f1b7c 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o

# ARM Architecture obj-$(CONFIG_ARM_SP805_WATCHDOG) += sp805_wdt.o +obj-$(CONFIG_ARM_SBSA_WATCHDOG) += sbsa_gwdt.o obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o obj-$(CONFIG_AT91SAM9X_WATCHDOG) += at91sam9_wdt.o obj-$(CONFIG_CADENCE_WATCHDOG) += cadence_wdt.o diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c new file mode 100644 index 0000000..4ebe7c3 --- /dev/null +++ b/drivers/watchdog/sbsa_gwdt.c @@ -0,0 +1,476 @@ +/*

• • SBSA(Server Base System Architecture) Generic Watchdog driver
• • Copyright (c) 2015, Linaro Ltd.
• • Author: Fu Wei fu.wei@linaro.org

• •     Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
    

• • This program is free software; you can redistribute it and/or modify
• • it under the terms of the GNU General Public License 2 as published
• • by the Free Software Foundation.
• • This program is distributed in the hope that it will be useful,
• • but WITHOUT ANY WARRANTY; without even the implied warranty of
• • MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
• • GNU General Public License for more details.
• • Note: This SBSA Generic watchdog driver is compatible with

• •   the pretimeout concept of Linux kernel.
    

• •   The timeout and pretimeout are set by the different REGs.
    

• •   The first watch period is set by writing WCV directly,
    

• •   that can support more than 10s timeout at the maximum
    

• •   system counter frequency.
    

• •   The second watch period is set by WOR(32bit) which will be
    

loaded

• •   automatically by hardware, when WS0 is triggered.
    

• •   This gives a maximum watch period of around 10s at the maximum
    

• •   system counter frequency.
    

• •   The System Counter shall run at maximum of 400MHz.
    

• •   More details: DEN0029B - Server Base System Architecture (SBSA)
    

• • Kernel/API: P---------| pretimeout

• •           |-------------------------------T timeout
    

• • SBSA GWDT: P--WOR---WS1 pretimeout

• •           |-------WCV----------WS0~~~~~~~~T timeout
    

• */

+#include <asm/arch_timer.h>

+#include <linux/acpi.h> +#include <linux/io.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/uaccess.h> +#include <linux/watchdog.h>

+/* SBSA Generic Watchdog register definitions */ +/* refresh frame */ +#define SBSA_GWDT_WRR 0x000

+/* control frame */ +#define SBSA_GWDT_WCS 0x000 +#define SBSA_GWDT_WOR 0x008 +#define SBSA_GWDT_WCV_LO 0x010 +#define SBSA_GWDT_WCV_HI 0x014

+/* refresh/control frame */ +#define SBSA_GWDT_W_IIDR 0xfcc +#define SBSA_GWDT_IDR 0xfd0

+/* Watchdog Control and Status Register */ +#define SBSA_GWDT_WCS_EN BIT(0) +#define SBSA_GWDT_WCS_WS0 BIT(1) +#define SBSA_GWDT_WCS_WS1 BIT(2)

+/**

• • struct sbsa_gwdt - Internal representation of the SBSA GWDT
• • @wdd: kernel watchdog_device structure
• • @clk: store the System Counter clock frequency, in Hz.
• • @refresh_base: Virtual address of the watchdog refresh frame
• • @control_base: Virtual address of the watchdog control frame
• */

+struct sbsa_gwdt {

•   struct watchdog_device  wdd;
  

•   u32                     clk;
  

•   void __iomem            *refresh_base;
  

•   void __iomem            *control_base;
  

+};

+#define to_sbsa_gwdt(e) container_of(e, struct sbsa_gwdt, wdd)

+#define DEFAULT_TIMEOUT 10 /* seconds, the 1st + 2nd watch periods*/ +#define DEFAULT_PRETIMEOUT 5 /* seconds, the 2nd watch period*/

+static unsigned int timeout; +module_param(timeout, uint, 0); +MODULE_PARM_DESC(timeout,

•            "Watchdog timeout in seconds. (>=0, default="
  

•            __MODULE_STRING(DEFAULT_TIMEOUT) ")");
  

+static unsigned int max_timeout = UINT_MAX; +module_param(max_timeout, uint, 0); +MODULE_PARM_DESC(max_timeout,

•            "Watchdog max timeout in seconds. (>=0, default="
  

•            __MODULE_STRING(UINT_MAX) ")");
  

+static unsigned int pretimeout; +module_param(pretimeout, uint, 0); +MODULE_PARM_DESC(pretimeout,

•            "Watchdog pretimeout in seconds. (>=0, default="
  

•            __MODULE_STRING(DEFAULT_PRETIMEOUT) ")");
  

+static unsigned int max_pretimeout = U32_MAX; +module_param(max_pretimeout, uint, 0); +MODULE_PARM_DESC(max_pretimeout,

•            "Watchdog max pretimeout in seconds. (>=0, default="
  

•            __MODULE_STRING(U32_MAX) ")");
  

+static bool nowayout = WATCHDOG_NOWAYOUT; +module_param(nowayout, bool, S_IRUGO); +MODULE_PARM_DESC(nowayout,

•            "Watchdog cannot be stopped once started (default="
  

•            __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
  

+/*

• • Architected system timer support.

Architected ? Sounds a bit odd. Not sure if this comment serves a real purpose.

Ah, sorry , this is comment is a legacy , will update it . :-)

...

• */

+static void sbsa_gwdt_cf_write(unsigned int reg, u32 val,

•                          struct watchdog_device *wdd)
  

+{

•   struct sbsa_gwdt *gwdt = to_sbsa_gwdt(wdd);
  

•   writel_relaxed(val, gwdt->control_base + reg);
  

+}

+static void sbsa_gwdt_rf_write(unsigned int reg, u32 val,

•                          struct watchdog_device *wdd)
  

+{

•   struct sbsa_gwdt *gwdt = to_sbsa_gwdt(wdd);
  

•   writel_relaxed(val, gwdt->refresh_base + reg);
  

+}

+static u32 sbsa_gwdt_cf_read(unsigned int reg, struct watchdog_device *wdd) +{

•   struct sbsa_gwdt *gwdt = to_sbsa_gwdt(wdd);
  

•   return readl_relaxed(gwdt->control_base + reg);
  

+}

+/*

• • help founctions for accessing 64bit WCV register

functions

Ah , typo , sorry

...

• */

+static u64 sbsa_gwdt_get_wcv(struct watchdog_device *wdd) +{

•   u32 wcv_lo, wcv_hi;
  

•   do {
  

•           wcv_hi = sbsa_gwdt_cf_read(SBSA_GWDT_WCV_HI, wdd);
  

•           wcv_lo = sbsa_gwdt_cf_read(SBSA_GWDT_WCV_LO, wdd);
  

•   } while (wcv_hi != sbsa_gwdt_cf_read(SBSA_GWDT_WCV_HI, wdd));
  

•   return (((u64)wcv_hi << 32) | wcv_lo);
  

+}

+static void sbsa_gwdt_set_wcv(struct watchdog_device *wdd, u64 value) +{

•   u32 wcv_lo, wcv_hi;
  

•   wcv_lo = value & U32_MAX;
  

•   wcv_hi = (value >> 32) & U32_MAX;
  

•   sbsa_gwdt_cf_write(SBSA_GWDT_WCV_HI, wcv_hi, wdd);
  

•   sbsa_gwdt_cf_write(SBSA_GWDT_WCV_LO, wcv_lo, wdd);
  

+}

+static void reload_timeout_to_wcv(struct watchdog_device *wdd) +{

•   struct sbsa_gwdt *gwdt = to_sbsa_gwdt(wdd);
  

•   u64 wcv;
  

•   wcv = arch_counter_get_cntvct() +
  

•           (u64)(wdd->timeout - wdd->pretimeout) * gwdt->clk;
  

•   sbsa_gwdt_set_wcv(wdd, wcv);
  

+}

+/*

• • Use the following function to set the limit of timeout

s/limit of timeout/timeout limits/

Thanks , will fix it

...

• • after updating pretimeout
• */

+static void sbsa_gwdt_update_limits(struct watchdog_device *wdd) +{

•   struct sbsa_gwdt *gwdt = to_sbsa_gwdt(wdd);
  

•   u64 first_period_max = U64_MAX;
  

•   do_div(first_period_max, gwdt->clk);
  

•   wdd->min_timeout = wdd->pretimeout + 1;
  

•   wdd->max_timeout = min((uint)(wdd->pretimeout + first_period_max),
  

•                          wdd->max_timeout);
  

+}

+static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd,

•                            unsigned int timeout)
  

+{

•   wdd->timeout = timeout;
  

•   return 0;
  

+}

+static int sbsa_gwdt_set_pretimeout(struct watchdog_device *wdd,

•                               unsigned int pretimeout)
  

+{

•   struct sbsa_gwdt *gwdt = to_sbsa_gwdt(wdd);
  

•   u32 wor;
  

•   wdd->pretimeout = pretimeout;
  

•   sbsa_gwdt_update_limits(wdd);
  

•   if (!pretimeout)
  

•           /* gives sbsa_gwdt_start a chance to setup timeout */
  

•           wor = gwdt->clk;
  

•   else
  

•           wor = pretimeout * gwdt->clk;
  

•   /* refresh the WOR, that will cause an explicit watchdog refresh
  

*/

•   sbsa_gwdt_cf_write(SBSA_GWDT_WOR, wor, wdd);
  

•   return 0;
  

+}

+static unsigned int sbsa_gwdt_get_timeleft(struct watchdog_device *wdd) +{

•   struct sbsa_gwdt *gwdt = to_sbsa_gwdt(wdd);
  

•   u64 timeleft = sbsa_gwdt_get_wcv(wdd) - arch_counter_get_cntvct();
  

Still not happy about the use of arch_counter_get_cntvct instead of using the clock subsystem. I am quite sure this could be done, possibly through arch_sys_counter, though at this point I am getting wary of bringing it up, so I guess I'll just let it go.

yes, It is the code I should check again, will sent more feedback once I get better idea

...

•   do_div(timeleft, gwdt->clk);
  

•   return timeleft;
  

+}

+static int sbsa_gwdt_start(struct watchdog_device *wdd) +{

•   /* Force refresh */
  

•   sbsa_gwdt_rf_write(SBSA_GWDT_WRR, 0xc0ffee, wdd);
  

•   /* writing WCS will cause an explicit watchdog refresh */
  

•   sbsa_gwdt_cf_write(SBSA_GWDT_WCS, SBSA_GWDT_WCS_EN, wdd);
  

•   reload_timeout_to_wcv(wdd);
  

•   return 0;
  

+}

+static int sbsa_gwdt_stop(struct watchdog_device *wdd) +{

•   /* Force refresh */
  

•   sbsa_gwdt_rf_write(SBSA_GWDT_WRR, 0xc0ffee, wdd);
  

•   /* writing WCS will cause an explicit watchdog refresh */
  

•   sbsa_gwdt_cf_write(SBSA_GWDT_WCS, 0, wdd);
  

•   return 0;
  

+}

+static int sbsa_gwdt_keepalive(struct watchdog_device *wdd) +{

•   /*
  

•    * Writing WRR for an explicit watchdog refresh
  

•    * You can write anyting(like 0xc0ffee)
  

•    */
  

•   sbsa_gwdt_rf_write(SBSA_GWDT_WRR, 0xc0ffee, wdd);
  

•   reload_timeout_to_wcv(wdd);
  

•   return 0;
  

+}

+static irqreturn_t sbsa_gwdt_interrupt(int irq, void *dev_id) +{

•   struct sbsa_gwdt *gwdt = (struct sbsa_gwdt *)dev_id;
  

•   struct watchdog_device *wdd = &gwdt->wdd;
  

•   u32 status;
  

•   status = sbsa_gwdt_cf_read(SBSA_GWDT_WCS, wdd);
  

•   if (status & SBSA_GWDT_WCS_WS0)
  

•           panic("SBSA Watchdog pre-timeout");
  

•   return IRQ_HANDLED;
  

+}

+static struct watchdog_info sbsa_gwdt_info = {

•   .identity       = "SBSA Generic Watchdog",
  

•   .options        = WDIOF_SETTIMEOUT |
  

•                     WDIOF_KEEPALIVEPING |
  

•                     WDIOF_MAGICCLOSE |
  

•                     WDIOF_PRETIMEOUT |
  

•                     WDIOF_CARDRESET,
  

+};

+static struct watchdog_ops sbsa_gwdt_ops = {

•   .owner          = THIS_MODULE,
  

•   .start          = sbsa_gwdt_start,
  

•   .stop           = sbsa_gwdt_stop,
  

•   .ping           = sbsa_gwdt_keepalive,
  

•   .set_timeout    = sbsa_gwdt_set_timeout,
  

•   .set_pretimeout = sbsa_gwdt_set_pretimeout,
  

•   .get_timeleft   = sbsa_gwdt_get_timeleft,
  

+};

+static int sbsa_gwdt_probe(struct platform_device *pdev) +{

•   struct device *dev = &pdev->dev;
  

•   struct sbsa_gwdt *gwdt;
  

•   struct watchdog_device *wdd;
  

•   struct resource *res;
  

•   void *rf_base, *cf_base;
  

•   int irq;
  

•   u32 clk, status;
  

•   int ret = 0;
  

•   u64 first_period_max = U64_MAX;
  

•   /*
  

•    * Try to determine the frequency from the arch_timer interface
  

•    */
  

•   clk = arch_timer_get_rate();
  

arch_timer_get_rate() does not seem to be exported. Did you try to build the driver as module ?

yes, I have built it as a ko module, that is why I made a patch to export this interface in the first patch of this patchset

but I will confirm it again :-)

...

•   if (!clk) {
  

•           dev_err(dev, "System Counter frequency not available\n");
  

•           return -EINVAL;
  

•   }
  

•   gwdt = devm_kzalloc(dev, sizeof(*gwdt), GFP_KERNEL);
  

•   if (!gwdt)
  

•           return -ENOMEM;
  

•   res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
  

"refresh");

•   rf_base = devm_ioremap_resource(dev, res);
  

•   if (IS_ERR(rf_base))
  

•           return PTR_ERR(rf_base);
  

•   res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
  

"control");

•   cf_base = devm_ioremap_resource(dev, res);
  

•   if (IS_ERR(rf_base))
  

•           return PTR_ERR(rf_base);
  

•   irq = platform_get_irq_byname(pdev, "ws0");
  

•   if (irq < 0) {
  

•           dev_err(dev, "unable to get ws0 interrupt.\n");
  

•           return irq;
  

•   }
  

•   gwdt->refresh_base = rf_base;
  

•   gwdt->control_base = cf_base;
  

•   gwdt->clk = clk;
  

•   platform_set_drvdata(pdev, gwdt);
  

•   wdd = &gwdt->wdd;
  

•   wdd->parent = dev;
  

•   wdd->info = &sbsa_gwdt_info;
  

•   wdd->ops = &sbsa_gwdt_ops;
  

•   watchdog_set_drvdata(wdd, gwdt);
  

•   watchdog_set_nowayout(wdd, nowayout);
  

•   status = sbsa_gwdt_cf_read(SBSA_GWDT_WCS, wdd);
  

•   if (status & SBSA_GWDT_WCS_WS1) {
  

•           dev_warn(dev, "System reset by WDT(WCS: %x, WCV: %llx)\n",
  

•                    status, sbsa_gwdt_get_wcv(wdd));
  

•           wdd->bootstatus |= WDIOF_CARDRESET;
  

•   }
  

•   /* Check if watchdog is already enabled */
  

•   if (status & SBSA_GWDT_WCS_EN) {
  

•           dev_warn(dev, "already enabled! WCS:0x%x\n", status);
  

•           sbsa_gwdt_keepalive(wdd);
  

•   }
  

•   wdd->min_pretimeout = 0;
  

•   wdd->max_pretimeout = min(U32_MAX / clk, max_pretimeout);
  

•   wdd->min_timeout = 1;
  

•   do_div(first_period_max, clk);
  

•   wdd->max_timeout = min((uint)(wdd->pretimeout + first_period_max),
  

•                          max_timeout);
  

•   wdd->pretimeout = DEFAULT_PRETIMEOUT;
  

•   wdd->timeout = DEFAULT_TIMEOUT;
  

•   watchdog_init_timeouts(wdd, pretimeout, timeout,
  

•                          sbsa_gwdt_update_limits, dev);
  

•   /* update pretimeout to WOR */
  

•   sbsa_gwdt_cf_write(SBSA_GWDT_WOR, wdd->pretimeout * clk, wdd);
  

•   ret = devm_request_irq(dev, irq, sbsa_gwdt_interrupt, IRQF_TIMER,
  

•                          pdev->name, gwdt);
  

•   if (ret) {
  

•           dev_err(dev, "unable to request IRQ %d\n", irq);
  

•           return ret;
  

•   }
  

•   ret = watchdog_register_device(wdd);
  

•   if (ret)
  

•           return ret;
  

•   dev_info(dev, "Initialized with %ds timeout, %ds pretimeout @
  

%uHz\n",

•            wdd->timeout, wdd->pretimeout, gwdt->clk);
  

•   return 0;
  

+}

+static void sbsa_gwdt_shutdown(struct platform_device *pdev) +{

•   struct sbsa_gwdt *gwdt = platform_get_drvdata(pdev);
  

•   sbsa_gwdt_stop(&gwdt->wdd);
  

+}

+static int sbsa_gwdt_remove(struct platform_device *pdev) +{

•   struct sbsa_gwdt *gwdt = platform_get_drvdata(pdev);
  

•   int ret = 0;
  

•   if (!nowayout)
  

•           ret = sbsa_gwdt_stop(&gwdt->wdd);
  

•   watchdog_unregister_device(&gwdt->wdd);
  

•   return ret;
  

+}

+/* Disable watchdog if it is active during suspend */ +static int __maybe_unused sbsa_gwdt_suspend(struct device *dev) +{

•   struct sbsa_gwdt *gwdt = dev_get_drvdata(dev);
  

•   if (watchdog_active(&gwdt->wdd))
  

•           sbsa_gwdt_stop(&gwdt->wdd);
  

•   return 0;
  

+}

+/* Enable watchdog and configure it if necessary */ +static int __maybe_unused sbsa_gwdt_resume(struct device *dev) +{

•   struct sbsa_gwdt *gwdt = dev_get_drvdata(dev);
  

•   if (watchdog_active(&gwdt->wdd))
  

•           sbsa_gwdt_start(&gwdt->wdd);
  

•   return 0;
  

+}

+static const struct dev_pm_ops sbsa_gwdt_pm_ops = {

•   SET_SYSTEM_SLEEP_PM_OPS(sbsa_gwdt_suspend, sbsa_gwdt_resume)
  

+};

+static const struct of_device_id sbsa_gwdt_of_match[] = {

•   { .compatible = "arm,sbsa-gwdt", },
  

•   {},
  

+}; +MODULE_DEVICE_TABLE(of, sbsa_gwdt_of_match);

+static const struct platform_device_id sbsa_gwdt_pdev_match[] = {

•   { .name = "sbsa-gwdt", },
  

•   {},
  

+}; +MODULE_DEVICE_TABLE(platform, sbsa_gwdt_pdev_match);

+static struct platform_driver sbsa_gwdt_driver = {

•   .driver = {
  

•           .name = "sbsa-gwdt",
  

•           .pm = &sbsa_gwdt_pm_ops,
  

•           .of_match_table = sbsa_gwdt_of_match,
  

•   },
  

•   .probe = sbsa_gwdt_probe,
  

•   .remove = sbsa_gwdt_remove,
  

•   .shutdown = sbsa_gwdt_shutdown,
  

•   .id_table = sbsa_gwdt_pdev_match,
  

+};

+module_platform_driver(sbsa_gwdt_driver);

+MODULE_DESCRIPTION("SBSA Generic Watchdog Driver"); +MODULE_VERSION("v1.0"); +MODULE_AUTHOR("Fu Wei fu.wei@linaro.org"); +MODULE_AUTHOR("Suravee Suthikulpanit Suravee.Suthikulpanit@amd.com"); +MODULE_LICENSE("GPL v2");