* [PATCH] watchdog: w83627hf: Added NCT6102D support.
@ 2016-02-05 2:58 Rob Kramer
2016-02-06 17:02 ` Guenter Roeck
2016-02-06 17:10 ` Guenter Roeck
0 siblings, 2 replies; 8+ messages in thread
From: Rob Kramer @ 2016-02-05 2:58 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-kernel, linux-watchdog
As used in (and tested on) the ASRock IMB-150 board. Implementation is
identical to other NCT chips, just with different registers.
Signed-off-by: Rob Kramer <rob@solution-space.com>
---
drivers/watchdog/Kconfig | 1 +
drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 4f0e7be..318d8bc 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1140,6 +1140,7 @@ config W83627HF_WDT
NCT6779
NCT6791
NCT6792
+ NCT6102D/04D/06D
This watchdog simply watches your kernel to make sure it doesn't
freeze, and if it does, it reboots your computer after a certain
diff --git a/drivers/watchdog/w83627hf_wdt.c
b/drivers/watchdog/w83627hf_wdt.c
index cab14bc..09e8003 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -45,10 +45,11 @@
static int wdt_io;
static int cr_wdt_timeout; /* WDT timeout register */
static int cr_wdt_control; /* WDT control register */
+static int cr_wdt_csr; /* WDT control & status register */
enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg,
w83627dhg_p,
- w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
+ w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792,
nct6102 };
static int timeout; /* in seconds */
module_param(timeout, int, 0);
@@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at
boot time (default=0)");
#define W83667HG_B_ID 0xb3
#define NCT6775_ID 0xb4
#define NCT6776_ID 0xc3
+#define NCT6102_ID 0xc4
#define NCT6779_ID 0xc5
#define NCT6791_ID 0xc8
#define NCT6792_ID 0xc9
#define W83627HF_WDT_TIMEOUT 0xf6
#define W83697HF_WDT_TIMEOUT 0xf4
+#define NCT6102D_WDT_TIMEOUT 0xf1
#define W83627HF_WDT_CONTROL 0xf5
#define W83697HF_WDT_CONTROL 0xf3
+#define NCT6102D_WDT_CONTROL 0xf0
+
+#define W836X7HF_WDT_CSR 0xf7
+#define NCT6102D_WDT_CSR 0xf2
static void superio_outb(int reg, int val)
{
@@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device
*wdog, enum chips chip)
case nct6779:
case nct6791:
case nct6792:
+ case nct6102:
/*
* These chips have a fixed WDTO# output pin (W83627UHG),
* or support more than one WDTO# output pin.
@@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device
*wdog, enum chips chip)
superio_outb(cr_wdt_control, t);
/* reset trigger, disable keyboard & mouse turning off watchdog */
- t = superio_inb(0xF7) & ~0xD0;
- superio_outb(0xF7, t);
+ t = superio_inb(cr_wdt_csr) & ~0xD0;
+ superio_outb(cr_wdt_csr, t);
superio_exit();
@@ -322,6 +330,7 @@ static int wdt_find(int addr)
cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
cr_wdt_control = W83627HF_WDT_CONTROL;
+ cr_wdt_csr = W836X7HF_WDT_CSR;
ret = superio_enter();
if (ret)
@@ -387,6 +396,12 @@ static int wdt_find(int addr)
case NCT6792_ID:
ret = nct6792;
break;
+ case NCT6102_ID:
+ ret = nct6102;
+ cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
+ cr_wdt_control = NCT6102D_WDT_CONTROL;
+ cr_wdt_csr = NCT6102D_WDT_CSR;
+ break;
case 0xff:
ret = -ENODEV;
break;
@@ -422,6 +437,7 @@ static int __init wdt_init(void)
"NCT6779",
"NCT6791",
"NCT6792",
+ "NCT6102",
};
wdt_io = 0x2e;
--
2.6.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] watchdog: w83627hf: Added NCT6102D support.
2016-02-05 2:58 [PATCH] watchdog: w83627hf: Added NCT6102D support Rob Kramer
@ 2016-02-06 17:02 ` Guenter Roeck
2016-02-06 17:10 ` Guenter Roeck
1 sibling, 0 replies; 8+ messages in thread
From: Guenter Roeck @ 2016-02-06 17:02 UTC (permalink / raw)
To: Rob Kramer, Wim Van Sebroeck; +Cc: linux-kernel, linux-watchdog
On 02/04/2016 06:58 PM, Rob Kramer wrote:
> As used in (and tested on) the ASRock IMB-150 board. Implementation is
> identical to other NCT chips, just with different registers.
>
> Signed-off-by: Rob Kramer <rob@solution-space.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/Kconfig | 1 +
> drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 4f0e7be..318d8bc 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1140,6 +1140,7 @@ config W83627HF_WDT
> NCT6779
> NCT6791
> NCT6792
> + NCT6102D/04D/06D
>
> This watchdog simply watches your kernel to make sure it doesn't
> freeze, and if it does, it reboots your computer after a certain
> diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
> index cab14bc..09e8003 100644
> --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -45,10 +45,11 @@
> static int wdt_io;
> static int cr_wdt_timeout; /* WDT timeout register */
> static int cr_wdt_control; /* WDT control register */
> +static int cr_wdt_csr; /* WDT control & status register */
>
> enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
> w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
> - w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
> + w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
>
> static int timeout; /* in seconds */
> module_param(timeout, int, 0);
> @@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
> #define W83667HG_B_ID 0xb3
> #define NCT6775_ID 0xb4
> #define NCT6776_ID 0xc3
> +#define NCT6102_ID 0xc4
> #define NCT6779_ID 0xc5
> #define NCT6791_ID 0xc8
> #define NCT6792_ID 0xc9
>
> #define W83627HF_WDT_TIMEOUT 0xf6
> #define W83697HF_WDT_TIMEOUT 0xf4
> +#define NCT6102D_WDT_TIMEOUT 0xf1
>
> #define W83627HF_WDT_CONTROL 0xf5
> #define W83697HF_WDT_CONTROL 0xf3
> +#define NCT6102D_WDT_CONTROL 0xf0
> +
> +#define W836X7HF_WDT_CSR 0xf7
> +#define NCT6102D_WDT_CSR 0xf2
>
> static void superio_outb(int reg, int val)
> {
> @@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> case nct6779:
> case nct6791:
> case nct6792:
> + case nct6102:
> /*
> * These chips have a fixed WDTO# output pin (W83627UHG),
> * or support more than one WDTO# output pin.
> @@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> superio_outb(cr_wdt_control, t);
>
> /* reset trigger, disable keyboard & mouse turning off watchdog */
> - t = superio_inb(0xF7) & ~0xD0;
> - superio_outb(0xF7, t);
> + t = superio_inb(cr_wdt_csr) & ~0xD0;
> + superio_outb(cr_wdt_csr, t);
>
> superio_exit();
>
> @@ -322,6 +330,7 @@ static int wdt_find(int addr)
>
> cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
> cr_wdt_control = W83627HF_WDT_CONTROL;
> + cr_wdt_csr = W836X7HF_WDT_CSR;
>
> ret = superio_enter();
> if (ret)
> @@ -387,6 +396,12 @@ static int wdt_find(int addr)
> case NCT6792_ID:
> ret = nct6792;
> break;
> + case NCT6102_ID:
> + ret = nct6102;
> + cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
> + cr_wdt_control = NCT6102D_WDT_CONTROL;
> + cr_wdt_csr = NCT6102D_WDT_CSR;
> + break;
> case 0xff:
> ret = -ENODEV;
> break;
> @@ -422,6 +437,7 @@ static int __init wdt_init(void)
> "NCT6779",
> "NCT6791",
> "NCT6792",
> + "NCT6102",
> };
>
> wdt_io = 0x2e;
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] watchdog: w83627hf: Added NCT6102D support.
2016-02-05 2:58 [PATCH] watchdog: w83627hf: Added NCT6102D support Rob Kramer
2016-02-06 17:02 ` Guenter Roeck
@ 2016-02-06 17:10 ` Guenter Roeck
2016-02-08 7:53 ` Rob Kramer
2016-02-08 10:09 ` [PATCH v2] " Rob Kramer
1 sibling, 2 replies; 8+ messages in thread
From: Guenter Roeck @ 2016-02-06 17:10 UTC (permalink / raw)
To: Rob Kramer, Wim Van Sebroeck; +Cc: linux-kernel, linux-watchdog
On 02/04/2016 06:58 PM, Rob Kramer wrote:
> As used in (and tested on) the ASRock IMB-150 board. Implementation is
> identical to other NCT chips, just with different registers.
>
> Signed-off-by: Rob Kramer <rob@solution-space.com>
Rob,
your patch is whitespace damaged (tabs replaced with spaces) and can not be applied.
Please resend.
Thanks,
Guenter
> ---
> drivers/watchdog/Kconfig | 1 +
> drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 4f0e7be..318d8bc 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1140,6 +1140,7 @@ config W83627HF_WDT
> NCT6779
> NCT6791
> NCT6792
> + NCT6102D/04D/06D
>
> This watchdog simply watches your kernel to make sure it doesn't
> freeze, and if it does, it reboots your computer after a certain
> diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
> index cab14bc..09e8003 100644
> --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -45,10 +45,11 @@
> static int wdt_io;
> static int cr_wdt_timeout; /* WDT timeout register */
> static int cr_wdt_control; /* WDT control register */
> +static int cr_wdt_csr; /* WDT control & status register */
>
> enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
> w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
> - w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
> + w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
>
> static int timeout; /* in seconds */
> module_param(timeout, int, 0);
> @@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
> #define W83667HG_B_ID 0xb3
> #define NCT6775_ID 0xb4
> #define NCT6776_ID 0xc3
> +#define NCT6102_ID 0xc4
> #define NCT6779_ID 0xc5
> #define NCT6791_ID 0xc8
> #define NCT6792_ID 0xc9
>
> #define W83627HF_WDT_TIMEOUT 0xf6
> #define W83697HF_WDT_TIMEOUT 0xf4
> +#define NCT6102D_WDT_TIMEOUT 0xf1
>
> #define W83627HF_WDT_CONTROL 0xf5
> #define W83697HF_WDT_CONTROL 0xf3
> +#define NCT6102D_WDT_CONTROL 0xf0
> +
> +#define W836X7HF_WDT_CSR 0xf7
> +#define NCT6102D_WDT_CSR 0xf2
>
> static void superio_outb(int reg, int val)
> {
> @@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> case nct6779:
> case nct6791:
> case nct6792:
> + case nct6102:
> /*
> * These chips have a fixed WDTO# output pin (W83627UHG),
> * or support more than one WDTO# output pin.
> @@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> superio_outb(cr_wdt_control, t);
>
> /* reset trigger, disable keyboard & mouse turning off watchdog */
> - t = superio_inb(0xF7) & ~0xD0;
> - superio_outb(0xF7, t);
> + t = superio_inb(cr_wdt_csr) & ~0xD0;
> + superio_outb(cr_wdt_csr, t);
>
> superio_exit();
>
> @@ -322,6 +330,7 @@ static int wdt_find(int addr)
>
> cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
> cr_wdt_control = W83627HF_WDT_CONTROL;
> + cr_wdt_csr = W836X7HF_WDT_CSR;
>
> ret = superio_enter();
> if (ret)
> @@ -387,6 +396,12 @@ static int wdt_find(int addr)
> case NCT6792_ID:
> ret = nct6792;
> break;
> + case NCT6102_ID:
> + ret = nct6102;
> + cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
> + cr_wdt_control = NCT6102D_WDT_CONTROL;
> + cr_wdt_csr = NCT6102D_WDT_CSR;
> + break;
> case 0xff:
> ret = -ENODEV;
> break;
> @@ -422,6 +437,7 @@ static int __init wdt_init(void)
> "NCT6779",
> "NCT6791",
> "NCT6792",
> + "NCT6102",
> };
>
> wdt_io = 0x2e;
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] watchdog: w83627hf: Added NCT6102D support.
2016-02-06 17:10 ` Guenter Roeck
@ 2016-02-08 7:53 ` Rob Kramer
2016-02-08 14:11 ` Guenter Roeck
2016-02-08 10:09 ` [PATCH v2] " Rob Kramer
1 sibling, 1 reply; 8+ messages in thread
From: Rob Kramer @ 2016-02-08 7:53 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Wim Van Sebroeck, linux-kernel, linux-watchdog
On Sat, Feb 06, 2016 at 09:10:35AM -0800, Guenter Roeck wrote:
> your patch is whitespace damaged (tabs replaced with spaces) and can not be applied.
> Please resend.
Oops, you're right. I'll send it again shortly, from mutt instead of
Thunderbird (which apparently is problematic even with external editor).
Cheers,
Rob
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] watchdog: w83627hf: Added NCT6102D support.
2016-02-06 17:10 ` Guenter Roeck
2016-02-08 7:53 ` Rob Kramer
@ 2016-02-08 10:09 ` Rob Kramer
2016-02-08 13:53 ` Guenter Roeck
2016-03-04 19:35 ` Wim Van Sebroeck
1 sibling, 2 replies; 8+ messages in thread
From: Rob Kramer @ 2016-02-08 10:09 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Wim Van Sebroeck, linux-kernel, linux-watchdog
As used in (and tested on) the ASRock IMB-150 board. Implementation is
identical to other NCT chips, just with different registers.
Signed-off-by: Rob Kramer <rob@solution-space.com>
---
drivers/watchdog/Kconfig | 1 +
drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 4f0e7be..318d8bc 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1140,6 +1140,7 @@ config W83627HF_WDT
NCT6779
NCT6791
NCT6792
+ NCT6102D/04D/06D
This watchdog simply watches your kernel to make sure it doesn't
freeze, and if it does, it reboots your computer after a certain
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index cab14bc..09e8003 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -45,10 +45,11 @@
static int wdt_io;
static int cr_wdt_timeout; /* WDT timeout register */
static int cr_wdt_control; /* WDT control register */
+static int cr_wdt_csr; /* WDT control & status register */
enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
- w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
+ w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
static int timeout; /* in seconds */
module_param(timeout, int, 0);
@@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
#define W83667HG_B_ID 0xb3
#define NCT6775_ID 0xb4
#define NCT6776_ID 0xc3
+#define NCT6102_ID 0xc4
#define NCT6779_ID 0xc5
#define NCT6791_ID 0xc8
#define NCT6792_ID 0xc9
#define W83627HF_WDT_TIMEOUT 0xf6
#define W83697HF_WDT_TIMEOUT 0xf4
+#define NCT6102D_WDT_TIMEOUT 0xf1
#define W83627HF_WDT_CONTROL 0xf5
#define W83697HF_WDT_CONTROL 0xf3
+#define NCT6102D_WDT_CONTROL 0xf0
+
+#define W836X7HF_WDT_CSR 0xf7
+#define NCT6102D_WDT_CSR 0xf2
static void superio_outb(int reg, int val)
{
@@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
case nct6779:
case nct6791:
case nct6792:
+ case nct6102:
/*
* These chips have a fixed WDTO# output pin (W83627UHG),
* or support more than one WDTO# output pin.
@@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
superio_outb(cr_wdt_control, t);
/* reset trigger, disable keyboard & mouse turning off watchdog */
- t = superio_inb(0xF7) & ~0xD0;
- superio_outb(0xF7, t);
+ t = superio_inb(cr_wdt_csr) & ~0xD0;
+ superio_outb(cr_wdt_csr, t);
superio_exit();
@@ -322,6 +330,7 @@ static int wdt_find(int addr)
cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
cr_wdt_control = W83627HF_WDT_CONTROL;
+ cr_wdt_csr = W836X7HF_WDT_CSR;
ret = superio_enter();
if (ret)
@@ -387,6 +396,12 @@ static int wdt_find(int addr)
case NCT6792_ID:
ret = nct6792;
break;
+ case NCT6102_ID:
+ ret = nct6102;
+ cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
+ cr_wdt_control = NCT6102D_WDT_CONTROL;
+ cr_wdt_csr = NCT6102D_WDT_CSR;
+ break;
case 0xff:
ret = -ENODEV;
break;
@@ -422,6 +437,7 @@ static int __init wdt_init(void)
"NCT6779",
"NCT6791",
"NCT6792",
+ "NCT6102",
};
wdt_io = 0x2e;
--
2.6.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] watchdog: w83627hf: Added NCT6102D support.
2016-02-08 10:09 ` [PATCH v2] " Rob Kramer
@ 2016-02-08 13:53 ` Guenter Roeck
2016-03-04 19:35 ` Wim Van Sebroeck
1 sibling, 0 replies; 8+ messages in thread
From: Guenter Roeck @ 2016-02-08 13:53 UTC (permalink / raw)
To: Rob Kramer; +Cc: Wim Van Sebroeck, linux-kernel, linux-watchdog
On 02/08/2016 02:09 AM, Rob Kramer wrote:
> As used in (and tested on) the ASRock IMB-150 board. Implementation is
> identical to other NCT chips, just with different registers.
>
> Signed-off-by: Rob Kramer <rob@solution-space.com>
This time it applies.
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Thanks,
Guenter
> ---
> drivers/watchdog/Kconfig | 1 +
> drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 4f0e7be..318d8bc 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1140,6 +1140,7 @@ config W83627HF_WDT
> NCT6779
> NCT6791
> NCT6792
> + NCT6102D/04D/06D
>
> This watchdog simply watches your kernel to make sure it doesn't
> freeze, and if it does, it reboots your computer after a certain
> diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
> index cab14bc..09e8003 100644
> --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -45,10 +45,11 @@
> static int wdt_io;
> static int cr_wdt_timeout; /* WDT timeout register */
> static int cr_wdt_control; /* WDT control register */
> +static int cr_wdt_csr; /* WDT control & status register */
>
> enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
> w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
> - w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
> + w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
>
> static int timeout; /* in seconds */
> module_param(timeout, int, 0);
> @@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
> #define W83667HG_B_ID 0xb3
> #define NCT6775_ID 0xb4
> #define NCT6776_ID 0xc3
> +#define NCT6102_ID 0xc4
> #define NCT6779_ID 0xc5
> #define NCT6791_ID 0xc8
> #define NCT6792_ID 0xc9
>
> #define W83627HF_WDT_TIMEOUT 0xf6
> #define W83697HF_WDT_TIMEOUT 0xf4
> +#define NCT6102D_WDT_TIMEOUT 0xf1
>
> #define W83627HF_WDT_CONTROL 0xf5
> #define W83697HF_WDT_CONTROL 0xf3
> +#define NCT6102D_WDT_CONTROL 0xf0
> +
> +#define W836X7HF_WDT_CSR 0xf7
> +#define NCT6102D_WDT_CSR 0xf2
>
> static void superio_outb(int reg, int val)
> {
> @@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> case nct6779:
> case nct6791:
> case nct6792:
> + case nct6102:
> /*
> * These chips have a fixed WDTO# output pin (W83627UHG),
> * or support more than one WDTO# output pin.
> @@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> superio_outb(cr_wdt_control, t);
>
> /* reset trigger, disable keyboard & mouse turning off watchdog */
> - t = superio_inb(0xF7) & ~0xD0;
> - superio_outb(0xF7, t);
> + t = superio_inb(cr_wdt_csr) & ~0xD0;
> + superio_outb(cr_wdt_csr, t);
>
> superio_exit();
>
> @@ -322,6 +330,7 @@ static int wdt_find(int addr)
>
> cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
> cr_wdt_control = W83627HF_WDT_CONTROL;
> + cr_wdt_csr = W836X7HF_WDT_CSR;
>
> ret = superio_enter();
> if (ret)
> @@ -387,6 +396,12 @@ static int wdt_find(int addr)
> case NCT6792_ID:
> ret = nct6792;
> break;
> + case NCT6102_ID:
> + ret = nct6102;
> + cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
> + cr_wdt_control = NCT6102D_WDT_CONTROL;
> + cr_wdt_csr = NCT6102D_WDT_CSR;
> + break;
> case 0xff:
> ret = -ENODEV;
> break;
> @@ -422,6 +437,7 @@ static int __init wdt_init(void)
> "NCT6779",
> "NCT6791",
> "NCT6792",
> + "NCT6102",
> };
>
> wdt_io = 0x2e;
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] watchdog: w83627hf: Added NCT6102D support.
2016-02-08 7:53 ` Rob Kramer
@ 2016-02-08 14:11 ` Guenter Roeck
0 siblings, 0 replies; 8+ messages in thread
From: Guenter Roeck @ 2016-02-08 14:11 UTC (permalink / raw)
To: Rob Kramer; +Cc: Wim Van Sebroeck, linux-kernel, linux-watchdog
On 02/07/2016 11:53 PM, Rob Kramer wrote:
> On Sat, Feb 06, 2016 at 09:10:35AM -0800, Guenter Roeck wrote:
>> your patch is whitespace damaged (tabs replaced with spaces) and can not be applied.
>> Please resend.
>
> Oops, you're right. I'll send it again shortly, from mutt instead of
> Thunderbird (which apparently is problematic even with external editor).
>
If you plan to send more patches in the future, you might consider
using "git send-email".
Thanks,
Guenter
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] watchdog: w83627hf: Added NCT6102D support.
2016-02-08 10:09 ` [PATCH v2] " Rob Kramer
2016-02-08 13:53 ` Guenter Roeck
@ 2016-03-04 19:35 ` Wim Van Sebroeck
1 sibling, 0 replies; 8+ messages in thread
From: Wim Van Sebroeck @ 2016-03-04 19:35 UTC (permalink / raw)
To: Rob Kramer; +Cc: Guenter Roeck, linux-kernel, linux-watchdog
Hi Rob,
> As used in (and tested on) the ASRock IMB-150 board. Implementation is
> identical to other NCT chips, just with different registers.
>
> Signed-off-by: Rob Kramer <rob@solution-space.com>
> ---
> drivers/watchdog/Kconfig | 1 +
> drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 4f0e7be..318d8bc 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1140,6 +1140,7 @@ config W83627HF_WDT
> NCT6779
> NCT6791
> NCT6792
> + NCT6102D/04D/06D
>
> This watchdog simply watches your kernel to make sure it doesn't
> freeze, and if it does, it reboots your computer after a certain
> diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
> index cab14bc..09e8003 100644
> --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -45,10 +45,11 @@
> static int wdt_io;
> static int cr_wdt_timeout; /* WDT timeout register */
> static int cr_wdt_control; /* WDT control register */
> +static int cr_wdt_csr; /* WDT control & status register */
>
> enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
> w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
> - w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
> + w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
>
> static int timeout; /* in seconds */
> module_param(timeout, int, 0);
> @@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
> #define W83667HG_B_ID 0xb3
> #define NCT6775_ID 0xb4
> #define NCT6776_ID 0xc3
> +#define NCT6102_ID 0xc4
> #define NCT6779_ID 0xc5
> #define NCT6791_ID 0xc8
> #define NCT6792_ID 0xc9
>
> #define W83627HF_WDT_TIMEOUT 0xf6
> #define W83697HF_WDT_TIMEOUT 0xf4
> +#define NCT6102D_WDT_TIMEOUT 0xf1
>
> #define W83627HF_WDT_CONTROL 0xf5
> #define W83697HF_WDT_CONTROL 0xf3
> +#define NCT6102D_WDT_CONTROL 0xf0
> +
> +#define W836X7HF_WDT_CSR 0xf7
> +#define NCT6102D_WDT_CSR 0xf2
>
> static void superio_outb(int reg, int val)
> {
> @@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> case nct6779:
> case nct6791:
> case nct6792:
> + case nct6102:
> /*
> * These chips have a fixed WDTO# output pin (W83627UHG),
> * or support more than one WDTO# output pin.
> @@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> superio_outb(cr_wdt_control, t);
>
> /* reset trigger, disable keyboard & mouse turning off watchdog */
> - t = superio_inb(0xF7) & ~0xD0;
> - superio_outb(0xF7, t);
> + t = superio_inb(cr_wdt_csr) & ~0xD0;
> + superio_outb(cr_wdt_csr, t);
>
> superio_exit();
>
> @@ -322,6 +330,7 @@ static int wdt_find(int addr)
>
> cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
> cr_wdt_control = W83627HF_WDT_CONTROL;
> + cr_wdt_csr = W836X7HF_WDT_CSR;
>
> ret = superio_enter();
> if (ret)
> @@ -387,6 +396,12 @@ static int wdt_find(int addr)
> case NCT6792_ID:
> ret = nct6792;
> break;
> + case NCT6102_ID:
> + ret = nct6102;
> + cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
> + cr_wdt_control = NCT6102D_WDT_CONTROL;
> + cr_wdt_csr = NCT6102D_WDT_CSR;
> + break;
> case 0xff:
> ret = -ENODEV;
> break;
> @@ -422,6 +437,7 @@ static int __init wdt_init(void)
> "NCT6779",
> "NCT6791",
> "NCT6792",
> + "NCT6102",
> };
>
> wdt_io = 0x2e;
> --
> 2.6.2
>
Patch has been added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-03-04 19:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-05 2:58 [PATCH] watchdog: w83627hf: Added NCT6102D support Rob Kramer
2016-02-06 17:02 ` Guenter Roeck
2016-02-06 17:10 ` Guenter Roeck
2016-02-08 7:53 ` Rob Kramer
2016-02-08 14:11 ` Guenter Roeck
2016-02-08 10:09 ` [PATCH v2] " Rob Kramer
2016-02-08 13:53 ` Guenter Roeck
2016-03-04 19:35 ` Wim Van Sebroeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.