Re: [PATCH] watchdog: omap_wdt: convert to new watchdog core
On Fri, Sep 07, 2012 at 06:51:43PM +0300, Aaro Koskinen wrote: > Thanks for the report! I'll look into this and test with other > Nokia boards. I tested the patch only with N800 and v3.6-rc4 > (4cbe5a555fa58a79b6ecbb6c531b8bab0650778d) and did not see any issues > with normal use cases (boot, watchdog open, feeding, watchdog close). > I forgot to test on another hw but will try to do in coming days. Anyway I'm happy to test your patch again if you spot something so you could cc also me for retesting. -- Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] watchdog: omap_wdt: convert to new watchdog core
On Fri, Sep 07, 2012 at 04:31:07PM +0300, Jarkko Nikula wrote: > On Tue, Sep 04, 2012 at 05:41:24PM +0300, Aaro Koskinen wrote: > > Convert omap_wdt to new watchdog core. On OMAP boards, there are usually > > multiple watchdogs. Since the new watchdog core supports multiple > > watchdogs, all watchdog drivers used on OMAP should be converted. > > > > The legacy watchdog device node is still created, so this should not > > break existing users. > > > > Signed-off-by: Aaro Koskinen > > --- > > drivers/watchdog/Kconfig|1 + > > drivers/watchdog/omap_wdt.c | 268 > > ++- > > 2 files changed, 115 insertions(+), 154 deletions(-) > > > Am I missing some extra patch but this causes a crash on top of v3.6-rc4 > commit eeea3ac? > > Crash happens in omap_wdt.c:99 on Nokia N9. Thanks for the report! I'll look into this and test with other Nokia boards. I tested the patch only with N800 and v3.6-rc4 (4cbe5a555fa58a79b6ecbb6c531b8bab0650778d) and did not see any issues with normal use cases (boot, watchdog open, feeding, watchdog close). A. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] watchdog: omap_wdt: convert to new watchdog core
Hi On Tue, Sep 04, 2012 at 05:41:24PM +0300, Aaro Koskinen wrote: > Convert omap_wdt to new watchdog core. On OMAP boards, there are usually > multiple watchdogs. Since the new watchdog core supports multiple > watchdogs, all watchdog drivers used on OMAP should be converted. > > The legacy watchdog device node is still created, so this should not > break existing users. > > Signed-off-by: Aaro Koskinen > --- > drivers/watchdog/Kconfig|1 + > drivers/watchdog/omap_wdt.c | 268 > ++- > 2 files changed, 115 insertions(+), 154 deletions(-) > Am I missing some extra patch but this causes a crash on top of v3.6-rc4 commit eeea3ac? Crash happens in omap_wdt.c:99 on Nokia N9. -- Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] watchdog: omap_wdt: convert to new watchdog core
Hi On Tue, Sep 04, 2012 at 05:41:24PM +0300, Aaro Koskinen wrote: Convert omap_wdt to new watchdog core. On OMAP boards, there are usually multiple watchdogs. Since the new watchdog core supports multiple watchdogs, all watchdog drivers used on OMAP should be converted. The legacy watchdog device node is still created, so this should not break existing users. Signed-off-by: Aaro Koskinen aaro.koski...@iki.fi --- drivers/watchdog/Kconfig|1 + drivers/watchdog/omap_wdt.c | 268 ++- 2 files changed, 115 insertions(+), 154 deletions(-) Am I missing some extra patch but this causes a crash on top of v3.6-rc4 commit eeea3ac? Crash happens in omap_wdt.c:99 on Nokia N9. -- Jarkko -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] watchdog: omap_wdt: convert to new watchdog core
On Fri, Sep 07, 2012 at 04:31:07PM +0300, Jarkko Nikula wrote: On Tue, Sep 04, 2012 at 05:41:24PM +0300, Aaro Koskinen wrote: Convert omap_wdt to new watchdog core. On OMAP boards, there are usually multiple watchdogs. Since the new watchdog core supports multiple watchdogs, all watchdog drivers used on OMAP should be converted. The legacy watchdog device node is still created, so this should not break existing users. Signed-off-by: Aaro Koskinen aaro.koski...@iki.fi --- drivers/watchdog/Kconfig|1 + drivers/watchdog/omap_wdt.c | 268 ++- 2 files changed, 115 insertions(+), 154 deletions(-) Am I missing some extra patch but this causes a crash on top of v3.6-rc4 commit eeea3ac? Crash happens in omap_wdt.c:99 on Nokia N9. Thanks for the report! I'll look into this and test with other Nokia boards. I tested the patch only with N800 and v3.6-rc4 (4cbe5a555fa58a79b6ecbb6c531b8bab0650778d) and did not see any issues with normal use cases (boot, watchdog open, feeding, watchdog close). A. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] watchdog: omap_wdt: convert to new watchdog core
On Fri, Sep 07, 2012 at 06:51:43PM +0300, Aaro Koskinen wrote: Thanks for the report! I'll look into this and test with other Nokia boards. I tested the patch only with N800 and v3.6-rc4 (4cbe5a555fa58a79b6ecbb6c531b8bab0650778d) and did not see any issues with normal use cases (boot, watchdog open, feeding, watchdog close). I forgot to test on another hw but will try to do in coming days. Anyway I'm happy to test your patch again if you spot something so you could cc also me for retesting. -- Jarkko -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] watchdog: omap_wdt: convert to new watchdog core
Convert omap_wdt to new watchdog core. On OMAP boards, there are usually
multiple watchdogs. Since the new watchdog core supports multiple
watchdogs, all watchdog drivers used on OMAP should be converted.
The legacy watchdog device node is still created, so this should not
break existing users.
Signed-off-by: Aaro Koskinen
---
drivers/watchdog/Kconfig|1 +
drivers/watchdog/omap_wdt.c | 268 ++-
2 files changed, 115 insertions(+), 154 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 0526c7a..212b566 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -232,6 +232,7 @@ config EP93XX_WATCHDOG
config OMAP_WATCHDOG
tristate "OMAP Watchdog"
depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS
+ select WATCHDOG_CORE
help
Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog.
Say 'Y'
here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430
watchdog timer.
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index fceec4f..a0c23ac 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -31,18 +31,14 @@
#include
#include
#include
-#include
#include
-#include
#include
#include
#include
#include
#include
#include
-#include
#include
-#include
#include
#include
#include
@@ -50,24 +46,20 @@
#include "omap_wdt.h"
-static struct platform_device *omap_wdt_dev;
-
static unsigned timer_margin;
module_param(timer_margin, uint, 0);
MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)");
-static unsigned int wdt_trgr_pattern = 0x1234;
-static DEFINE_SPINLOCK(wdt_lock);
-
struct omap_wdt_dev {
void __iomem*base; /* physical */
struct device *dev;
- int omap_wdt_users;
+ boolomap_wdt_users;
struct resource *mem;
- struct miscdevice omap_wdt_miscdev;
+ int wdt_trgr_pattern;
+ struct mutexlock; /* to avoid races with PM */
};
-static void omap_wdt_ping(struct omap_wdt_dev *wdev)
+static void __omap_wdt_ping(struct omap_wdt_dev *wdev)
{
void __iomem*base = wdev->base;
@@ -75,8 +67,8 @@ static void omap_wdt_ping(struct omap_wdt_dev *wdev)
while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
cpu_relax();
- wdt_trgr_pattern = ~wdt_trgr_pattern;
- __raw_writel(wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
+ wdev->wdt_trgr_pattern = ~wdev->wdt_trgr_pattern;
+ __raw_writel(wdev->wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
/* wait for posted write to complete */
while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
@@ -84,7 +76,7 @@ static void omap_wdt_ping(struct omap_wdt_dev *wdev)
/* reloaded WCRR from WLDR */
}
-static void omap_wdt_enable(struct omap_wdt_dev *wdev)
+static void __omap_wdt_enable(struct omap_wdt_dev *wdev)
{
void __iomem *base = wdev->base;
@@ -98,7 +90,7 @@ static void omap_wdt_enable(struct omap_wdt_dev *wdev)
cpu_relax();
}
-static void omap_wdt_disable(struct omap_wdt_dev *wdev)
+static void __omap_wdt_disable(struct omap_wdt_dev *wdev)
{
void __iomem *base = wdev->base;
@@ -112,18 +104,10 @@ static void omap_wdt_disable(struct omap_wdt_dev *wdev)
cpu_relax();
}
-static void omap_wdt_adjust_timeout(unsigned new_timeout)
-{
- if (new_timeout < TIMER_MARGIN_MIN)
- new_timeout = TIMER_MARGIN_DEFAULT;
- if (new_timeout > TIMER_MARGIN_MAX)
- new_timeout = TIMER_MARGIN_MAX;
- timer_margin = new_timeout;
-}
-
-static void omap_wdt_set_timeout(struct omap_wdt_dev *wdev)
+static void __omap_wdt_set_timeout(struct omap_wdt_dev *wdev,
+ unsigned int timeout)
{
- u32 pre_margin = GET_WLDR_VAL(timer_margin);
+ u32 pre_margin = GET_WLDR_VAL(timeout);
void __iomem *base = wdev->base;
/* just count up at 32 KHz */
@@ -135,16 +119,14 @@ static void omap_wdt_set_timeout(struct omap_wdt_dev
*wdev)
cpu_relax();
}
-/*
- * Allow only one task to hold it open
- */
-static int omap_wdt_open(struct inode *inode, struct file *file)
+static int omap_wdt_start(struct watchdog_device *wdog)
{
- struct omap_wdt_dev *wdev = platform_get_drvdata(omap_wdt_dev);
+ struct omap_wdt_dev *wdev = watchdog_get_drvdata(wdog);
void __iomem *base = wdev->base;
- if (test_and_set_bit(1, (unsigned long *)&(wdev->omap_wdt_users)))
- return -EBUSY;
+ mutex_lock(>lock);
+
+ wdev->omap_wdt_users = true;
pm_runtime_get_sync(wdev->dev);
@@ -156,115 +138,79 @@ static int omap_wdt_open(struct inode *inode, struct
file *file)
while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
cpu_relax();
-
[PATCH] watchdog: omap_wdt: convert to new watchdog core
Convert omap_wdt to new watchdog core. On OMAP boards, there are usually
multiple watchdogs. Since the new watchdog core supports multiple
watchdogs, all watchdog drivers used on OMAP should be converted.
The legacy watchdog device node is still created, so this should not
break existing users.
Signed-off-by: Aaro Koskinen aaro.koski...@iki.fi
---
drivers/watchdog/Kconfig|1 +
drivers/watchdog/omap_wdt.c | 268 ++-
2 files changed, 115 insertions(+), 154 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 0526c7a..212b566 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -232,6 +232,7 @@ config EP93XX_WATCHDOG
config OMAP_WATCHDOG
tristate OMAP Watchdog
depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS
+ select WATCHDOG_CORE
help
Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog.
Say 'Y'
here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430
watchdog timer.
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index fceec4f..a0c23ac 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -31,18 +31,14 @@
#include linux/module.h
#include linux/types.h
#include linux/kernel.h
-#include linux/fs.h
#include linux/mm.h
-#include linux/miscdevice.h
#include linux/watchdog.h
#include linux/reboot.h
#include linux/init.h
#include linux/err.h
#include linux/platform_device.h
#include linux/moduleparam.h
-#include linux/bitops.h
#include linux/io.h
-#include linux/uaccess.h
#include linux/slab.h
#include linux/pm_runtime.h
#include mach/hardware.h
@@ -50,24 +46,20 @@
#include omap_wdt.h
-static struct platform_device *omap_wdt_dev;
-
static unsigned timer_margin;
module_param(timer_margin, uint, 0);
MODULE_PARM_DESC(timer_margin, initial watchdog timeout (in seconds));
-static unsigned int wdt_trgr_pattern = 0x1234;
-static DEFINE_SPINLOCK(wdt_lock);
-
struct omap_wdt_dev {
void __iomem*base; /* physical */
struct device *dev;
- int omap_wdt_users;
+ boolomap_wdt_users;
struct resource *mem;
- struct miscdevice omap_wdt_miscdev;
+ int wdt_trgr_pattern;
+ struct mutexlock; /* to avoid races with PM */
};
-static void omap_wdt_ping(struct omap_wdt_dev *wdev)
+static void __omap_wdt_ping(struct omap_wdt_dev *wdev)
{
void __iomem*base = wdev-base;
@@ -75,8 +67,8 @@ static void omap_wdt_ping(struct omap_wdt_dev *wdev)
while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) 0x08)
cpu_relax();
- wdt_trgr_pattern = ~wdt_trgr_pattern;
- __raw_writel(wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
+ wdev-wdt_trgr_pattern = ~wdev-wdt_trgr_pattern;
+ __raw_writel(wdev-wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
/* wait for posted write to complete */
while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) 0x08)
@@ -84,7 +76,7 @@ static void omap_wdt_ping(struct omap_wdt_dev *wdev)
/* reloaded WCRR from WLDR */
}
-static void omap_wdt_enable(struct omap_wdt_dev *wdev)
+static void __omap_wdt_enable(struct omap_wdt_dev *wdev)
{
void __iomem *base = wdev-base;
@@ -98,7 +90,7 @@ static void omap_wdt_enable(struct omap_wdt_dev *wdev)
cpu_relax();
}
-static void omap_wdt_disable(struct omap_wdt_dev *wdev)
+static void __omap_wdt_disable(struct omap_wdt_dev *wdev)
{
void __iomem *base = wdev-base;
@@ -112,18 +104,10 @@ static void omap_wdt_disable(struct omap_wdt_dev *wdev)
cpu_relax();
}
-static void omap_wdt_adjust_timeout(unsigned new_timeout)
-{
- if (new_timeout TIMER_MARGIN_MIN)
- new_timeout = TIMER_MARGIN_DEFAULT;
- if (new_timeout TIMER_MARGIN_MAX)
- new_timeout = TIMER_MARGIN_MAX;
- timer_margin = new_timeout;
-}
-
-static void omap_wdt_set_timeout(struct omap_wdt_dev *wdev)
+static void __omap_wdt_set_timeout(struct omap_wdt_dev *wdev,
+ unsigned int timeout)
{
- u32 pre_margin = GET_WLDR_VAL(timer_margin);
+ u32 pre_margin = GET_WLDR_VAL(timeout);
void __iomem *base = wdev-base;
/* just count up at 32 KHz */
@@ -135,16 +119,14 @@ static void omap_wdt_set_timeout(struct omap_wdt_dev
*wdev)
cpu_relax();
}
-/*
- * Allow only one task to hold it open
- */
-static int omap_wdt_open(struct inode *inode, struct file *file)
+static int omap_wdt_start(struct watchdog_device *wdog)
{
- struct omap_wdt_dev *wdev = platform_get_drvdata(omap_wdt_dev);
+ struct omap_wdt_dev *wdev = watchdog_get_drvdata(wdog);
void __iomem *base = wdev-base;
- if (test_and_set_bit(1, (unsigned long *)(wdev-omap_wdt_users)))
- return -EBUSY;
+ mutex_lock(wdev-lock);
+
+
