Skip to contentSkip to conversation

watchdog - v2.6.36-rc1 - part 2

GIT PULL Wim Van Sebroeck 1 participant 1 message Aug 13, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

This will update the following files:

 drivers/watchdog/Kconfig |   19 +-
 drivers/watchdog/hpwdt.c |  306 ++++++++++++++++++++++++++---------------------
 2 files changed, 186 insertions(+), 139 deletions(-)

with these Changes:

Author: dann frazier <[email protected]>
Date:   Tue Jul 27 17:51:02 2010 -0600

watchdog: hpwdt (12/12): Make NMI decoding a compile-time option

hpwdt is quite functional without the NMI decoding feature. This change lets users disable the NMI portion at compile-time via the new HPWDT_NMI_DECODING config option.

Author: dann frazier <[email protected]>
Date:   Wed Jul 28 12:38:43 2010 -0600

watchdog: hpwdt (11/12): move NMI-decoding init and exit to seperate functions

Move NMI-decoding initialisation and exit code to seperate functions so that we can ifdef-out parts of it in the future.

Also, this is for a device, so let's use dev_info instead of printk.

Author: dann frazier <[email protected]>
Date:   Tue Jul 27 17:51:01 2010 -0600

watchdog: hpwdt (10/12): Use "decoding" instead of "sourcing"

The term "decoding" more clearly explains what hpwdt is doing. It isn't just finding the source of the interrupt, but rather aids in decoding what the interrupt means.

Author: dann frazier <[email protected]>
Date:   Tue Jul 27 17:50:49 2010 -0600

watchdog: hpwdt (9/12): hpwdt_pretimeout reorganization

Reorganize this function to remove excess indentation and highlight the single return code. (No functional change).

Author: dann frazier <[email protected]>
Date:   Wed Jun 2 16:23:41 2010 -0600

watchdog: hpwdt (8/12): implement WDIOC_GETTIMELEFT

Let applications check the amount of time left before the watchdog will fire.

Author: dann frazier <[email protected]>
Date:   Wed Jun 2 16:23:40 2010 -0600

watchdog: hpwdt (7/12): allow full range of timer values supported by hardware

The hpwdt timer is a 16 bit value with 128ms resolution. Let applications use this entire range.

Author: dann frazier <[email protected]>
Date:   Wed Jun 2 16:23:39 2010 -0600

watchdog: hpwdt (6/12): Introduce SECS_TO_TICKS() macro

Define a macro to convert from seconds to timer ticks.

Author: dann frazier <[email protected]>
Date:   Tue Jul 27 17:50:59 2010 -0600

watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strict

The 32-bit assembly is guarded by an #ifndef CONFIG_X86_64. Kconfig prevents us from building this driver on !X86, so that happens to suffice - but we should really lock it down to #ifdef CONFIG_X86_32.

Author: dann frazier <[email protected]>
Date:   Tue Jul 27 17:50:57 2010 -0600

watchdog: hpwdt (4/12): Despecificate driver from iLO2

This driver supports both iLO2 and iLO3, but our user-visible strings currently only reference iLO2. Let's just call it "iLO2+" to avoid having to update strings for each iLO generation. This driver doesn't support iLO ASICs prior to iLO2, but that is sufficiently explained in Kconfig.

Author: dann frazier <[email protected]>
Date:   Tue Jul 27 17:50:54 2010 -0600

watchdog: hpwdt (3/12): Group NMI sourcing specific items together

* Group together includes specific to NMI sourcing
* Group defines only used by NMI sourcing together
* Group declarations specific to NMI sourcing together

This gives a clean seperation of watchdog specific items and NMI sourcing specific items (which is needed for making it possible to build hpwdt without the NMI functionality).

Author: dann frazier <[email protected]>
Date:   Tue Jul 27 17:50:54 2010 -0600

watchdog: hpwdt (2/12): Group options that affect watchdog behavior together

Reorganization only.

Author: dann frazier <[email protected]>
Date:   Tue Jul 27 17:50:50 2010 -0600

watchdog: hpwdt (1/12): clean-up include-files.

* remove unnecessary includes
* We use a spinlock, but lacked the include
* We need bitops.h for test_and_set_bit/clear_bit

The Changes can also be looked at on:

	http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================

drivers/watchdog/Kconfig +12 -7
index 4d2992a..b036677 100644
@@ -574,16 +574,21 @@ config IT87_WDT
 	  be called it87_wdt.
 
 config HP_WATCHDOG
-	tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
+	tristate "HP Proliant iLO2+ Hardware Watchdog Timer"
 	depends on X86
 	help
 	  A software monitoring watchdog and NMI sourcing driver. This driver
-	  will detect lockups and provide stack trace. Also, when an NMI
-	  occurs this driver will make the necessary BIOS calls to log
-	  the cause of the NMI. This is a driver that will only load on a
-	  HP ProLiant system with a minimum of iLO2 support.
-	  To compile this driver as a module, choose M here: the
-	  module will be called hpwdt.
+	  will detect lockups and provide a stack trace. This is a driver that
+	  will only load on a HP ProLiant system with a minimum of iLO2 support.
+	  To compile this driver as a module, choose M here: the module will be
+	  called hpwdt.
+
+config HPWDT_NMI_DECODING
+	bool "NMI decoding support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
+	depends on HP_WATCHDOG
+	help
+	  When an NMI occurs this feature will make the necessary BIOS calls to
+	  log the cause of the NMI.
 
 config SC1200_WDT
 	tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
drivers/watchdog/hpwdt.c +174 -132

477 lines not on this page · raw message