watchdog: f71808e_wdt: Add F81865 support

PATCH Superseded Knud Poulsen 2 participants 3 messages Apr 20, 2016 – Apr 21, 2016 Watchdog device drivers

lore

Share & tools

lore

Knud Poulsen

author

2016-04-20 17:56 UTC #0 lore raw

PATCH 1/1 watchdog: f71808e_wdt: Add F81865 support

Adds watchdog support for Fintek F81865 Super-IO chip to Fintek wdt driver (f71808e_wdt)

Tested and verified on Lanner LEC-3030 Industrial PC

Datasheet references:
http://www.hardwaresecrets.com/datasheets/F81865_V028P.pdf
http://www.alldatasheet.com/datasheet-pdf/pdf/406317/FINTEK/F81865.html

Signed-off-by Knud Poulsen <[email protected]>

---
 drivers/watchdog/f71808e_wdt.c | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

drivers/watchdog/f71808e_wdt.c +30 -6

index 016bd93..956f8eb 100644
@@ -2,6 +2,7 @@
  *   Copyright (C) 2006 by Hans Edgington <[email protected]>              *
  *   Copyright (C) 2007-2009 Hans de Goede <[email protected]>           *
  *   Copyright (C) 2010 Giel van Schijndel <[email protected]>                  *
+ *   Copyright (C) 2016 Knud Poulsen <[email protected]>                       *
  *                                                                         *
  *   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  *

@@ -38,7 +39,7 @@
 
 #define SIO_F71808FG_LD_WDT	0x07	/* Watchdog timer logical device */
 #define SIO_UNLOCK_KEY		0x87	/* Key to enable Super-I/O */
-#define SIO_LOCK_KEY		0xAA	/* Key to diasble Super-I/O */
+#define SIO_LOCK_KEY		0xAA	/* Key to disable Super-I/O */
 
 #define SIO_REG_LDSEL		0x07	/* Logical device select */
 #define SIO_REG_DEVID		0x20	/* Device ID (2 bytes) */

@@ -59,6 +60,7 @@
 #define SIO_F71869A_ID		0x1007	/* Chipset ID */
 #define SIO_F71882_ID		0x0541	/* Chipset ID */
 #define SIO_F71889_ID		0x0723	/* Chipset ID */
+#define SIO_F81865_ID		0x0704	/* Chipset ID */
 
 #define F71808FG_REG_WDO_CONF		0xf0
 #define F71808FG_REG_WDT_CONF		0xf5

@@ -71,6 +73,10 @@
 #define F71808FG_FLAG_WD_PULSE		4
 #define F71808FG_FLAG_WD_UNIT		3
 
+#define F81865_REG_WDO_CONF		0xfa
+#define F81865_FLAG_WDOUT_EN		0
+#define F81865_FLAG_WDTMOUT_STS		6
+
 /* Default values */
 #define WATCHDOG_TIMEOUT	60	/* 1 minute default timeout */
 #define WATCHDOG_MAX_TIMEOUT	(60 * 255)

@@ -112,7 +118,7 @@ module_param(start_withtimeout, uint, 0);
 MODULE_PARM_DESC(start_withtimeout, "Start watchdog timer on module load with"
 	" given initial timeout. Zero (default) disables this feature.");
 
-enum chips { f71808fg, f71858fg, f71862fg, f71869, f71882fg, f71889fg };
+enum chips { f71808fg, f71858fg, f71862fg, f71869, f71882fg, f71889fg, f81865 };
 
 static const char *f71808e_names[] = {
 	"f71808fg",

@@ -121,6 +127,7 @@ static const char *f71808e_names[] = {
 	"f71869",
 	"f71882fg",
 	"f71889fg",
+	"f81865",
 };
 
 /* Super-I/O Function prototypes */

@@ -360,6 +367,11 @@ static int watchdog_start(void)
 			superio_inb(watchdog.sioaddr, SIO_REG_MFUNCT3) & 0xcf);
 		break;
 
+	case f81865:
+		/* Set pin 70 to WDTRST# */
+		superio_clear_bit(watchdog.sioaddr, SIO_REG_MFUNCT3, 5);
+		break;
+
 	default:
 		/*
 		 * 'default' label to shut up the compiler and catch

@@ -371,9 +383,13 @@ static int watchdog_start(void)
 
 	superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);
 	superio_set_bit(watchdog.sioaddr, SIO_REG_ENABLE, 0);
-	superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDO_CONF,
-			F71808FG_FLAG_WDOUT_EN);
-
+	if (watchdog.type == f81865) {
+		superio_set_bit(watchdog.sioaddr, F81865_REG_WDO_CONF,
+				F81865_FLAG_WDOUT_EN);
+	} else {
+		superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDO_CONF,
+				F71808FG_FLAG_WDOUT_EN);
+	}
 	superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDT_CONF,
 			F71808FG_FLAG_WD_EN);

@@ -655,7 +671,12 @@ static int __init watchdog_init(int sioaddr)
 	superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);
 
 	wdt_conf = superio_inb(sioaddr, F71808FG_REG_WDT_CONF);
-	watchdog.caused_reboot = wdt_conf & F71808FG_FLAG_WDTMOUT_STS;
+	if (watchdog.type == f81865) {
+		watchdog.caused_reboot = wdt_conf & F81865_FLAG_WDTMOUT_STS;
+	} else {
+		watchdog.caused_reboot = wdt_conf & F71808FG_FLAG_WDTMOUT_STS;
+	}
+
 
 	superio_exit(sioaddr);

@@ -770,6 +791,9 @@ static int __init f71808e_find(int sioaddr)
 		/* Confirmed (by datasheet) not to have a watchdog. */
 		err = -ENODEV;
 		goto exit;
+	case SIO_F81865_ID:
+		watchdog.type = f81865;
+		break;
 	default:
 		pr_info("Unrecognized Fintek device: %04x\n",
 			(unsigned int)devid);

Signature · 1 line

2.5.5

Guenter Roeck

maintainer

2016-04-21 13:48 UTC #1 lore raw

Quoted 19 lines · Knud Poulsen

Adds watchdog support for Fintek F81865 Super-IO chip to Fintek wdt driver (f71808e_wdt)
Tested and verified on Lanner LEC-3030 Industrial PC
Datasheet references:
http://www.hardwaresecrets.com/datasheets/F81865_V028P.pdf
http://www.alldatasheet.com/datasheet-pdf/pdf/406317/FINTEK/F81865.html
Signed-off-by Knud Poulsen <[email protected]>
---
  drivers/watchdog/f71808e_wdt.c | 36 ++++++++++++++++++++++++++++++------
  1 file changed, 30 insertions(+), 6 deletions(-)
drivers/watchdog/f71808e_wdt.c +0 -0
index 016bd93..956f8eb 100644

drivers/watchdog/f71808e_wdt.c line 5

Quoted 4 lines

drivers/watchdog/f71808e_wdt.c +1 -0

@@ -2,6 +2,7 @@
   *   Copyright (C) 2006 by Hans Edgington <[email protected]>              *
   *   Copyright (C) 2007-2009 Hans de Goede <[email protected]>           *
   *   Copyright (C) 2010 Giel van Schijndel <[email protected]>                  *
+ *   Copyright (C) 2016 Knud Poulsen <[email protected]>                       *

For minor improvements like this really a stretch. Please reconsider.

drivers/watchdog/f71808e_wdt.c line 42

Quoted 9 lines

drivers/watchdog/f71808e_wdt.c +1 -1

   *                                                                         *
   *   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  *

@@ -38,7 +39,7 @@
 
  #define SIO_F71808FG_LD_WDT	0x07	/* Watchdog timer logical device */
  #define SIO_UNLOCK_KEY		0x87	/* Key to enable Super-I/O */
-#define SIO_LOCK_KEY		0xAA	/* Key to diasble Super-I/O */
+#define SIO_LOCK_KEY		0xAA	/* Key to disable Super-I/O */

Unrelated change - separate patch, please.

Quoted 55 lines

drivers/watchdog/f71808e_wdt.c +12 -1

  #define SIO_REG_LDSEL		0x07	/* Logical device select */
  #define SIO_REG_DEVID		0x20	/* Device ID (2 bytes) */

@@ -59,6 +60,7 @@
  #define SIO_F71869A_ID		0x1007	/* Chipset ID */
  #define SIO_F71882_ID		0x0541	/* Chipset ID */
  #define SIO_F71889_ID		0x0723	/* Chipset ID */
+#define SIO_F81865_ID		0x0704	/* Chipset ID */
 
  #define F71808FG_REG_WDO_CONF		0xf0
  #define F71808FG_REG_WDT_CONF		0xf5

@@ -71,6 +73,10 @@
  #define F71808FG_FLAG_WD_PULSE		4
  #define F71808FG_FLAG_WD_UNIT		3
 
+#define F81865_REG_WDO_CONF		0xfa
+#define F81865_FLAG_WDOUT_EN		0
+#define F81865_FLAG_WDTMOUT_STS		6
+
  /* Default values */
  #define WATCHDOG_TIMEOUT	60	/* 1 minute default timeout */
  #define WATCHDOG_MAX_TIMEOUT	(60 * 255)

@@ -112,7 +118,7 @@ module_param(start_withtimeout, uint, 0);
  MODULE_PARM_DESC(start_withtimeout, "Start watchdog timer on module load with"
  	" given initial timeout. Zero (default) disables this feature.");
 
-enum chips { f71808fg, f71858fg, f71862fg, f71869, f71882fg, f71889fg };
+enum chips { f71808fg, f71858fg, f71862fg, f71869, f71882fg, f71889fg, f81865 };
 
  static const char *f71808e_names[] = {
  	"f71808fg",

@@ -121,6 +127,7 @@ static const char *f71808e_names[] = {
  	"f71869",
  	"f71882fg",
  	"f71889fg",
+	"f81865",
  };
 
  /* Super-I/O Function prototypes */

@@ -360,6 +367,11 @@ static int watchdog_start(void)
  			superio_inb(watchdog.sioaddr, SIO_REG_MFUNCT3) & 0xcf);
  		break;
 
+	case f81865:
+		/* Set pin 70 to WDTRST# */
+		superio_clear_bit(watchdog.sioaddr, SIO_REG_MFUNCT3, 5);
+		break;
+
  	default:
  		/*
  		 * 'default' label to shut up the compiler and catch

@@ -371,9 +383,13 @@ static int watchdog_start(void)
 
  	superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);
  	superio_set_bit(watchdog.sioaddr, SIO_REG_ENABLE, 0);

drivers/watchdog/f71808e_wdt.c static int watchdog_start(void) · line 392

Quoted 10 lines

drivers/watchdog/f71808e_wdt.c +7 -3

-	superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDO_CONF,
-			F71808FG_FLAG_WDOUT_EN);
-
+	if (watchdog.type == f81865) {
+		superio_set_bit(watchdog.sioaddr, F81865_REG_WDO_CONF,
+				F81865_FLAG_WDOUT_EN);
+	} else {
+		superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDO_CONF,
+				F71808FG_FLAG_WDOUT_EN);
+	}

Unnecessary { }.

Quoted 4 lines

drivers/watchdog/f71808e_wdt.c +0 -0

  	superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDT_CONF,
  			F71808FG_FLAG_WD_EN);

drivers/watchdog/f71808e_wdt.c static int __init watchdog_init(int sioaddr) · line 679

Quoted 10 lines

drivers/watchdog/f71808e_wdt.c +6 -1

@@ -655,7 +671,12 @@ static int __init watchdog_init(int sioaddr)
  	superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);
 
  	wdt_conf = superio_inb(sioaddr, F71808FG_REG_WDT_CONF);
-	watchdog.caused_reboot = wdt_conf & F71808FG_FLAG_WDTMOUT_STS;
+	if (watchdog.type == f81865) {
+		watchdog.caused_reboot = wdt_conf & F81865_FLAG_WDTMOUT_STS;
+	} else {
+		watchdog.caused_reboot = wdt_conf & F71808FG_FLAG_WDTMOUT_STS;
+	}
+

Unnecessary { }, and please no double empty lines.

Quoted 14 lines

drivers/watchdog/f71808e_wdt.c +3 -0

  	superio_exit(sioaddr);

@@ -770,6 +791,9 @@ static int __init f71808e_find(int sioaddr)
  		/* Confirmed (by datasheet) not to have a watchdog. */
  		err = -ENODEV;
  		goto exit;
+	case SIO_F81865_ID:
+		watchdog.type = f81865;
+		break;
  	default:
  		pr_info("Unrecognized Fintek device: %04x\n",
  			(unsigned int)devid);

Knud Poulsen

author

2016-04-21 19:18 UTC #2 lore raw

Quoted 15 lines · Guenter Roeck

Quoted 14 lines · Knud Poulsen
Adds watchdog support for Fintek F81865 Super-IO chip to Fintek wdt driver (f71808e_wdt)
Tested and verified on Lanner LEC-3030 Industrial PC
Datasheet references:
http://www.hardwaresecrets.com/datasheets/F81865_V028P.pdf
http://www.alldatasheet.com/datasheet-pdf/pdf/406317/FINTEK/F81865.html
Signed-off-by Knud Poulsen <[email protected]>
---
  drivers/watchdog/f71808e_wdt.c | 36 ++++++++++++++++++++++++++++++------
  1 file changed, 30 insertions(+), 6 deletions(-)

Quoted 11 lines

drivers/watchdog/f71808e_wdt.c line 5

Quoted 9 lines

drivers/watchdog/f71808e_wdt.c +1 -0

index 016bd93..956f8eb 100644
@@ -2,6 +2,7 @@
   *   Copyright (C) 2006 by Hans Edgington <[email protected]>              *
   *   Copyright (C) 2007-2009 Hans de Goede <[email protected]>           *
   *   Copyright (C) 2010 Giel van Schijndel <[email protected]>                  *
+ *   Copyright (C) 2016 Knud Poulsen <[email protected]>                       *

For minor improvements like this really a stretch. Please reconsider.

No problem, will strip.

Quoted 6 lines

drivers/watchdog/f71808e_wdt.c +0 -0

   *                                                                         *
   *   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  *

@@ -38,7 +39,7 @@

Quoted 6 lines

drivers/watchdog/f71808e_wdt.c line 42

Quoted 4 lines

drivers/watchdog/f71808e_wdt.c +1 -1

  #define SIO_F71808FG_LD_WDT	0x07	/* Watchdog timer logical device */
  #define SIO_UNLOCK_KEY		0x87	/* Key to enable Super-I/O */
-#define SIO_LOCK_KEY		0xAA	/* Key to diasble Super-I/O */
+#define SIO_LOCK_KEY		0xAA	/* Key to disable Super-I/O */

Unrelated change - separate patch, please.

No problem, will submit separately.

Quoted 54 lines

drivers/watchdog/f71808e_wdt.c +12 -1

  #define SIO_REG_LDSEL		0x07	/* Logical device select */
  #define SIO_REG_DEVID		0x20	/* Device ID (2 bytes) */

@@ -59,6 +60,7 @@
  #define SIO_F71869A_ID		0x1007	/* Chipset ID */
  #define SIO_F71882_ID		0x0541	/* Chipset ID */
  #define SIO_F71889_ID		0x0723	/* Chipset ID */
+#define SIO_F81865_ID		0x0704	/* Chipset ID */
 
  #define F71808FG_REG_WDO_CONF		0xf0
  #define F71808FG_REG_WDT_CONF		0xf5

@@ -71,6 +73,10 @@
  #define F71808FG_FLAG_WD_PULSE		4
  #define F71808FG_FLAG_WD_UNIT		3
 
+#define F81865_REG_WDO_CONF		0xfa
+#define F81865_FLAG_WDOUT_EN		0
+#define F81865_FLAG_WDTMOUT_STS		6
+
  /* Default values */
  #define WATCHDOG_TIMEOUT	60	/* 1 minute default timeout */
  #define WATCHDOG_MAX_TIMEOUT	(60 * 255)

@@ -112,7 +118,7 @@ module_param(start_withtimeout, uint, 0);
  MODULE_PARM_DESC(start_withtimeout, "Start watchdog timer on module load with"
  	" given initial timeout. Zero (default) disables this feature.");
 
-enum chips { f71808fg, f71858fg, f71862fg, f71869, f71882fg, f71889fg };
+enum chips { f71808fg, f71858fg, f71862fg, f71869, f71882fg, f71889fg, f81865 };
 
  static const char *f71808e_names[] = {
  	"f71808fg",

@@ -121,6 +127,7 @@ static const char *f71808e_names[] = {
  	"f71869",
  	"f71882fg",
  	"f71889fg",
+	"f81865",
  };
 
  /* Super-I/O Function prototypes */

@@ -360,6 +367,11 @@ static int watchdog_start(void)
  			superio_inb(watchdog.sioaddr, SIO_REG_MFUNCT3) & 0xcf);
  		break;
 
+	case f81865:
+		/* Set pin 70 to WDTRST# */
+		superio_clear_bit(watchdog.sioaddr, SIO_REG_MFUNCT3, 5);
+		break;
+
  	default:
  		/*
  		 * 'default' label to shut up the compiler and catch

@@ -371,9 +383,13 @@ static int watchdog_start(void)

Quoted 14 lines

drivers/watchdog/f71808e_wdt.c static int watchdog_start(void) · line 392

Quoted 12 lines

drivers/watchdog/f71808e_wdt.c +7 -3

  	superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);
  	superio_set_bit(watchdog.sioaddr, SIO_REG_ENABLE, 0);
-	superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDO_CONF,
-			F71808FG_FLAG_WDOUT_EN);
-
+	if (watchdog.type == f81865) {
+		superio_set_bit(watchdog.sioaddr, F81865_REG_WDO_CONF,
+				F81865_FLAG_WDOUT_EN);
+	} else {
+		superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDO_CONF,
+				F71808FG_FLAG_WDOUT_EN);
+	}

Unnecessary { }.

Ack, I will strip them out.

Quoted 7 lines

drivers/watchdog/f71808e_wdt.c +0 -0

  	superio_set_bit(watchdog.sioaddr, F71808FG_REG_WDT_CONF,
  			F71808FG_FLAG_WD_EN);

@@ -655,7 +671,12 @@ static int __init watchdog_init(int sioaddr)
  	superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);

Quoted 10 lines

drivers/watchdog/f71808e_wdt.c static int __init watchdog_init(int sioaddr) · line 679
Quoted 8 lines
drivers/watchdog/f71808e_wdt.c +6 -1
  	wdt_conf = superio_inb(sioaddr, F71808FG_REG_WDT_CONF);
-	watchdog.caused_reboot = wdt_conf & F71808FG_FLAG_WDTMOUT_STS;
+	if (watchdog.type == f81865) {
+		watchdog.caused_reboot = wdt_conf & F81865_FLAG_WDTMOUT_STS;
+	} else {
+		watchdog.caused_reboot = wdt_conf & F71808FG_FLAG_WDTMOUT_STS;
+	}
+
Unnecessary { }, and please no double empty lines.

Ack.

Quoted 4 lines

Quoted 4 lines
drivers/watchdog/f71808e_wdt.c +0 -0
  	superio_exit(sioaddr);
 

Quoted 12 lines

drivers/watchdog/f71808e_wdt.c static int __init f71808e_find(int sioaddr) · line 799

Quoted 11 lines

drivers/watchdog/f71808e_wdt.c +3 -0

@@ -770,6 +791,9 @@ static int __init f71808e_find(int sioaddr)
  		/* Confirmed (by datasheet) not to have a watchdog. */
  		err = -ENODEV;
  		goto exit;
+	case SIO_F81865_ID:
+		watchdog.type = f81865;
+		break;
  	default:
  		pr_info("Unrecognized Fintek device: %04x\n",
  			(unsigned int)devid);

All comments OK, will fix and resubmit as ps2 + separate patch for typo's.