android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc: qcom: Rename msm watchdog to wdt core

Browse Source 
In preparation to change the qcom watchdog to a new core
framework that future watchdog drivers will utilize, the name
of the file needs to be changed. Due to the number of changes
needed in the file we need to rename it to reflect its new purpose.

Change-Id: Iac6ad57fbc02866f6716a44d7bb4a62d97e4a810
Signed-off-by: Branden Bonaby <bbonaby@codeaurora.org>
This commit is contained in:
Branden Bonaby 2020-08-11 15:55:56 -07:00
parent cce9844ff5
commit 54100ecff9
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/soc/qcom/Kconfig
View File

@ -783,9 +783,18 @@ config CDSPRM_VTCM_DYNAMIC_DEBUG
enabled, the vtcm partition details are sent to the CDSP via rpmsg enabled, the vtcm partition details are sent to the CDSP via rpmsg
channel. channel.
config QCOM_WDT_CORE
tristate "Qualcomm Technologies, Inc. Watchdog Support"
depends on ARCH_QCOM
help
This enables the watchdog module. It causes kernel panic if the
watchdog times out. It allows for detection of cpu hangs and
deadlocks. It does not run during the bootup process, so it will
not catch any early lockups.
config QCOM_FORCE_WDOG_BITE_ON_PANIC config QCOM_FORCE_WDOG_BITE_ON_PANIC
bool "QCOM force watchdog bite on panic" bool "QCOM force watchdog bite on panic"
depends on QCOM_WATCHDOG depends on QCOM_WDT_CORE
help help
This forces a watchdog bite when the device restarts This forces a watchdog bite when the device restarts
due to a kernel panic. On certain MSM SoCs, due to a kernel panic. On certain MSM SoCs,
@ -794,7 +803,7 @@ config QCOM_FORCE_WDOG_BITE_ON_PANIC
config QCOM_WDOG_BITE_EARLY_PANIC config QCOM_WDOG_BITE_EARLY_PANIC
bool "QCOM early panic watchdog bite" bool "QCOM early panic watchdog bite"
depends on QCOM_WATCHDOG && QCOM_FORCE_WDOG_BITE_ON_PANIC depends on QCOM_WDT_CORE && QCOM_FORCE_WDOG_BITE_ON_PANIC
help help
This forces a watchdog bite early in panic sequence. On certain This forces a watchdog bite early in panic sequence. On certain
MSM SoCs, this provides us additional debugging information at the MSM SoCs, this provides us additional debugging information at the

1
drivers/soc/qcom/Makefile
View File

@ -84,6 +84,7 @@ obj-$(CONFIG_MSM_QBT_HANDLER) += qbt_handler.o
obj-$(CONFIG_QTI_CRYPTO_COMMON) += crypto-qti-common.o obj-$(CONFIG_QTI_CRYPTO_COMMON) += crypto-qti-common.o
obj-$(CONFIG_QTI_CRYPTO_TZ) += crypto-qti-tz.o obj-$(CONFIG_QTI_CRYPTO_TZ) += crypto-qti-tz.o
obj-$(CONFIG_QTI_HW_KEY_MANAGER) += hwkm.o crypto-qti-hwkm.o obj-$(CONFIG_QTI_HW_KEY_MANAGER) += hwkm.o crypto-qti-hwkm.o
obj-$(CONFIG_QCOM_WDT_CORE) += qcom_wdt_core.o
ifdef CONFIG_DEBUG_FS ifdef CONFIG_DEBUG_FS
obj-$(CONFIG_MSM_RPM_SMD) += rpm-smd-debug.o obj-$(CONFIG_MSM_RPM_SMD) += rpm-smd-debug.o
endif endif

2
drivers/soc/qcom/qcom_watchdog.c → drivers/soc/qcom/qcom_wdt_core.c
View File

@ -770,7 +770,7 @@ static int __init init_watchdog(void)
{ {
return platform_driver_register(&msm_watchdog_driver); return platform_driver_register(&msm_watchdog_driver);
} }
#if IS_MODULE(CONFIG_QCOM_WATCHDOG) #if IS_MODULE(CONFIG_QCOM_WDT_CORE)
module_init(init_watchdog); module_init(init_watchdog);
#else #else
pure_initcall(init_watchdog); pure_initcall(init_watchdog);

2
include/soc/qcom/watchdog.h
View File

@ -18,7 +18,7 @@
#define WDOG_BITE_EARLY_PANIC 0 #define WDOG_BITE_EARLY_PANIC 0
#endif #endif
#if IS_ENABLED(CONFIG_QCOM_WATCHDOG) #if IS_ENABLED(CONFIG_QCOM_WDT_CORE)
void msm_trigger_wdog_bite(void); void msm_trigger_wdog_bite(void);
#else #else
static inline void msm_trigger_wdog_bite(void) { } static inline void msm_trigger_wdog_bite(void) { }