Skip to contentSkip to conversation

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

PATCH Wim Van Sebroeck 1 participant 1 message Aug 6, 2010

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

Author: dann frazier
Email: [email protected]
Date: Tue, 27 Jul 2010 17:51:02 -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.

drivers/watchdog/Kconfig +11 -6
index fc3d6b5..3d77697 100644
@@ -578,12 +578,17 @@
 	depends on X86
 	help
 	  A software monitoring watchdog and NMI sourcing driver. This driver
-	  will detect lockups and provide a 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 +36 -3
index 00aea69..68f5e37 100644
@@ -27,12 +27,14 @@
 #include <linux/types.h>
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
+#ifdef CONFIG_HPWDT_NMI_DECODING
 #include <linux/dmi.h>
 #include <linux/spinlock.h>
 #include <linux/nmi.h>
 #include <linux/kdebug.h>
 #include <linux/notifier.h>
 #include <asm/cacheflush.h>
+#endif /* CONFIG_HPWDT_NMI_DECODING */
 
 #define HPWDT_VERSION			"1.1.1"
 #define SECS_TO_TICKS(secs)		((secs) * 1000 / 128)
@@ -57,6 +59,7 @@
 };
 MODULE_DEVICE_TABLE(pci, hpwdt_devices);
 
+#ifdef CONFIG_HPWDT_NMI_DECODING
 #define PCI_BIOS32_SD_VALUE		0x5F32335F	/* "_32_" */
 #define CRU_BIOS_SIGNATURE_VALUE	0x55524324
 #define PCI_BIOS32_PARAGRAPH_LEN	16
@@ -407,6 +410,7 @@
 }
 /* ------------------------------------------------------------------------- */
 #endif /* CONFIG_X86_64 */
+#endif /* CONFIG_HPWDT_NMI_DECODING */
 
 /*
  *	Watchdog operations
@@ -455,6 +459,7 @@
 	return TICKS_TO_SECS(ioread16(hpwdt_timer_reg));
 }
 
+#ifdef CONFIG_HPWDT_NMI_DECODING
 /*
  *	NMI Handler
  */
@@ -487,6 +492,7 @@
 out:
 	return NOTIFY_OK;
 }
+#endif /* CONFIG_HPWDT_NMI_DECODING */
 
 /*
  *	/dev/watchdog handling
@@ -624,15 +630,18 @@
 	.fops = &hpwdt_fops,
 };
 
+#ifdef CONFIG_HPWDT_NMI_DECODING
 static struct notifier_block die_notifier = {
 	.notifier_call = hpwdt_pretimeout,
 	.priority = 0,
 };
+#endif /* CONFIG_HPWDT_NMI_DECODING */
 
 /*
  *	Init & Exit
  */
 
+#ifdef CONFIG_HPWDT_NMI_DECODING
 #ifdef ARCH_HAS_NMI_WATCHDOG
 static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
 {
@@ -653,13 +662,21 @@
 	dev_warn(&dev->dev, "NMI decoding is disabled. "
 		"Your kernel does not support a NMI Watchdog.\n");
 }
-#endif
+#endif /* ARCH_HAS_NMI_WATCHDOG */
+#else /* !CONFIG_HPWDT_NMI_DECODING */
+static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
+{
+}
+#endif /* CONFIG_HPWDT_NMI_DECODING */
 
 static int __devinit hpwdt_init_one(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
 	int retval;
 	char *buf;
+#ifdef CONFIG_HPWDT_NMI_DECODING
+	char *tmp;
+#endif
 
 	/*
 	 * Check if we can do NMI decoding or not
@@ -698,6 +715,7 @@
 	if (hpwdt_change_timer(soft_margin))
 		hpwdt_change_timer(DEFAULT_MARGIN);
 
+#ifdef CONFIG_HPWDT_NMI_DECODING
 	/*
 	 * We need to map the ROM to get the CRU service.
 	 * For 32 bit Operating Systems we need to go through the 32 Bit
@@ -734,6 +752,7 @@
 			retval);
 		goto error_die_notifier;
 	}
+#endif
 
 	retval = misc_register(&hpwdt_miscdev);
 	if (retval < 0) {
@@ -744,25 +763,35 @@
 	}
 
 	buf = kasprintf(GFP_KERNEL, "hp Watchdog Timer Driver: %s"
-			", timer margin: %d seconds (nowayout=%d)"
+			", timer margin: %d seconds (nowayout=%d)",
+			HPWDT_VERSION, soft_margin, nowayout);
+	if (!buf)
+		goto error_nomem;
+#ifdef CONFIG_HPWDT_NMI_DECODING
+	tmp = buf;
+	buf = kasprintf(GFP_KERNEL, "%s"
 			", allow kernel dump: %s (default = 0/OFF)"
 			", priority: %s (default = 0/LAST)",
-			HPWDT_VERSION, soft_margin, nowayout,
+			buf,
 			(allow_kdump == 0) ? "OFF" : "ON",
 			(priority == 0) ? "LAST" : "FIRST");
+	kfree(tmp);
 	if (!buf)
 		goto error_nomem;
+#endif
 	dev_info(&dev->dev, "%s.\n", buf);
 	kfree(buf);
 
 	return 0;
 
 error_misc_register:
+#ifdef CONFIG_HPWDT_NMI_DECODING
 	unregister_die_notifier(&die_notifier);
 error_die_notifier:
 	if (cru_rom_addr)
 		iounmap(cru_rom_addr);
 error_get_cru:
+#endif
 	pci_iounmap(dev, pci_mem_addr);
 error_pci_iomap:
 	pci_disable_device(dev);
@@ -776,10 +805,12 @@
 		hpwdt_stop();
 
 	misc_deregister(&hpwdt_miscdev);
+#ifdef CONFIG_HPWDT_NMI_DECODING
 	unregister_die_notifier(&die_notifier);
 
 	if (cru_rom_addr)
 		iounmap(cru_rom_addr);
+#endif /* CONFIG_HPWDT_NMI_DECODING */
 	pci_iounmap(dev, pci_mem_addr);
 	pci_disable_device(dev);
 }
@@ -814,12 +845,14 @@
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
 		__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
+#ifdef CONFIG_HPWDT_NMI_DECODING
 module_param(allow_kdump, int, 0);
 MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs");
 
 module_param(priority, int, 0);
 MODULE_PARM_DESC(priority, "The hpwdt driver handles NMIs first or last"
 		" (default = 0/Last)\n");
+#endif
 
 module_init(hpwdt_init);
 module_exit(hpwdt_cleanup);