Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e75e657756554676f13070266bedbd75d404a0f8
Commit: e75e657756554676f13070266bedbd75d404a0f8
Parent: 28401140a27b7ebc5a686dbfc345e3724d274738
Author: Wim Van Sebroeck <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 3 17:59:04 2007 +0000
Committer: Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Thu Jul 5 05:37:29 2007 +0000
[WATCHDOG] at32ap700x_wdt.c - Add spinlock support
Add spinlock support so that forked children can't
do different io stuff at the same time.
Signed-off-by: Hans-Christian Egtvedt <[EMAIL PROTECTED]>
Cc: Haavard Skinnemoen <[EMAIL PROTECTED]>
Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
Cc: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/char/watchdog/at32ap700x_wdt.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/char/watchdog/at32ap700x_wdt.c
b/drivers/char/watchdog/at32ap700x_wdt.c
index fcd55c6..75e852e 100644
--- a/drivers/char/watchdog/at32ap700x_wdt.c
+++ b/drivers/char/watchdog/at32ap700x_wdt.c
@@ -18,6 +18,7 @@
#include <linux/watchdog.h>
#include <linux/uaccess.h>
#include <linux/io.h>
+#include <linux/spinlock.h>
#define TIMEOUT_MIN 1
#define TIMEOUT_MAX 2
@@ -53,6 +54,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once
started (default="
struct wdt_at32ap700x {
void __iomem *regs;
+ spinlock_t io_lock;
int timeout;
int users;
struct miscdevice miscdev;
@@ -66,9 +68,11 @@ static char expect_release;
*/
static inline void at32_wdt_stop(void)
{
+ spin_lock(&wdt->io_lock);
unsigned long psel = wdt_readl(wdt, CTRL) & WDT_BF(CTRL_PSEL, 0x0f);
wdt_writel(wdt, CTRL, psel | WDT_BF(CTRL_KEY, 0x55));
wdt_writel(wdt, CTRL, psel | WDT_BF(CTRL_KEY, 0xaa));
+ spin_unlock(&wdt->io_lock);
}
/*
@@ -79,12 +83,14 @@ static inline void at32_wdt_start(void)
/* 0xf is 2^16 divider = 2 sec, 0xe is 2^15 divider = 1 sec */
unsigned long psel = (wdt->timeout > 1) ? 0xf : 0xe;
+ spin_lock(&wdt->io_lock);
wdt_writel(wdt, CTRL, WDT_BIT(CTRL_EN)
| WDT_BF(CTRL_PSEL, psel)
| WDT_BF(CTRL_KEY, 0x55));
wdt_writel(wdt, CTRL, WDT_BIT(CTRL_EN)
| WDT_BF(CTRL_PSEL, psel)
| WDT_BF(CTRL_KEY, 0xaa));
+ spin_unlock(&wdt->io_lock);
}
/*
@@ -92,7 +98,9 @@ static inline void at32_wdt_start(void)
*/
static inline void at32_wdt_pat(void)
{
+ spin_lock(&wdt->io_lock);
wdt_writel(wdt, CLR, 0x42);
+ spin_unlock(&wdt->io_lock);
}
/*
@@ -272,6 +280,7 @@ static int __init at32_wdt_probe(struct platform_device
*pdev)
dev_dbg(&pdev->dev, "could not map I/O memory\n");
goto err_free;
}
+ spin_lock_init(&wdt->io_lock);
wdt->users = 0;
wdt->miscdev.minor = WATCHDOG_MINOR;
wdt->miscdev.name = "watchdog";
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
