Skip to content

L
linux-davinci
Commit d6d9b867 authored by Nishanth Menon's avatar Nishanth Menon Committed by Tony Lindgren
Browse files
Options

WATCHDOG: use base address from platform resources and make 2430 boot again 

Modfied watchdog driver to use base address provided in platform defn
Cleaned up a bunch of statics used.
Added 2430 baseaddress defn
Addressed review comments for patch1 and 2 reported by Trilok Soni and Tony
Signed-off-by: default avatarNishanth Menon <menon.nishanth@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2ea2b6ca
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 115 deletions
drivers/char/watchdog/omap_wdt.c
View file @ d6d9b867
...@@ -49,49 +49,61 @@ ...@@ -49,49 +49,61 @@
#include "omap_wdt.h" #include "omap_wdt.h"
static struct platform_device *omap_wdt_dev;
static unsigned timer_margin; static unsigned timer_margin;
module_param(timer_margin, uint, 0); module_param(timer_margin, uint, 0);
MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)"); MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)");
static int omap_wdt_users;
static struct clk *armwdt_ck = NULL;
static struct clk *mpu_wdt_ick = NULL;
static struct clk *mpu_wdt_fck = NULL;
static unsigned int wdt_trgr_pattern = 0x1234; static unsigned int wdt_trgr_pattern = 0x1234;
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;
};
static void omap_wdt_ping(void) static void omap_wdt_ping(struct omap_wdt_dev *wdev)
{ {
void __iomem *base = wdev->base;
/* wait for posted write to complete */ /* wait for posted write to complete */
while ((omap_readl(OMAP_WATCHDOG_WPS)) & 0x08) while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
cpu_relax(); cpu_relax();
wdt_trgr_pattern = ~wdt_trgr_pattern; wdt_trgr_pattern = ~wdt_trgr_pattern;
omap_writel(wdt_trgr_pattern, (OMAP_WATCHDOG_TGR)); omap_writel(wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
/* wait for posted write to complete */ /* wait for posted write to complete */
while ((omap_readl(OMAP_WATCHDOG_WPS)) & 0x08) while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
cpu_relax(); cpu_relax();
/* reloaded WCRR from WLDR */ /* reloaded WCRR from WLDR */
} }
static void omap_wdt_enable(void) static void omap_wdt_enable(struct omap_wdt_dev *wdev)
{ {
void __iomem *base;
base = wdev->base;
/* Sequence to enable the watchdog */ /* Sequence to enable the watchdog */
omap_writel(0xBBBB, OMAP_WATCHDOG_SPR); omap_writel(0xBBBB, base + OMAP_WATCHDOG_SPR);
while ((omap_readl(OMAP_WATCHDOG_WPS)) & 0x10) while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
cpu_relax(); cpu_relax();
omap_writel(0x4444, OMAP_WATCHDOG_SPR); omap_writel(0x4444, base + OMAP_WATCHDOG_SPR);
while ((omap_readl(OMAP_WATCHDOG_WPS)) & 0x10) while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
cpu_relax(); cpu_relax();
} }
static void omap_wdt_disable(void) static void omap_wdt_disable(struct omap_wdt_dev *wdev)
{ {
void __iomem *base;
base = wdev->base;
/* sequence required to disable watchdog */ /* sequence required to disable watchdog */
omap_writel(0xAAAA, OMAP_WATCHDOG_SPR); /* TIMER_MODE */ omap_writel(0xAAAA, base + OMAP_WATCHDOG_SPR); /* TIMER_MODE */
while (omap_readl(OMAP_WATCHDOG_WPS) & 0x10) while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
cpu_relax(); cpu_relax();
omap_writel(0x5555, OMAP_WATCHDOG_SPR); /* TIMER_MODE */ omap_writel(0x5555, base + OMAP_WATCHDOG_SPR); /* TIMER_MODE */
while (omap_readl(OMAP_WATCHDOG_WPS) & 0x10) while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
cpu_relax(); cpu_relax();
} }
...@@ -104,15 +116,17 @@ static void omap_wdt_adjust_timeout(unsigned new_timeout) ...@@ -104,15 +116,17 @@ static void omap_wdt_adjust_timeout(unsigned new_timeout)
timer_margin = new_timeout; timer_margin = new_timeout;
} }
static void omap_wdt_set_timeout(void) static void omap_wdt_set_timeout(struct omap_wdt_dev *wdev)
{ {
u32 pre_margin = GET_WLDR_VAL(timer_margin); u32 pre_margin = GET_WLDR_VAL(timer_margin);
void __iomem *base;
base = wdev->base;
/* just count up at 32 KHz */ /* just count up at 32 KHz */
while (omap_readl(OMAP_WATCHDOG_WPS) & 0x04) while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
cpu_relax(); cpu_relax();
omap_writel(pre_margin, OMAP_WATCHDOG_LDR); omap_writel(pre_margin, base + OMAP_WATCHDOG_LDR);
while (omap_readl(OMAP_WATCHDOG_WPS) & 0x04) while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
cpu_relax(); cpu_relax();
} }
...@@ -122,55 +136,65 @@ static void omap_wdt_set_timeout(void) ...@@ -122,55 +136,65 @@ static void omap_wdt_set_timeout(void)
static int omap_wdt_open(struct inode *inode, struct file *file) static int omap_wdt_open(struct inode *inode, struct file *file)
{ {
if (test_and_set_bit(1, (unsigned long *)&omap_wdt_users)) struct omap_wdt_dev *wdev;
void __iomem *base;
wdev = platform_get_drvdata(omap_wdt_dev);
base = wdev->base;
if (test_and_set_bit(1, (unsigned long *)&(wdev->omap_wdt_users)))
return -EBUSY; return -EBUSY;
if (cpu_is_omap16xx()) if (cpu_is_omap16xx())
clk_enable(armwdt_ck); /* Enable the clock */ clk_enable(wdev->armwdt_ck); /* Enable the clock */
if (cpu_is_omap24xx()) { if (cpu_is_omap24xx()) {
clk_enable(mpu_wdt_ick); /* Enable the interface clock */ clk_enable(wdev->mpu_wdt_ick); /* Enable the interface clock */
clk_enable(mpu_wdt_fck); /* Enable the functional clock */ clk_enable(wdev->mpu_wdt_fck); /* Enable the functional clock */
} }
/* initialize prescaler */ /* initialize prescaler */
while (omap_readl(OMAP_WATCHDOG_WPS) & 0x01) while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
cpu_relax(); cpu_relax();
omap_writel((1 << 5) | (PTV << 2), OMAP_WATCHDOG_CNTRL); omap_writel((1 << 5) | (PTV << 2), base + OMAP_WATCHDOG_CNTRL);
while (omap_readl(OMAP_WATCHDOG_WPS) & 0x01) while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
cpu_relax(); cpu_relax();
omap_wdt_set_timeout(); file->private_data = (void *) wdev;
omap_wdt_enable();
omap_wdt_set_timeout(wdev);
omap_wdt_enable(wdev);
return 0; return 0;
} }
static int omap_wdt_release(struct inode *inode, struct file *file) static int omap_wdt_release(struct inode *inode, struct file *file)
{ {
struct omap_wdt_dev *wdev;
wdev = file->private_data;
/* /*
* Shut off the timer unless NOWAYOUT is defined. * Shut off the timer unless NOWAYOUT is defined.
*/ */
#ifndef CONFIG_WATCHDOG_NOWAYOUT #ifndef CONFIG_WATCHDOG_NOWAYOUT
omap_wdt_disable();
omap_wdt_disable(wdev);
if (cpu_is_omap16xx()) { if (cpu_is_omap16xx()) {
clk_disable(armwdt_ck); /* Disable the clock */ clk_disable(wdev->armwdt_ck); /* Disable the clock */
clk_put(armwdt_ck); clk_put(wdev->armwdt_ck);
armwdt_ck = NULL; wdev->armwdt_ck = NULL;
} }
if (cpu_is_omap24xx()) { if (cpu_is_omap24xx()) {
clk_disable(mpu_wdt_ick); /* Disable the clock */ clk_disable(wdev->mpu_wdt_ick); /* Disable the clock */
clk_disable(mpu_wdt_fck); /* Disable the clock */ clk_disable(wdev->mpu_wdt_fck); /* Disable the clock */
clk_put(mpu_wdt_ick); clk_put(wdev->mpu_wdt_ick);
clk_put(mpu_wdt_fck); clk_put(wdev->mpu_wdt_fck);
mpu_wdt_ick = NULL; wdev->mpu_wdt_ick = NULL;
mpu_wdt_fck = NULL; wdev->mpu_wdt_fck = NULL;
} }
#else #else
printk(KERN_CRIT "omap_wdt: Unexpected close, not stopping!\n"); printk(KERN_CRIT "omap_wdt: Unexpected close, not stopping!\n");
#endif #endif
omap_wdt_users = 0; wdev->omap_wdt_users = 0;
return 0; return 0;
} }
...@@ -178,9 +202,11 @@ static ssize_t ...@@ -178,9 +202,11 @@ static ssize_t
omap_wdt_write(struct file *file, const char __user *data, omap_wdt_write(struct file *file, const char __user *data,
size_t len, loff_t *ppos) size_t len, loff_t *ppos)
{ {
struct omap_wdt_dev *wdev;
wdev = file->private_data;
/* Refresh LOAD_TIME. */ /* Refresh LOAD_TIME. */
if (len) if (len)
omap_wdt_ping(); omap_wdt_ping(wdev);
return len; return len;
} }
...@@ -188,12 +214,14 @@ static int ...@@ -188,12 +214,14 @@ static int
omap_wdt_ioctl(struct inode *inode, struct file *file, omap_wdt_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct omap_wdt_dev *wdev;
int new_margin; int new_margin;
static struct watchdog_info ident = { static struct watchdog_info ident = {
.identity = "OMAP Watchdog", .identity = "OMAP Watchdog",
.options = WDIOF_SETTIMEOUT, .options = WDIOF_SETTIMEOUT,
.firmware_version = 0, .firmware_version = 0,
}; };
wdev = file->private_data;
switch (cmd) { switch (cmd) {
default: default:
...@@ -211,22 +239,23 @@ omap_wdt_ioctl(struct inode *inode, struct file *file, ...@@ -211,22 +239,23 @@ omap_wdt_ioctl(struct inode *inode, struct file *file,
return put_user(omap_prcm_get_reset_sources(), return put_user(omap_prcm_get_reset_sources(),
(int __user *)arg); (int __user *)arg);
case WDIOC_KEEPALIVE: case WDIOC_KEEPALIVE:
omap_wdt_ping(); omap_wdt_ping(wdev);
return 0; return 0;
case WDIOC_SETTIMEOUT: case WDIOC_SETTIMEOUT:
if (get_user(new_margin, (int __user *)arg)) if (get_user(new_margin, (int __user *)arg))
return -EFAULT; return -EFAULT;
omap_wdt_adjust_timeout(new_margin); omap_wdt_adjust_timeout(new_margin);
omap_wdt_disable(); omap_wdt_disable(wdev);
omap_wdt_set_timeout(); omap_wdt_set_timeout(wdev);
omap_wdt_enable(); omap_wdt_enable(wdev);
omap_wdt_ping(); omap_wdt_ping(wdev);
/* Fall */ /* Fall */
case WDIOC_GETTIMEOUT: case WDIOC_GETTIMEOUT:
return put_user(timer_margin, (int __user *)arg); return put_user(timer_margin, (int __user *)arg);
} }
return 0;
} }
static const struct file_operations omap_wdt_fops = { static const struct file_operations omap_wdt_fops = {
...@@ -237,96 +266,123 @@ static const struct file_operations omap_wdt_fops = { ...@@ -237,96 +266,123 @@ static const struct file_operations omap_wdt_fops = {
.release = omap_wdt_release, .release = omap_wdt_release,
}; };
static struct miscdevice omap_wdt_miscdev = {
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &omap_wdt_fops
};
static int __init omap_wdt_probe(struct platform_device *pdev) static int __init omap_wdt_probe(struct platform_device *pdev)
{ {
struct resource *res, *mem; struct resource *res, *mem;
int ret; int ret;
struct omap_wdt_dev *wdev;
/* reserve static register mappings */ /* reserve static register mappings */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) if (!res)
return -ENOENT; return -ENOENT;
if (omap_wdt_dev)
return -EBUSY;
mem = request_mem_region(res->start, res->end - res->start + 1, mem = request_mem_region(res->start, res->end - res->start + 1,
pdev->name); pdev->name);
if (mem == NULL) if (mem == NULL)
return -EBUSY; return -EBUSY;
platform_set_drvdata(pdev, mem); wdev = kzalloc(sizeof(struct omap_wdt_dev), GFP_KERNEL);
if (!wdev) {
omap_wdt_users = 0; ret = -ENOMEM;
goto fail;
}
wdev->omap_wdt_users = 0;
wdev->mem = mem;
if (cpu_is_omap16xx()) { if (cpu_is_omap16xx()) {
armwdt_ck = clk_get(&pdev->dev, "armwdt_ck"); wdev->armwdt_ck = clk_get(&pdev->dev, "armwdt_ck");
if (IS_ERR(armwdt_ck)) { if (IS_ERR(wdev->armwdt_ck)) {
ret = PTR_ERR(armwdt_ck); ret = PTR_ERR(wdev->armwdt_ck);
armwdt_ck = NULL; wdev->armwdt_ck = NULL;
goto fail; goto fail;
} }
} }
if (cpu_is_omap24xx()) { if (cpu_is_omap24xx()) {
mpu_wdt_ick = clk_get(&pdev->dev, "mpu_wdt_ick"); wdev->mpu_wdt_ick = clk_get(&pdev->dev, "mpu_wdt_ick");
if (IS_ERR(mpu_wdt_ick)) { if (IS_ERR(wdev->mpu_wdt_ick)) {
ret = PTR_ERR(mpu_wdt_ick); ret = PTR_ERR(wdev->mpu_wdt_ick);
mpu_wdt_ick = NULL; wdev->mpu_wdt_ick = NULL;
goto fail; goto fail;
} }
mpu_wdt_fck = clk_get(&pdev->dev, "mpu_wdt_fck"); wdev->mpu_wdt_fck = clk_get(&pdev->dev, "mpu_wdt_fck");
if (IS_ERR(mpu_wdt_fck)) { if (IS_ERR(wdev->mpu_wdt_fck)) {
ret = PTR_ERR(mpu_wdt_fck); ret = PTR_ERR(wdev->mpu_wdt_fck);
mpu_wdt_fck = NULL; wdev->mpu_wdt_fck = NULL;
goto fail; goto fail;
} }
} }
wdev->base = (void __iomem *) (mem->start);
platform_set_drvdata(pdev, wdev);
omap_wdt_disable(); omap_wdt_disable(wdev);
omap_wdt_adjust_timeout(timer_margin); omap_wdt_adjust_timeout(timer_margin);
omap_wdt_miscdev.parent = &pdev->dev; wdev->omap_wdt_miscdev.parent = &pdev->dev;
ret = misc_register(&omap_wdt_miscdev); wdev->omap_wdt_miscdev.minor = WATCHDOG_MINOR;
wdev->omap_wdt_miscdev.name = "watchdog";
wdev->omap_wdt_miscdev.fops = &omap_wdt_fops;
ret = misc_register(&(wdev->omap_wdt_miscdev));
if (ret) if (ret)
goto fail; goto fail;
pr_info("OMAP Watchdog Timer: initial timeout %d sec\n", timer_margin); pr_info("OMAP Watchdog Timer Rev 0x%02x: initial timeout %d sec\n",
omap_readl(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
timer_margin);
/* autogate OCP interface clock */ /* autogate OCP interface clock */
omap_writel(0x01, OMAP_WATCHDOG_SYS_CONFIG); omap_writel(0x01, wdev->base + OMAP_WATCHDOG_SYS_CONFIG);
omap_wdt_dev = pdev;
return 0; return 0;
fail: fail:
if (armwdt_ck) if (wdev) {
clk_put(armwdt_ck); platform_set_drvdata(pdev, NULL);
if (mpu_wdt_ick) if (wdev->armwdt_ck)
clk_put(mpu_wdt_ick); clk_put(wdev->armwdt_ck);
if (mpu_wdt_fck) if (wdev->mpu_wdt_ick)
clk_put(mpu_wdt_fck); clk_put(wdev->mpu_wdt_ick);
release_resource(mem); if (wdev->mpu_wdt_fck)
clk_put(wdev->mpu_wdt_fck);
kfree(wdev);
}
if (mem) {
release_resource(mem);
}
return ret; return ret;
} }
static void omap_wdt_shutdown(struct platform_device *pdev) static void omap_wdt_shutdown(struct platform_device *pdev)
{ {
omap_wdt_disable(); struct omap_wdt_dev *wdev;
wdev = platform_get_drvdata(pdev);
omap_wdt_disable(wdev);
} }
static int omap_wdt_remove(struct platform_device *pdev) static int omap_wdt_remove(struct platform_device *pdev)
{ {
struct resource *mem = platform_get_drvdata(pdev); struct omap_wdt_dev *wdev;
misc_deregister(&omap_wdt_miscdev); wdev = platform_get_drvdata(pdev);
release_resource(mem);
if (armwdt_ck) misc_deregister(&(wdev->omap_wdt_miscdev));
clk_put(armwdt_ck); release_resource(wdev->mem);
if (mpu_wdt_ick) platform_set_drvdata(pdev, NULL);
clk_put(mpu_wdt_ick); if (wdev->armwdt_ck)
if (mpu_wdt_fck) clk_put(wdev->armwdt_ck);
clk_put(mpu_wdt_fck); if (wdev->mpu_wdt_ick)
clk_put(wdev->mpu_wdt_ick);
if (wdev->mpu_wdt_fck)
clk_put(wdev->mpu_wdt_fck);
kfree(wdev);
omap_wdt_dev = NULL;
return 0; return 0;
} }
...@@ -340,16 +396,20 @@ static int omap_wdt_remove(struct platform_device *pdev) ...@@ -340,16 +396,20 @@ static int omap_wdt_remove(struct platform_device *pdev)
static int omap_wdt_suspend(struct platform_device *pdev, pm_message_t state) static int omap_wdt_suspend(struct platform_device *pdev, pm_message_t state)
{ {
if (omap_wdt_users) struct omap_wdt_dev *wdev;
omap_wdt_disable(); wdev = platform_get_drvdata(pdev);
if (wdev->omap_wdt_users)
omap_wdt_disable(wdev);
return 0; return 0;
} }
static int omap_wdt_resume(struct platform_device *pdev) static int omap_wdt_resume(struct platform_device *pdev)
{ {
if (omap_wdt_users) { struct omap_wdt_dev *wdev;
omap_wdt_enable(); wdev = platform_get_drvdata(pdev);
omap_wdt_ping(); if (wdev->omap_wdt_users) {
omap_wdt_enable(wdev);
omap_wdt_ping(wdev);
} }
return 0; return 0;
} }
......
drivers/char/watchdog/omap_wdt.h
View file @ d6d9b867
...@@ -30,25 +30,15 @@ ...@@ -30,25 +30,15 @@
#ifndef _OMAP_WATCHDOG_H #ifndef _OMAP_WATCHDOG_H
#define _OMAP_WATCHDOG_H #define _OMAP_WATCHDOG_H
#define OMAP1610_WATCHDOG_BASE 0xfffeb000 #define OMAP_WATCHDOG_REV (0x00)
#define OMAP2420_WATCHDOG_BASE 0x48022000 /*WDT Timer 2 */ #define OMAP_WATCHDOG_SYS_CONFIG (0x10)
#define OMAP_WATCHDOG_STATUS (0x14)
#ifdef CONFIG_ARCH_OMAP24XX #define OMAP_WATCHDOG_CNTRL (0x24)
#define OMAP_WATCHDOG_BASE OMAP2420_WATCHDOG_BASE #define OMAP_WATCHDOG_CRR (0x28)
#else #define OMAP_WATCHDOG_LDR (0x2c)
#define OMAP_WATCHDOG_BASE OMAP1610_WATCHDOG_BASE #define OMAP_WATCHDOG_TGR (0x30)
#define RM_RSTST_WKUP 0 #define OMAP_WATCHDOG_WPS (0x34)
#endif #define OMAP_WATCHDOG_SPR (0x48)
#define OMAP_WATCHDOG_REV (OMAP_WATCHDOG_BASE + 0x00)
#define OMAP_WATCHDOG_SYS_CONFIG (OMAP_WATCHDOG_BASE + 0x10)
#define OMAP_WATCHDOG_STATUS (OMAP_WATCHDOG_BASE + 0x14)
#define OMAP_WATCHDOG_CNTRL (OMAP_WATCHDOG_BASE + 0x24)
#define OMAP_WATCHDOG_CRR (OMAP_WATCHDOG_BASE + 0x28)
#define OMAP_WATCHDOG_LDR (OMAP_WATCHDOG_BASE + 0x2c)
#define OMAP_WATCHDOG_TGR (OMAP_WATCHDOG_BASE + 0x30)
#define OMAP_WATCHDOG_WPS (OMAP_WATCHDOG_BASE + 0x34)
#define OMAP_WATCHDOG_SPR (OMAP_WATCHDOG_BASE + 0x48)
/* Using the prescaler, the OMAP watchdog could go for many /* Using the prescaler, the OMAP watchdog could go for many
* months before firing. These limits work without scaling, * months before firing. These limits work without scaling,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment