Re: [PATCH 3/3] watchdog: Add Congatec CGEB watchdog driver
On Wed, Apr 03, 2013 at 08:30:00AM -0700, Guenter Roeck wrote: > On Wed, Apr 03, 2013 at 05:09:52PM +0200, Sascha Hauer wrote: > [ ... ] > > > > > > > On a side note, if the driver supports devicetree, it might make sense to > > > call > > > watchdog_init_timeout, since it initializes the timeout from devicetree > > > data. > > > > The driver does not support devicetree. > > > I should have said "the system". Calling watchdog_init_timeout is the only > thing > a watchdog driver has to do to support devicetree. The system does not use devicetrees. I'm very familiar with devicetrees on ARM, but I have never seen a x86 system with devicetree support (although I know they exist) Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- 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 3/3] watchdog: Add Congatec CGEB watchdog driver
On Wed, Apr 03, 2013 at 05:09:52PM +0200, Sascha Hauer wrote: [ ... ] > > > > On a side note, if the driver supports devicetree, it might make sense to > > call > > watchdog_init_timeout, since it initializes the timeout from devicetree > > data. > > The driver does not support devicetree. > I should have said "the system". Calling watchdog_init_timeout is the only thing a watchdog driver has to do to support devicetree. Thanks, Guenter -- 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 3/3] watchdog: Add Congatec CGEB watchdog driver
On Tue, Mar 26, 2013 at 07:33:31AM -0700, Guenter Roeck wrote:
> On Tue, Mar 26, 2013 at 11:16:35AM +0100, Christian Gmeiner wrote:
> > 2013/2/12 Sascha Hauer :
> > > This driver provides support for the CGEB watchdog found on some
> > > Congatec x86 modules.
> > >
> > > Signed-off-by: Sascha Hauer
> > > ---
> > > drivers/watchdog/Kconfig | 10 ++
> > > drivers/watchdog/Makefile |1 +
> > > drivers/watchdog/congatec_cgeb_watchdog.c | 161
> > > +
> > > 3 files changed, 172 insertions(+)
> > > create mode 100644 drivers/watchdog/congatec_cgeb_watchdog.c
> > >
> > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > > index 7f809fd..47138fb 100644
> > > --- a/drivers/watchdog/Kconfig
> > > +++ b/drivers/watchdog/Kconfig
> > > @@ -934,6 +934,16 @@ config SBC_EPX_C3_WATCHDOG
> > > To compile this driver as a module, choose M here: the
> > > module will be called sbc_epx_c3.
> > >
> > > +config CONGATEC_CGEB_WATCHDOG
> > > + depends on CONGATEC_CGEB
> > > + tristate "Congatec CGEB watchdog"
> > > + ---help---
> > > + This driver provides support for the watchdogs found on Congatec
> > > + modules with the CGEB BIOS interface.
> > > +
> > > + To compile this driver as a module, choose M here: the
> > > + module will be called congatec_cgeb_wdt.
> > > +
> > > # M32R Architecture
> > >
> > > # M68K Architecture
> > > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > > index 97bbdb3a..e67eee5 100644
> > > --- a/drivers/watchdog/Makefile
> > > +++ b/drivers/watchdog/Makefile
> > > @@ -108,6 +108,7 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
> > > obj-$(CONFIG_MACHZ_WDT) += machzwd.o
> > > obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
> > > obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
> > > +obj-$(CONFIG_CONGATEC_CGEB_WATCHDOG) += congatec_cgeb_watchdog.o
> > >
> > > # M32R Architecture
> > >
> > > diff --git a/drivers/watchdog/congatec_cgeb_watchdog.c
> > > b/drivers/watchdog/congatec_cgeb_watchdog.c
> > > new file mode 100644
> > > index 000..b7b6cf5
> > > --- /dev/null
> > > +++ b/drivers/watchdog/congatec_cgeb_watchdog.c
> > > @@ -0,0 +1,161 @@
> > > +/*
> > > + * CGEB watchdog driver
> > > + *
> > > + * (c) 2011 Sascha Hauer, Pengutronix
> > > + *
> > > + * This program is free software; you can redistribute it and/or modify
> > > + * it under the terms of the GNU General Public License as published by
> > > + * the Free Software Foundation; version 2 of the License.
> > > + *
> > > + * 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.
> > > + */
> > > +#include
> > > +#include
> > > +#include
> > > +#include
> > > +
> > > +#define CGOS_WDOG_MODE_REBOOT_PC0
> > > +#define CGOS_WDOG_MODE_RESTART_OS 1
> > > +#define CGOS_WDOG_MODE_STAGED0x80
> > > +
> > > +#define CGOS_WDOG_OPMODE_DISABLED 0
> > > +#define CGOS_WDOG_OPMODE_ONETIME_TRIG 1
> > > +#define CGOS_WDOG_OPMODE_SINGLE_EVENT 2
> > > +#define CGOS_WDOG_OPMODE_EVENT_REPEAT 3
> > > +
> > > +#define CGOS_WDOG_EVENT_INT 0 /* NMI/IRQ */
> > > +#define CGOS_WDOG_EVENT_SCI 1 /* SMI/SCI */
> > > +#define CGOS_WDOG_EVENT_RST 2 /* system reset */
> > > +#define CGOS_WDOG_EVENT_BTN 3 /* power button */
> > > +
> > > +#define CGOS_WDOG_EVENT_MAX_STAGES 3
> > > +
> > > +struct cgeb_watchdog_stage {
> > > + unsigned long timeout;
> > > + unsigned long event;
> > > +};
> > > +
> > > +struct cgeb_watchdog_config {
> > > + unsigned long size;
> > > + unsigned long timeout; /* not used in staged mode */
> > > + unsigned long delay;
> > > + unsigned long mode;
> > > + /* optional parameters for staged watchdog */
> > > + unsigned long op_mode;
> > > + unsigned long stage_count;
> > > + struct cgeb_watchdog_stage stages[CGOS_WDOG_EVENT_MAX_STAGES];
> > > +};
>
> Presumably that is a data structure sent to the board. Just wondering - can
> the
> driver ever be build as 64 bit driver ? If so, you might want to use u32
> instead
> of unsigned long.
I don't think that this is used on any 64bit capable hardware. Anyway,
explicitly using u32 here sounds very good. I'll change it.
> > > +static int cgeb_watchdog_start(struct watchdog_device *wdd)
> > > +{
> > > + struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
> > > +
> > > + return watchdog_set_config(priv, wdd->timeout);
> > > +}
> > > +
> > > +static int cgeb_watchdog_stop(struct watchdog_device *wdd)
> > > +{
> > > + struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
> > > +
> > > + return watchdog_set_config(priv, 0);
> > > +}
> > > +
> > > +static int
Re: [PATCH 3/3] watchdog: Add Congatec CGEB watchdog driver
On Tue, Mar 26, 2013 at 11:16:35AM +0100, Christian Gmeiner wrote: > 2013/2/12 Sascha Hauer : > > -- > > There seems to be a problem: > > Mar 26 16:11:25 OT kernel: [ 80.207514] cgeb-watchdog > cgeb-watchdog.0: registered > Mar 26 16:11:38 OT watchdog[2519]: stopping daemon (5.9) > Mar 26 16:11:43 OT watchdog[2750]: starting daemon (5.9): > Mar 26 16:11:43 OT watchdog[2750]: int=1s realtime=yes sync=no soft=no > mla=0 mem=0 > Mar 26 16:11:43 OT watchdog[2750]: ping: no machine to check > Mar 26 16:11:43 OT watchdog[2750]: file: no file to check > Mar 26 16:11:43 OT watchdog[2750]: pidfile: no server process to check > Mar 26 16:11:43 OT watchdog[2750]: interface: no interface to check > Mar 26 16:11:43 OT watchdog[2750]: test=none(0) repair=none(0) > alive=/dev/watchdog heartbeat=none temp=none to=root no_act=no > Mar 26 16:11:43 OT watchdog[2750]: cannot set timeout 60 (errno = 95 = > 'Operation not supported') As mentioned in my other mail the watchdog core no longer sets wdd->timeout which results in the above message. Should be fixed with the next version. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- 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 3/3] watchdog: Add Congatec CGEB watchdog driver
On Tue, Mar 26, 2013 at 11:16:35AM +0100, Christian Gmeiner wrote: 2013/2/12 Sascha Hauer s.ha...@pengutronix.de: -- There seems to be a problem: Mar 26 16:11:25 OT kernel: [ 80.207514] cgeb-watchdog cgeb-watchdog.0: registered Mar 26 16:11:38 OT watchdog[2519]: stopping daemon (5.9) Mar 26 16:11:43 OT watchdog[2750]: starting daemon (5.9): Mar 26 16:11:43 OT watchdog[2750]: int=1s realtime=yes sync=no soft=no mla=0 mem=0 Mar 26 16:11:43 OT watchdog[2750]: ping: no machine to check Mar 26 16:11:43 OT watchdog[2750]: file: no file to check Mar 26 16:11:43 OT watchdog[2750]: pidfile: no server process to check Mar 26 16:11:43 OT watchdog[2750]: interface: no interface to check Mar 26 16:11:43 OT watchdog[2750]: test=none(0) repair=none(0) alive=/dev/watchdog heartbeat=none temp=none to=root no_act=no Mar 26 16:11:43 OT watchdog[2750]: cannot set timeout 60 (errno = 95 = 'Operation not supported') As mentioned in my other mail the watchdog core no longer sets wdd-timeout which results in the above message. Should be fixed with the next version. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- 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 3/3] watchdog: Add Congatec CGEB watchdog driver
On Tue, Mar 26, 2013 at 07:33:31AM -0700, Guenter Roeck wrote:
On Tue, Mar 26, 2013 at 11:16:35AM +0100, Christian Gmeiner wrote:
2013/2/12 Sascha Hauer s.ha...@pengutronix.de:
This driver provides support for the CGEB watchdog found on some
Congatec x86 modules.
Signed-off-by: Sascha Hauer s.ha...@pengutronix.de
---
drivers/watchdog/Kconfig | 10 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/congatec_cgeb_watchdog.c | 161
+
3 files changed, 172 insertions(+)
create mode 100644 drivers/watchdog/congatec_cgeb_watchdog.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 7f809fd..47138fb 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -934,6 +934,16 @@ config SBC_EPX_C3_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called sbc_epx_c3.
+config CONGATEC_CGEB_WATCHDOG
+ depends on CONGATEC_CGEB
+ tristate Congatec CGEB watchdog
+ ---help---
+ This driver provides support for the watchdogs found on Congatec
+ modules with the CGEB BIOS interface.
+
+ To compile this driver as a module, choose M here: the
+ module will be called congatec_cgeb_wdt.
+
# M32R Architecture
# M68K Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 97bbdb3a..e67eee5 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
+obj-$(CONFIG_CONGATEC_CGEB_WATCHDOG) += congatec_cgeb_watchdog.o
# M32R Architecture
diff --git a/drivers/watchdog/congatec_cgeb_watchdog.c
b/drivers/watchdog/congatec_cgeb_watchdog.c
new file mode 100644
index 000..b7b6cf5
--- /dev/null
+++ b/drivers/watchdog/congatec_cgeb_watchdog.c
@@ -0,0 +1,161 @@
+/*
+ * CGEB watchdog driver
+ *
+ * (c) 2011 Sascha Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ */
+#include linux/module.h
+#include linux/platform_device.h
+#include linux/watchdog.h
+#include asm/congatec-cgeb.h
+
+#define CGOS_WDOG_MODE_REBOOT_PC0
+#define CGOS_WDOG_MODE_RESTART_OS 1
+#define CGOS_WDOG_MODE_STAGED0x80
+
+#define CGOS_WDOG_OPMODE_DISABLED 0
+#define CGOS_WDOG_OPMODE_ONETIME_TRIG 1
+#define CGOS_WDOG_OPMODE_SINGLE_EVENT 2
+#define CGOS_WDOG_OPMODE_EVENT_REPEAT 3
+
+#define CGOS_WDOG_EVENT_INT 0 /* NMI/IRQ */
+#define CGOS_WDOG_EVENT_SCI 1 /* SMI/SCI */
+#define CGOS_WDOG_EVENT_RST 2 /* system reset */
+#define CGOS_WDOG_EVENT_BTN 3 /* power button */
+
+#define CGOS_WDOG_EVENT_MAX_STAGES 3
+
+struct cgeb_watchdog_stage {
+ unsigned long timeout;
+ unsigned long event;
+};
+
+struct cgeb_watchdog_config {
+ unsigned long size;
+ unsigned long timeout; /* not used in staged mode */
+ unsigned long delay;
+ unsigned long mode;
+ /* optional parameters for staged watchdog */
+ unsigned long op_mode;
+ unsigned long stage_count;
+ struct cgeb_watchdog_stage stages[CGOS_WDOG_EVENT_MAX_STAGES];
+};
Presumably that is a data structure sent to the board. Just wondering - can
the
driver ever be build as 64 bit driver ? If so, you might want to use u32
instead
of unsigned long.
I don't think that this is used on any 64bit capable hardware. Anyway,
explicitly using u32 here sounds very good. I'll change it.
+static int cgeb_watchdog_start(struct watchdog_device *wdd)
+{
+ struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
+
+ return watchdog_set_config(priv, wdd-timeout);
+}
+
+static int cgeb_watchdog_stop(struct watchdog_device *wdd)
+{
+ struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
+
+ return watchdog_set_config(priv, 0);
+}
+
+static int cgeb_watchdog_set_timeout(struct watchdog_device *wdd,
+ unsigned int timeout_s)
+{
+ return 0;
+}
That doesn't make any sense - it means wdd-timeout is never set. That also
means it is never started.
Yeah, I just realized that since
Re: [PATCH 3/3] watchdog: Add Congatec CGEB watchdog driver
On Wed, Apr 03, 2013 at 05:09:52PM +0200, Sascha Hauer wrote: [ ... ] On a side note, if the driver supports devicetree, it might make sense to call watchdog_init_timeout, since it initializes the timeout from devicetree data. The driver does not support devicetree. I should have said the system. Calling watchdog_init_timeout is the only thing a watchdog driver has to do to support devicetree. Thanks, Guenter -- 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 3/3] watchdog: Add Congatec CGEB watchdog driver
On Wed, Apr 03, 2013 at 08:30:00AM -0700, Guenter Roeck wrote: On Wed, Apr 03, 2013 at 05:09:52PM +0200, Sascha Hauer wrote: [ ... ] On a side note, if the driver supports devicetree, it might make sense to call watchdog_init_timeout, since it initializes the timeout from devicetree data. The driver does not support devicetree. I should have said the system. Calling watchdog_init_timeout is the only thing a watchdog driver has to do to support devicetree. The system does not use devicetrees. I'm very familiar with devicetrees on ARM, but I have never seen a x86 system with devicetree support (although I know they exist) Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- 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 3/3] watchdog: Add Congatec CGEB watchdog driver
On Tue, Mar 26, 2013 at 11:16:35AM +0100, Christian Gmeiner wrote:
> 2013/2/12 Sascha Hauer :
> > This driver provides support for the CGEB watchdog found on some
> > Congatec x86 modules.
> >
> > Signed-off-by: Sascha Hauer
> > ---
> > drivers/watchdog/Kconfig | 10 ++
> > drivers/watchdog/Makefile |1 +
> > drivers/watchdog/congatec_cgeb_watchdog.c | 161
> > +
> > 3 files changed, 172 insertions(+)
> > create mode 100644 drivers/watchdog/congatec_cgeb_watchdog.c
> >
> > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > index 7f809fd..47138fb 100644
> > --- a/drivers/watchdog/Kconfig
> > +++ b/drivers/watchdog/Kconfig
> > @@ -934,6 +934,16 @@ config SBC_EPX_C3_WATCHDOG
> > To compile this driver as a module, choose M here: the
> > module will be called sbc_epx_c3.
> >
> > +config CONGATEC_CGEB_WATCHDOG
> > + depends on CONGATEC_CGEB
> > + tristate "Congatec CGEB watchdog"
> > + ---help---
> > + This driver provides support for the watchdogs found on Congatec
> > + modules with the CGEB BIOS interface.
> > +
> > + To compile this driver as a module, choose M here: the
> > + module will be called congatec_cgeb_wdt.
> > +
> > # M32R Architecture
> >
> > # M68K Architecture
> > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > index 97bbdb3a..e67eee5 100644
> > --- a/drivers/watchdog/Makefile
> > +++ b/drivers/watchdog/Makefile
> > @@ -108,6 +108,7 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
> > obj-$(CONFIG_MACHZ_WDT) += machzwd.o
> > obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
> > obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
> > +obj-$(CONFIG_CONGATEC_CGEB_WATCHDOG) += congatec_cgeb_watchdog.o
> >
> > # M32R Architecture
> >
> > diff --git a/drivers/watchdog/congatec_cgeb_watchdog.c
> > b/drivers/watchdog/congatec_cgeb_watchdog.c
> > new file mode 100644
> > index 000..b7b6cf5
> > --- /dev/null
> > +++ b/drivers/watchdog/congatec_cgeb_watchdog.c
> > @@ -0,0 +1,161 @@
> > +/*
> > + * CGEB watchdog driver
> > + *
> > + * (c) 2011 Sascha Hauer, Pengutronix
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; version 2 of the License.
> > + *
> > + * 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.
> > + */
> > +#include
> > +#include
> > +#include
> > +#include
> > +
> > +#define CGOS_WDOG_MODE_REBOOT_PC0
> > +#define CGOS_WDOG_MODE_RESTART_OS 1
> > +#define CGOS_WDOG_MODE_STAGED0x80
> > +
> > +#define CGOS_WDOG_OPMODE_DISABLED 0
> > +#define CGOS_WDOG_OPMODE_ONETIME_TRIG 1
> > +#define CGOS_WDOG_OPMODE_SINGLE_EVENT 2
> > +#define CGOS_WDOG_OPMODE_EVENT_REPEAT 3
> > +
> > +#define CGOS_WDOG_EVENT_INT 0 /* NMI/IRQ */
> > +#define CGOS_WDOG_EVENT_SCI 1 /* SMI/SCI */
> > +#define CGOS_WDOG_EVENT_RST 2 /* system reset */
> > +#define CGOS_WDOG_EVENT_BTN 3 /* power button */
> > +
> > +#define CGOS_WDOG_EVENT_MAX_STAGES 3
> > +
> > +struct cgeb_watchdog_stage {
> > + unsigned long timeout;
> > + unsigned long event;
> > +};
> > +
> > +struct cgeb_watchdog_config {
> > + unsigned long size;
> > + unsigned long timeout; /* not used in staged mode */
> > + unsigned long delay;
> > + unsigned long mode;
> > + /* optional parameters for staged watchdog */
> > + unsigned long op_mode;
> > + unsigned long stage_count;
> > + struct cgeb_watchdog_stage stages[CGOS_WDOG_EVENT_MAX_STAGES];
> > +};
Presumably that is a data structure sent to the board. Just wondering - can the
driver ever be build as 64 bit driver ? If so, you might want to use u32 instead
of unsigned long.
> > +
> > +struct cgeb_watchdog_priv {
> > + struct cgeb_board_data *board;
> > + struct watchdog_device wdd;
> > + int unit;
> > +};
> > +
> > +static struct watchdog_info cgeb_wdd_info = {
> > + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
> > + .firmware_version = 0,
> > + .identity = "cgeb watchdog",
> > +};
> > +
> > +static unsigned int watchdog_set_config(struct cgeb_watchdog_priv *priv,
> > + unsigned int timeout_s)
> > +{
> > + struct cgeb_board_data *board = priv->board;
> > + struct cgeb_watchdog_config wdi;
> > + struct cgeb_function_parameters fps;
> > +
> > + memset(, 0, sizeof(wdi));
> > + memset(, 0, sizeof(fps));
> > +
> > + fps.unit = priv->unit;
> > + fps.iptr =
> > +
> > + wdi.timeout = timeout_s * 1000;
> > + wdi.delay = 0;
> > + wdi.size = sizeof(wdi);
> > + wdi.mode
Re: [PATCH 3/3] watchdog: Add Congatec CGEB watchdog driver
2013/2/12 Sascha Hauer :
> This driver provides support for the CGEB watchdog found on some
> Congatec x86 modules.
>
> Signed-off-by: Sascha Hauer
> ---
> drivers/watchdog/Kconfig | 10 ++
> drivers/watchdog/Makefile |1 +
> drivers/watchdog/congatec_cgeb_watchdog.c | 161
> +
> 3 files changed, 172 insertions(+)
> create mode 100644 drivers/watchdog/congatec_cgeb_watchdog.c
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 7f809fd..47138fb 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -934,6 +934,16 @@ config SBC_EPX_C3_WATCHDOG
> To compile this driver as a module, choose M here: the
> module will be called sbc_epx_c3.
>
> +config CONGATEC_CGEB_WATCHDOG
> + depends on CONGATEC_CGEB
> + tristate "Congatec CGEB watchdog"
> + ---help---
> + This driver provides support for the watchdogs found on Congatec
> + modules with the CGEB BIOS interface.
> +
> + To compile this driver as a module, choose M here: the
> + module will be called congatec_cgeb_wdt.
> +
> # M32R Architecture
>
> # M68K Architecture
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 97bbdb3a..e67eee5 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -108,6 +108,7 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
> obj-$(CONFIG_MACHZ_WDT) += machzwd.o
> obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
> obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
> +obj-$(CONFIG_CONGATEC_CGEB_WATCHDOG) += congatec_cgeb_watchdog.o
>
> # M32R Architecture
>
> diff --git a/drivers/watchdog/congatec_cgeb_watchdog.c
> b/drivers/watchdog/congatec_cgeb_watchdog.c
> new file mode 100644
> index 000..b7b6cf5
> --- /dev/null
> +++ b/drivers/watchdog/congatec_cgeb_watchdog.c
> @@ -0,0 +1,161 @@
> +/*
> + * CGEB watchdog driver
> + *
> + * (c) 2011 Sascha Hauer, Pengutronix
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + *
> + * 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.
> + */
> +#include
> +#include
> +#include
> +#include
> +
> +#define CGOS_WDOG_MODE_REBOOT_PC0
> +#define CGOS_WDOG_MODE_RESTART_OS 1
> +#define CGOS_WDOG_MODE_STAGED0x80
> +
> +#define CGOS_WDOG_OPMODE_DISABLED 0
> +#define CGOS_WDOG_OPMODE_ONETIME_TRIG 1
> +#define CGOS_WDOG_OPMODE_SINGLE_EVENT 2
> +#define CGOS_WDOG_OPMODE_EVENT_REPEAT 3
> +
> +#define CGOS_WDOG_EVENT_INT 0 /* NMI/IRQ */
> +#define CGOS_WDOG_EVENT_SCI 1 /* SMI/SCI */
> +#define CGOS_WDOG_EVENT_RST 2 /* system reset */
> +#define CGOS_WDOG_EVENT_BTN 3 /* power button */
> +
> +#define CGOS_WDOG_EVENT_MAX_STAGES 3
> +
> +struct cgeb_watchdog_stage {
> + unsigned long timeout;
> + unsigned long event;
> +};
> +
> +struct cgeb_watchdog_config {
> + unsigned long size;
> + unsigned long timeout; /* not used in staged mode */
> + unsigned long delay;
> + unsigned long mode;
> + /* optional parameters for staged watchdog */
> + unsigned long op_mode;
> + unsigned long stage_count;
> + struct cgeb_watchdog_stage stages[CGOS_WDOG_EVENT_MAX_STAGES];
> +};
> +
> +struct cgeb_watchdog_priv {
> + struct cgeb_board_data *board;
> + struct watchdog_device wdd;
> + int unit;
> +};
> +
> +static struct watchdog_info cgeb_wdd_info = {
> + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
> + .firmware_version = 0,
> + .identity = "cgeb watchdog",
> +};
> +
> +static unsigned int watchdog_set_config(struct cgeb_watchdog_priv *priv,
> + unsigned int timeout_s)
> +{
> + struct cgeb_board_data *board = priv->board;
> + struct cgeb_watchdog_config wdi;
> + struct cgeb_function_parameters fps;
> +
> + memset(, 0, sizeof(wdi));
> + memset(, 0, sizeof(fps));
> +
> + fps.unit = priv->unit;
> + fps.iptr =
> +
> + wdi.timeout = timeout_s * 1000;
> + wdi.delay = 0;
> + wdi.size = sizeof(wdi);
> + wdi.mode = CGOS_WDOG_MODE_REBOOT_PC;
> +
> + return cgeb_call(board, , CgebWDogSetConfig);
> +}
> +
> +static int cgeb_watchdog_start(struct watchdog_device *wdd)
> +{
> + struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
> +
> + return watchdog_set_config(priv, wdd->timeout);
> +}
> +
> +static int cgeb_watchdog_stop(struct watchdog_device *wdd)
> +{
> + struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
> +
> + return watchdog_set_config(priv, 0);
> +}
> +
>
Re: [PATCH 3/3] watchdog: Add Congatec CGEB watchdog driver
2013/2/12 Sascha Hauer s.ha...@pengutronix.de:
This driver provides support for the CGEB watchdog found on some
Congatec x86 modules.
Signed-off-by: Sascha Hauer s.ha...@pengutronix.de
---
drivers/watchdog/Kconfig | 10 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/congatec_cgeb_watchdog.c | 161
+
3 files changed, 172 insertions(+)
create mode 100644 drivers/watchdog/congatec_cgeb_watchdog.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 7f809fd..47138fb 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -934,6 +934,16 @@ config SBC_EPX_C3_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called sbc_epx_c3.
+config CONGATEC_CGEB_WATCHDOG
+ depends on CONGATEC_CGEB
+ tristate Congatec CGEB watchdog
+ ---help---
+ This driver provides support for the watchdogs found on Congatec
+ modules with the CGEB BIOS interface.
+
+ To compile this driver as a module, choose M here: the
+ module will be called congatec_cgeb_wdt.
+
# M32R Architecture
# M68K Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 97bbdb3a..e67eee5 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
+obj-$(CONFIG_CONGATEC_CGEB_WATCHDOG) += congatec_cgeb_watchdog.o
# M32R Architecture
diff --git a/drivers/watchdog/congatec_cgeb_watchdog.c
b/drivers/watchdog/congatec_cgeb_watchdog.c
new file mode 100644
index 000..b7b6cf5
--- /dev/null
+++ b/drivers/watchdog/congatec_cgeb_watchdog.c
@@ -0,0 +1,161 @@
+/*
+ * CGEB watchdog driver
+ *
+ * (c) 2011 Sascha Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ */
+#include linux/module.h
+#include linux/platform_device.h
+#include linux/watchdog.h
+#include asm/congatec-cgeb.h
+
+#define CGOS_WDOG_MODE_REBOOT_PC0
+#define CGOS_WDOG_MODE_RESTART_OS 1
+#define CGOS_WDOG_MODE_STAGED0x80
+
+#define CGOS_WDOG_OPMODE_DISABLED 0
+#define CGOS_WDOG_OPMODE_ONETIME_TRIG 1
+#define CGOS_WDOG_OPMODE_SINGLE_EVENT 2
+#define CGOS_WDOG_OPMODE_EVENT_REPEAT 3
+
+#define CGOS_WDOG_EVENT_INT 0 /* NMI/IRQ */
+#define CGOS_WDOG_EVENT_SCI 1 /* SMI/SCI */
+#define CGOS_WDOG_EVENT_RST 2 /* system reset */
+#define CGOS_WDOG_EVENT_BTN 3 /* power button */
+
+#define CGOS_WDOG_EVENT_MAX_STAGES 3
+
+struct cgeb_watchdog_stage {
+ unsigned long timeout;
+ unsigned long event;
+};
+
+struct cgeb_watchdog_config {
+ unsigned long size;
+ unsigned long timeout; /* not used in staged mode */
+ unsigned long delay;
+ unsigned long mode;
+ /* optional parameters for staged watchdog */
+ unsigned long op_mode;
+ unsigned long stage_count;
+ struct cgeb_watchdog_stage stages[CGOS_WDOG_EVENT_MAX_STAGES];
+};
+
+struct cgeb_watchdog_priv {
+ struct cgeb_board_data *board;
+ struct watchdog_device wdd;
+ int unit;
+};
+
+static struct watchdog_info cgeb_wdd_info = {
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+ .firmware_version = 0,
+ .identity = cgeb watchdog,
+};
+
+static unsigned int watchdog_set_config(struct cgeb_watchdog_priv *priv,
+ unsigned int timeout_s)
+{
+ struct cgeb_board_data *board = priv-board;
+ struct cgeb_watchdog_config wdi;
+ struct cgeb_function_parameters fps;
+
+ memset(wdi, 0, sizeof(wdi));
+ memset(fps, 0, sizeof(fps));
+
+ fps.unit = priv-unit;
+ fps.iptr = wdi;
+
+ wdi.timeout = timeout_s * 1000;
+ wdi.delay = 0;
+ wdi.size = sizeof(wdi);
+ wdi.mode = CGOS_WDOG_MODE_REBOOT_PC;
+
+ return cgeb_call(board, fps, CgebWDogSetConfig);
+}
+
+static int cgeb_watchdog_start(struct watchdog_device *wdd)
+{
+ struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
+
+ return watchdog_set_config(priv, wdd-timeout);
+}
+
+static int cgeb_watchdog_stop(struct watchdog_device *wdd)
+{
+ struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
+
+ return watchdog_set_config(priv, 0);
+}
+
+static int
Re: [PATCH 3/3] watchdog: Add Congatec CGEB watchdog driver
On Tue, Mar 26, 2013 at 11:16:35AM +0100, Christian Gmeiner wrote:
2013/2/12 Sascha Hauer s.ha...@pengutronix.de:
This driver provides support for the CGEB watchdog found on some
Congatec x86 modules.
Signed-off-by: Sascha Hauer s.ha...@pengutronix.de
---
drivers/watchdog/Kconfig | 10 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/congatec_cgeb_watchdog.c | 161
+
3 files changed, 172 insertions(+)
create mode 100644 drivers/watchdog/congatec_cgeb_watchdog.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 7f809fd..47138fb 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -934,6 +934,16 @@ config SBC_EPX_C3_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called sbc_epx_c3.
+config CONGATEC_CGEB_WATCHDOG
+ depends on CONGATEC_CGEB
+ tristate Congatec CGEB watchdog
+ ---help---
+ This driver provides support for the watchdogs found on Congatec
+ modules with the CGEB BIOS interface.
+
+ To compile this driver as a module, choose M here: the
+ module will be called congatec_cgeb_wdt.
+
# M32R Architecture
# M68K Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 97bbdb3a..e67eee5 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
+obj-$(CONFIG_CONGATEC_CGEB_WATCHDOG) += congatec_cgeb_watchdog.o
# M32R Architecture
diff --git a/drivers/watchdog/congatec_cgeb_watchdog.c
b/drivers/watchdog/congatec_cgeb_watchdog.c
new file mode 100644
index 000..b7b6cf5
--- /dev/null
+++ b/drivers/watchdog/congatec_cgeb_watchdog.c
@@ -0,0 +1,161 @@
+/*
+ * CGEB watchdog driver
+ *
+ * (c) 2011 Sascha Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ */
+#include linux/module.h
+#include linux/platform_device.h
+#include linux/watchdog.h
+#include asm/congatec-cgeb.h
+
+#define CGOS_WDOG_MODE_REBOOT_PC0
+#define CGOS_WDOG_MODE_RESTART_OS 1
+#define CGOS_WDOG_MODE_STAGED0x80
+
+#define CGOS_WDOG_OPMODE_DISABLED 0
+#define CGOS_WDOG_OPMODE_ONETIME_TRIG 1
+#define CGOS_WDOG_OPMODE_SINGLE_EVENT 2
+#define CGOS_WDOG_OPMODE_EVENT_REPEAT 3
+
+#define CGOS_WDOG_EVENT_INT 0 /* NMI/IRQ */
+#define CGOS_WDOG_EVENT_SCI 1 /* SMI/SCI */
+#define CGOS_WDOG_EVENT_RST 2 /* system reset */
+#define CGOS_WDOG_EVENT_BTN 3 /* power button */
+
+#define CGOS_WDOG_EVENT_MAX_STAGES 3
+
+struct cgeb_watchdog_stage {
+ unsigned long timeout;
+ unsigned long event;
+};
+
+struct cgeb_watchdog_config {
+ unsigned long size;
+ unsigned long timeout; /* not used in staged mode */
+ unsigned long delay;
+ unsigned long mode;
+ /* optional parameters for staged watchdog */
+ unsigned long op_mode;
+ unsigned long stage_count;
+ struct cgeb_watchdog_stage stages[CGOS_WDOG_EVENT_MAX_STAGES];
+};
Presumably that is a data structure sent to the board. Just wondering - can the
driver ever be build as 64 bit driver ? If so, you might want to use u32 instead
of unsigned long.
+
+struct cgeb_watchdog_priv {
+ struct cgeb_board_data *board;
+ struct watchdog_device wdd;
+ int unit;
+};
+
+static struct watchdog_info cgeb_wdd_info = {
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+ .firmware_version = 0,
+ .identity = cgeb watchdog,
+};
+
+static unsigned int watchdog_set_config(struct cgeb_watchdog_priv *priv,
+ unsigned int timeout_s)
+{
+ struct cgeb_board_data *board = priv-board;
+ struct cgeb_watchdog_config wdi;
+ struct cgeb_function_parameters fps;
+
+ memset(wdi, 0, sizeof(wdi));
+ memset(fps, 0, sizeof(fps));
+
+ fps.unit = priv-unit;
+ fps.iptr = wdi;
+
+ wdi.timeout = timeout_s * 1000;
+ wdi.delay = 0;
+ wdi.size = sizeof(wdi);
+ wdi.mode = CGOS_WDOG_MODE_REBOOT_PC;
+
+ return cgeb_call(board, fps, CgebWDogSetConfig);
+}
+
+static int cgeb_watchdog_start(struct
[PATCH 3/3] watchdog: Add Congatec CGEB watchdog driver
This driver provides support for the CGEB watchdog found on some
Congatec x86 modules.
Signed-off-by: Sascha Hauer
---
drivers/watchdog/Kconfig | 10 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/congatec_cgeb_watchdog.c | 161 +
3 files changed, 172 insertions(+)
create mode 100644 drivers/watchdog/congatec_cgeb_watchdog.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 7f809fd..47138fb 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -934,6 +934,16 @@ config SBC_EPX_C3_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called sbc_epx_c3.
+config CONGATEC_CGEB_WATCHDOG
+ depends on CONGATEC_CGEB
+ tristate "Congatec CGEB watchdog"
+ ---help---
+ This driver provides support for the watchdogs found on Congatec
+ modules with the CGEB BIOS interface.
+
+ To compile this driver as a module, choose M here: the
+ module will be called congatec_cgeb_wdt.
+
# M32R Architecture
# M68K Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 97bbdb3a..e67eee5 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
+obj-$(CONFIG_CONGATEC_CGEB_WATCHDOG) += congatec_cgeb_watchdog.o
# M32R Architecture
diff --git a/drivers/watchdog/congatec_cgeb_watchdog.c
b/drivers/watchdog/congatec_cgeb_watchdog.c
new file mode 100644
index 000..b7b6cf5
--- /dev/null
+++ b/drivers/watchdog/congatec_cgeb_watchdog.c
@@ -0,0 +1,161 @@
+/*
+ * CGEB watchdog driver
+ *
+ * (c) 2011 Sascha Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ */
+#include
+#include
+#include
+#include
+
+#define CGOS_WDOG_MODE_REBOOT_PC0
+#define CGOS_WDOG_MODE_RESTART_OS 1
+#define CGOS_WDOG_MODE_STAGED0x80
+
+#define CGOS_WDOG_OPMODE_DISABLED 0
+#define CGOS_WDOG_OPMODE_ONETIME_TRIG 1
+#define CGOS_WDOG_OPMODE_SINGLE_EVENT 2
+#define CGOS_WDOG_OPMODE_EVENT_REPEAT 3
+
+#define CGOS_WDOG_EVENT_INT 0 /* NMI/IRQ */
+#define CGOS_WDOG_EVENT_SCI 1 /* SMI/SCI */
+#define CGOS_WDOG_EVENT_RST 2 /* system reset */
+#define CGOS_WDOG_EVENT_BTN 3 /* power button */
+
+#define CGOS_WDOG_EVENT_MAX_STAGES 3
+
+struct cgeb_watchdog_stage {
+ unsigned long timeout;
+ unsigned long event;
+};
+
+struct cgeb_watchdog_config {
+ unsigned long size;
+ unsigned long timeout; /* not used in staged mode */
+ unsigned long delay;
+ unsigned long mode;
+ /* optional parameters for staged watchdog */
+ unsigned long op_mode;
+ unsigned long stage_count;
+ struct cgeb_watchdog_stage stages[CGOS_WDOG_EVENT_MAX_STAGES];
+};
+
+struct cgeb_watchdog_priv {
+ struct cgeb_board_data *board;
+ struct watchdog_device wdd;
+ int unit;
+};
+
+static struct watchdog_info cgeb_wdd_info = {
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+ .firmware_version = 0,
+ .identity = "cgeb watchdog",
+};
+
+static unsigned int watchdog_set_config(struct cgeb_watchdog_priv *priv,
+ unsigned int timeout_s)
+{
+ struct cgeb_board_data *board = priv->board;
+ struct cgeb_watchdog_config wdi;
+ struct cgeb_function_parameters fps;
+
+ memset(, 0, sizeof(wdi));
+ memset(, 0, sizeof(fps));
+
+ fps.unit = priv->unit;
+ fps.iptr =
+
+ wdi.timeout = timeout_s * 1000;
+ wdi.delay = 0;
+ wdi.size = sizeof(wdi);
+ wdi.mode = CGOS_WDOG_MODE_REBOOT_PC;
+
+ return cgeb_call(board, , CgebWDogSetConfig);
+}
+
+static int cgeb_watchdog_start(struct watchdog_device *wdd)
+{
+ struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
+
+ return watchdog_set_config(priv, wdd->timeout);
+}
+
+static int cgeb_watchdog_stop(struct watchdog_device *wdd)
+{
+ struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
+
+ return watchdog_set_config(priv, 0);
+}
+
+static int cgeb_watchdog_set_timeout(struct watchdog_device *wdd,
+ unsigned int timeout_s)
+{
+ return 0;
+}
+
+struct watchdog_ops cgeb_watchdog_ops = {
+ .start = cgeb_watchdog_start,
+ .stop = cgeb_watchdog_stop,
+ .set_timeout = cgeb_watchdog_set_timeout,
+};
+
+static int
[PATCH 3/3] watchdog: Add Congatec CGEB watchdog driver
This driver provides support for the CGEB watchdog found on some
Congatec x86 modules.
Signed-off-by: Sascha Hauer s.ha...@pengutronix.de
---
drivers/watchdog/Kconfig | 10 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/congatec_cgeb_watchdog.c | 161 +
3 files changed, 172 insertions(+)
create mode 100644 drivers/watchdog/congatec_cgeb_watchdog.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 7f809fd..47138fb 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -934,6 +934,16 @@ config SBC_EPX_C3_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called sbc_epx_c3.
+config CONGATEC_CGEB_WATCHDOG
+ depends on CONGATEC_CGEB
+ tristate Congatec CGEB watchdog
+ ---help---
+ This driver provides support for the watchdogs found on Congatec
+ modules with the CGEB BIOS interface.
+
+ To compile this driver as a module, choose M here: the
+ module will be called congatec_cgeb_wdt.
+
# M32R Architecture
# M68K Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 97bbdb3a..e67eee5 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
+obj-$(CONFIG_CONGATEC_CGEB_WATCHDOG) += congatec_cgeb_watchdog.o
# M32R Architecture
diff --git a/drivers/watchdog/congatec_cgeb_watchdog.c
b/drivers/watchdog/congatec_cgeb_watchdog.c
new file mode 100644
index 000..b7b6cf5
--- /dev/null
+++ b/drivers/watchdog/congatec_cgeb_watchdog.c
@@ -0,0 +1,161 @@
+/*
+ * CGEB watchdog driver
+ *
+ * (c) 2011 Sascha Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ */
+#include linux/module.h
+#include linux/platform_device.h
+#include linux/watchdog.h
+#include asm/congatec-cgeb.h
+
+#define CGOS_WDOG_MODE_REBOOT_PC0
+#define CGOS_WDOG_MODE_RESTART_OS 1
+#define CGOS_WDOG_MODE_STAGED0x80
+
+#define CGOS_WDOG_OPMODE_DISABLED 0
+#define CGOS_WDOG_OPMODE_ONETIME_TRIG 1
+#define CGOS_WDOG_OPMODE_SINGLE_EVENT 2
+#define CGOS_WDOG_OPMODE_EVENT_REPEAT 3
+
+#define CGOS_WDOG_EVENT_INT 0 /* NMI/IRQ */
+#define CGOS_WDOG_EVENT_SCI 1 /* SMI/SCI */
+#define CGOS_WDOG_EVENT_RST 2 /* system reset */
+#define CGOS_WDOG_EVENT_BTN 3 /* power button */
+
+#define CGOS_WDOG_EVENT_MAX_STAGES 3
+
+struct cgeb_watchdog_stage {
+ unsigned long timeout;
+ unsigned long event;
+};
+
+struct cgeb_watchdog_config {
+ unsigned long size;
+ unsigned long timeout; /* not used in staged mode */
+ unsigned long delay;
+ unsigned long mode;
+ /* optional parameters for staged watchdog */
+ unsigned long op_mode;
+ unsigned long stage_count;
+ struct cgeb_watchdog_stage stages[CGOS_WDOG_EVENT_MAX_STAGES];
+};
+
+struct cgeb_watchdog_priv {
+ struct cgeb_board_data *board;
+ struct watchdog_device wdd;
+ int unit;
+};
+
+static struct watchdog_info cgeb_wdd_info = {
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+ .firmware_version = 0,
+ .identity = cgeb watchdog,
+};
+
+static unsigned int watchdog_set_config(struct cgeb_watchdog_priv *priv,
+ unsigned int timeout_s)
+{
+ struct cgeb_board_data *board = priv-board;
+ struct cgeb_watchdog_config wdi;
+ struct cgeb_function_parameters fps;
+
+ memset(wdi, 0, sizeof(wdi));
+ memset(fps, 0, sizeof(fps));
+
+ fps.unit = priv-unit;
+ fps.iptr = wdi;
+
+ wdi.timeout = timeout_s * 1000;
+ wdi.delay = 0;
+ wdi.size = sizeof(wdi);
+ wdi.mode = CGOS_WDOG_MODE_REBOOT_PC;
+
+ return cgeb_call(board, fps, CgebWDogSetConfig);
+}
+
+static int cgeb_watchdog_start(struct watchdog_device *wdd)
+{
+ struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
+
+ return watchdog_set_config(priv, wdd-timeout);
+}
+
+static int cgeb_watchdog_stop(struct watchdog_device *wdd)
+{
+ struct cgeb_watchdog_priv *priv = watchdog_get_drvdata(wdd);
+
+ return watchdog_set_config(priv, 0);
+}
+
+static int cgeb_watchdog_set_timeout(struct watchdog_device *wdd,
+ unsigned int timeout_s)
+{
+ return 0;
+}
+
+struct watchdog_ops cgeb_watchdog_ops = {
+ .start = cgeb_watchdog_start,
+
