module_param(timer_margin, uint, 0);
MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)");
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout,
+ "Watchdog cannot be stopped once started (default="
+ __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+
static unsigned int wdt_trgr_pattern = 0x1234;
static spinlock_t wdt_lock;
+#define OMAP_WDT_STATE_OPENED_BIT 1
+#define OMAP_WDT_STATE_ACTIVATED_BIT 8
+
struct omap_wdt_dev {
- void __iomem *base; /* physical */
- struct device *dev;
- int omap_wdt_users;
- struct clk *armwdt_ck;
- struct clk *mpu_wdt_ick;
- struct clk *mpu_wdt_fck;
- struct resource *mem;
- struct miscdevice omap_wdt_miscdev;
+ void __iomem *base; /* physical */
+ struct device *dev;
+ unsigned long omap_wdt_state;
+ struct clk *mpu_wdt_ick;
+ struct clk *mpu_wdt_fck;
+ struct resource *mem;
+ struct miscdevice omap_wdt_miscdev;
};
static void omap_wdt_ping(struct omap_wdt_dev *wdev)
/* reloaded WCRR from WLDR */
}
+static void omap_wdt_ick_enable(struct clk *ick, int enable)
+{
+ if (ick) {
+ if (enable)
+ clk_enable(ick);
+ else
+ clk_disable(ick);
+ }
+}
+
static void omap_wdt_enable(struct omap_wdt_dev *wdev)
{
void __iomem *base = wdev->base;
struct omap_wdt_dev *wdev = platform_get_drvdata(omap_wdt_dev);
void __iomem *base = wdev->base;
- if (test_and_set_bit(1, (unsigned long *)&(wdev->omap_wdt_users)))
+ if (test_and_set_bit(OMAP_WDT_STATE_OPENED_BIT,
+ &wdev->omap_wdt_state))
return -EBUSY;
- if (cpu_is_omap16xx())
- clk_enable(wdev->armwdt_ck); /* Enable the clock */
-
- if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
- clk_enable(wdev->mpu_wdt_ick); /* Enable the interface clock */
- clk_enable(wdev->mpu_wdt_fck); /* Enable the functional clock */
- }
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
+ if (wdev->omap_wdt_state & (1 << OMAP_WDT_STATE_ACTIVATED_BIT))
+ omap_wdt_ping(wdev);
+ else {
+ clk_enable(wdev->mpu_wdt_fck);
- /* initialize prescaler */
- while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
- cpu_relax();
+ /* initialize prescaler */
+ while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
+ cpu_relax();
- __raw_writel((1 << 5) | (PTV << 2), base + OMAP_WATCHDOG_CNTRL);
- while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
- cpu_relax();
+ __raw_writel((1 << 5) | (PTV << 2), base + OMAP_WATCHDOG_CNTRL);
+ while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
+ cpu_relax();
+ wdev->omap_wdt_state |= (1 << OMAP_WDT_STATE_ACTIVATED_BIT);
+ }
file->private_data = (void *) wdev;
omap_wdt_set_timeout(wdev);
omap_wdt_enable(wdev);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
return nonseekable_open(inode, file);
}
static int omap_wdt_release(struct inode *inode, struct file *file)
{
struct omap_wdt_dev *wdev = file->private_data;
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
+ if (nowayout) {
+ /* Give the user application some time to recover
+ * in case of crash.
+ */
+ omap_wdt_ping(wdev);
+ dev_err(wdev->omap_wdt_miscdev.parent,
+ "Unexpected close, not stopping!\n");
+ } else {
+ omap_wdt_disable(wdev);
- /*
- * Shut off the timer unless NOWAYOUT is defined.
- */
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
-
- omap_wdt_disable(wdev);
-
- if (cpu_is_omap16xx())
- clk_disable(wdev->armwdt_ck); /* Disable the clock */
-
- if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
- clk_disable(wdev->mpu_wdt_ick); /* Disable the clock */
- clk_disable(wdev->mpu_wdt_fck); /* Disable the clock */
+ clk_disable(wdev->mpu_wdt_fck);
+ wdev->omap_wdt_state &= ~(1 << OMAP_WDT_STATE_ACTIVATED_BIT);
}
-#else
- printk(KERN_CRIT "omap_wdt: Unexpected close, not stopping!\n");
-#endif
- wdev->omap_wdt_users = 0;
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
+ wdev->omap_wdt_state &= ~(1 << OMAP_WDT_STATE_OPENED_BIT);
return 0;
}
/* Refresh LOAD_TIME. */
if (len) {
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
spin_lock(&wdt_lock);
omap_wdt_ping(wdev);
spin_unlock(&wdt_lock);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
}
return len;
}
return put_user(omap_prcm_get_reset_sources(),
(int __user *)arg);
case WDIOC_KEEPALIVE:
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
spin_lock(&wdt_lock);
omap_wdt_ping(wdev);
spin_unlock(&wdt_lock);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
return 0;
case WDIOC_SETTIMEOUT:
if (get_user(new_margin, (int __user *)arg))
return -EFAULT;
omap_wdt_adjust_timeout(new_margin);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
spin_lock(&wdt_lock);
omap_wdt_disable(wdev);
omap_wdt_set_timeout(wdev);
omap_wdt_ping(wdev);
spin_unlock(&wdt_lock);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
/* Fall */
case WDIOC_GETTIMEOUT:
return put_user(timer_margin, (int __user *)arg);
.release = omap_wdt_release,
};
-static int __init omap_wdt_probe(struct platform_device *pdev)
+static int __devinit omap_wdt_probe(struct platform_device *pdev)
{
struct resource *res, *mem;
struct omap_wdt_dev *wdev;
goto err_busy;
}
- wdev = kzalloc(sizeof(struct omap_wdt_dev), GFP_KERNEL);
+ wdev = kzalloc(sizeof(*wdev), GFP_KERNEL);
if (!wdev) {
ret = -ENOMEM;
goto err_kzalloc;
}
- wdev->omap_wdt_users = 0;
+ wdev->omap_wdt_state = 0;
wdev->mem = mem;
if (cpu_is_omap16xx()) {
- wdev->armwdt_ck = clk_get(&pdev->dev, "armwdt_ck");
- if (IS_ERR(wdev->armwdt_ck)) {
- ret = PTR_ERR(wdev->armwdt_ck);
- wdev->armwdt_ck = NULL;
+ wdev->mpu_wdt_fck = clk_get(&pdev->dev, "armwdt_ck");
+ if (IS_ERR(wdev->mpu_wdt_fck)) {
+ ret = PTR_ERR(wdev->mpu_wdt_fck);
+ wdev->mpu_wdt_fck = NULL;
goto err_clk;
}
}
goto err_ioremap;
}
+ spin_lock_init(&wdt_lock);
platform_set_drvdata(pdev, wdev);
+ /* enable clocks for register access */
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
+ clk_enable(wdev->mpu_wdt_fck);
+
omap_wdt_disable(wdev);
omap_wdt_adjust_timeout(timer_margin);
if (ret)
goto err_misc;
- pr_info("OMAP Watchdog Timer Rev 0x%02x: initial timeout %d sec\n",
+ dev_info(wdev->omap_wdt_miscdev.parent,
+ "OMAP Watchdog Timer Rev 0x%02x: initial "
+ "timeout %d sec, nowayout is %s\n",
__raw_readl(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
- timer_margin);
+ timer_margin, (nowayout ? "on" : "off"));
/* autogate OCP interface clock */
__raw_writel(0x01, wdev->base + OMAP_WATCHDOG_SYS_CONFIG);
+ /* disable clocks since we don't need them now */
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
+ clk_disable(wdev->mpu_wdt_fck);
+
omap_wdt_dev = pdev;
return 0;
err_misc:
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
+ clk_disable(wdev->mpu_wdt_fck);
platform_set_drvdata(pdev, NULL);
iounmap(wdev->base);
wdev->base = NULL;
err_clk:
- if (wdev->armwdt_ck)
- clk_put(wdev->armwdt_ck);
if (wdev->mpu_wdt_ick)
clk_put(wdev->mpu_wdt_ick);
if (wdev->mpu_wdt_fck)
{
struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
- if (wdev->omap_wdt_users)
+ if (wdev->omap_wdt_state & (1<<OMAP_WDT_STATE_ACTIVATED_BIT)) {
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
omap_wdt_disable(wdev);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
+ }
}
-static int omap_wdt_remove(struct platform_device *pdev)
+static int __devexit omap_wdt_remove(struct platform_device *pdev)
{
struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(res->start, res->end - res->start + 1);
platform_set_drvdata(pdev, NULL);
- if (wdev->armwdt_ck) {
- clk_put(wdev->armwdt_ck);
- wdev->armwdt_ck = NULL;
- }
-
if (wdev->mpu_wdt_ick) {
clk_put(wdev->mpu_wdt_ick);
wdev->mpu_wdt_ick = NULL;
#ifdef CONFIG_PM
-/* REVISIT ... not clear this is the best way to handle system suspend; and
- * it's very inappropriate for selective device suspend (e.g. suspending this
- * through sysfs rather than by stopping the watchdog daemon). Also, this
- * may not play well enough with NOWAYOUT...
- */
-
static int omap_wdt_suspend(struct platform_device *pdev, pm_message_t state)
{
struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
- if (wdev->omap_wdt_users)
+ if (wdev->omap_wdt_state & (1<<OMAP_WDT_STATE_ACTIVATED_BIT)) {
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
omap_wdt_disable(wdev);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
+ clk_disable(wdev->mpu_wdt_fck);
+ }
return 0;
}
{
struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
- if (wdev->omap_wdt_users) {
+ if (wdev->omap_wdt_state & (1<<OMAP_WDT_STATE_ACTIVATED_BIT)) {
+ clk_enable(wdev->mpu_wdt_fck);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 1);
omap_wdt_enable(wdev);
omap_wdt_ping(wdev);
+ omap_wdt_ick_enable(wdev->mpu_wdt_ick, 0);
}
return 0;
static struct platform_driver omap_wdt_driver = {
.probe = omap_wdt_probe,
- .remove = omap_wdt_remove,
+ .remove = __devexit_p(omap_wdt_remove),
.shutdown = omap_wdt_shutdown,
.suspend = omap_wdt_suspend,
.resume = omap_wdt_resume,
static int __init omap_wdt_init(void)
{
- spin_lock_init(&wdt_lock);
return platform_driver_register(&omap_wdt_driver);
}
projects / h-e-n / blobdiff