From 511b4454276c1d80931d32f975d5a65c8d03462e Mon Sep 17 00:00:00 2001 From: Benoit Romieu Date: Wed, 28 Mar 2012 17:11:28 +0200 Subject: [PATCH] intel_scu_watchdog: define CONFIG_DISABLE_SCU_WATCHDOG=y BZ: 27691 Enable the ability to disable the kernel watchdog by cmdline. For this purpose, add intel_scu_watchdog.disable_kernel_watchdog=1 to the cmdline. Needed for debug (breakpoints) Change-Id: Ib04d73ee9063487865720219cd0341b613eee416 Reviewed-on: http://android.intel.com:8080/41376 Reviewed-by: Gross, Mark Tested-by: Romieu, Benoit Reviewed-by: buildbot Tested-by: buildbot --- arch/x86/configs/i386_mfld_defconfig | 1 + drivers/watchdog/Kconfig | 9 +++++++++ drivers/watchdog/intel_scu_watchdog.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/x86/configs/i386_mfld_defconfig b/arch/x86/configs/i386_mfld_defconfig index 1a3d14f..eedce6d 100644 --- a/arch/x86/configs/i386_mfld_defconfig +++ b/arch/x86/configs/i386_mfld_defconfig @@ -1636,6 +1636,7 @@ CONFIG_WATCHDOG=y # CONFIG_WAFER_WDT is not set # CONFIG_I6300ESB_WDT is not set CONFIG_INTEL_SCU_WATCHDOG=y +CONFIG_DISABLE_SCU_WATCHDOG=y # CONFIG_ITCO_WDT is not set # CONFIG_IT8712F_WDT is not set # CONFIG_IT87_WDT is not set diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index d7f0917..2db643f 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -542,6 +542,15 @@ config INTEL_SCU_WATCHDOG To compile this driver as a module, choose M here. +config DISABLE_SCU_WATCHDOG + bool "De-activate Intel SCU Watchdog by cmdline for Mobile Platforms" + depends on INTEL_SCU_WATCHDOG + ---help--- + De-activate the watchdog by cmdline for Intel Mobile Platforms. + This allows to use breakpoints without resetting. + + Only for debug purpose. + config ITCO_WDT tristate "Intel TCO Timer/Watchdog" depends on (X86 || IA64) && PCI diff --git a/drivers/watchdog/intel_scu_watchdog.c b/drivers/watchdog/intel_scu_watchdog.c index bc1d820..935379b 100644 --- a/drivers/watchdog/intel_scu_watchdog.c +++ b/drivers/watchdog/intel_scu_watchdog.c @@ -747,7 +747,7 @@ static int __init intel_scu_watchdog_init(void) #endif if (disable_kernel_watchdog) { - pr_debug(PFX "disabling the timer\n"); + pr_err(PFX "%s: Disable kernel watchdog\n", __func__); /* Make sure timer is stopped */ ret = intel_scu_stop(); -- 2.7.4