From 79970bf4910b8e60e9c7aa4e365c829eb1e249c7 Mon Sep 17 00:00:00 2001 From: Hosung Kim Date: Fri, 24 May 2019 15:20:13 +0900 Subject: [PATCH] [RAMEN9610-20734][COMMON] lib: dss: fix to support DSS disabled This commit supports when CONFIG_DEBUG_SNAPSHOT is disabled. Change-Id: I9706d1bb2b715fa7c4cf2a1059fa4498c9e451fc Signed-off-by: Hosung Kim --- drivers/soc/samsung/debug/exynos9610-itmon.c | 6 +----- drivers/soc/samsung/exynos-reboot.c | 1 + include/linux/debug-snapshot-helper.h | 7 +++++++ include/linux/debug-snapshot.h | 19 ++++++------------- include/soc/samsung/exynos-debug.h | 2 +- lib/debug-snapshot-local.h | 2 +- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/drivers/soc/samsung/debug/exynos9610-itmon.c b/drivers/soc/samsung/debug/exynos9610-itmon.c index 69f0b0a8492e..dc5bbbee7a80 100644 --- a/drivers/soc/samsung/debug/exynos9610-itmon.c +++ b/drivers/soc/samsung/debug/exynos9610-itmon.c @@ -19,6 +19,7 @@ #include #include #include +#include #if defined(CONFIG_SEC_MODEM_IF) #include #endif @@ -502,11 +503,6 @@ MODULE_DEVICE_TABLE(of, itmon_dt_match); #define EXYNOS_PMU_BURNIN_CTRL 0x0A08 #define BIT_ENABLE_DBGSEL_WDTRESET BIT(25) -#ifdef CONFIG_S3C2410_WATCHDOG -extern int s3c2410wdt_set_emergency_reset(unsigned int timeout, int index); -#else -#define s3c2410wdt_set_emergency_reset(a, b) do { } while (0) -#endif static void itmon_switch_scandump(void) { unsigned int val; diff --git a/drivers/soc/samsung/exynos-reboot.c b/drivers/soc/samsung/exynos-reboot.c index ed6f086397c6..9ee2ddc0600a 100644 --- a/drivers/soc/samsung/exynos-reboot.c +++ b/drivers/soc/samsung/exynos-reboot.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "../../../lib/debug-snapshot-local.h" diff --git a/include/linux/debug-snapshot-helper.h b/include/linux/debug-snapshot-helper.h index 136d3a369f45..8e5033c9b2d9 100644 --- a/include/linux/debug-snapshot-helper.h +++ b/include/linux/debug-snapshot-helper.h @@ -16,6 +16,7 @@ #ifndef DEBUG_SNAPSHOT_HELPER_H #define DEBUG_SNAPSHOT_HELPER_H +#ifdef CONFIG_DEBUG_SNAPSHOT struct dbg_snapshot_helper_ops { void (*soc_early_panic)(void *); @@ -46,7 +47,13 @@ struct dbg_snapshot_helper_ops { }; extern void dbg_snapshot_register_soc_ops(struct dbg_snapshot_helper_ops *ops); +extern void dbg_snapshot_scratch_reg(unsigned int val); extern bool dbg_snapshot_is_scratch(void); +#else +#define dbg_snapshot_register_soc_ops(a) do { } while(0) +#define dbg_snapshot_scratch_reg(a) do { } while(0) +#define dbg_snapshot_is_scratch() do { } while(0) +#endif #ifdef CONFIG_ARM64 struct dbg_snapshot_mmu_reg { diff --git a/include/linux/debug-snapshot.h b/include/linux/debug-snapshot.h index 0acc2a59dd8f..0c4535661ff4 100644 --- a/include/linux/debug-snapshot.h +++ b/include/linux/debug-snapshot.h @@ -160,16 +160,6 @@ void dbg_snapshot_check_crash_key(unsigned int code, int value); #define dbg_snapshot_check_crash_key(a,b) do { } while(0) #endif -#ifdef CONFIG_S3C2410_WATCHDOG -extern int s3c2410wdt_set_emergency_stop(int index); -extern int s3c2410wdt_set_emergency_reset(unsigned int timeout, int index); -extern int s3c2410wdt_keepalive_emergency(bool reset, int index); -#else -#define s3c2410wdt_set_emergency_stop(a) (-1) -#define s3c2410wdt_set_emergency_reset(a, b) do { } while(0) -#define s3c2410wdt_keepalive_emergency(a, b) do { } while(0) -#endif - #ifdef CONFIG_DEBUG_SNAPSHOT_BINDER extern void dbg_snapshot_binder(struct trace_binder_transaction_base *base, struct trace_binder_transaction *transaction, @@ -214,7 +204,6 @@ extern void dbg_snapshot_binder(struct trace_binder_transaction_base *base, #define dbg_snapshot_post_panic() do { } while(0) #define dbg_snapshot_post_reboot(a) do { } while(0) #define dbg_snapshot_set_hardlockup(a) do { } while(0) -#define dbg_snapshot_get_hardlockup() do { } while(0) #define dbg_snapshot_get_debug_level() do { } while(0) #define dbg_snapshot_get_debug_level_reg() do { } while (0) #define dbg_snapshot_check_crash_key(a,b) do { } while(0) @@ -225,6 +214,8 @@ extern void dbg_snapshot_binder(struct trace_binder_transaction_base *base, #define dbg_snapshot_hook_hardlockup_entry(a) do { } while(0) #define dbg_snapshot_hook_hardlockup_exit() do { } while(0) #define dbg_snapshot_binder(a,b,c) do { } while(0) +#define dbg_snapshot_print_notifier_call(a,b,c) do { } while(0) +#define dbg_snapshot_save_log(a,b) do { } while(0) static inline unsigned int dbg_snapshot_get_item_size(char *name) { @@ -243,11 +234,13 @@ static inline bool dbg_snapshot_dumper_one(void *v_dumper, { return false; } -static int dbg_snapshot_add_bl_item_info(const char *name, - unsigned int paddr, unsigned int size) +static inline int dbg_snapshot_get_hardlockup(void) { return 0; } + +#define dbg_snapshot_add_bl_item_info(a,b,c) do { } while(0) + #endif /* CONFIG_DEBUG_SNAPSHOT */ extern void dbg_snapshot_soc_helper_init(void); diff --git a/include/soc/samsung/exynos-debug.h b/include/soc/samsung/exynos-debug.h index aaaca6f31481..3907d15c030b 100644 --- a/include/soc/samsung/exynos-debug.h +++ b/include/soc/samsung/exynos-debug.h @@ -16,7 +16,7 @@ #ifndef EXYNOS_DEBUG_H #define EXYNOS_DEBUG_H -#ifdef CONFIG_S3C2410_WATCHDOG +#if defined(CONFIG_S3C2410_WATCHDOG) && defined(CONFIG_DEBUG_SNAPSHOT) extern int s3c2410wdt_set_emergency_stop(int index); extern int s3c2410wdt_set_emergency_reset(unsigned int timeout, int index); extern int s3c2410wdt_keepalive_emergency(bool reset, int index); diff --git a/lib/debug-snapshot-local.h b/lib/debug-snapshot-local.h index 47997baa1b8b..566c548daf2f 100644 --- a/lib/debug-snapshot-local.h +++ b/lib/debug-snapshot-local.h @@ -28,7 +28,7 @@ extern void dbg_snapshot_init_utils(void); extern void dbg_snapshot_init_helper(void); extern void __iomem *dbg_snapshot_get_base_vaddr(void); extern void __iomem *dbg_snapshot_get_base_paddr(void); -extern void dbg_snapshot_scratch_reg(unsigned int val); + extern void dbg_snapshot_print_panic_report(void); extern void dbg_snapshot_dump_task_info(void); -- 2.20.1