From 27d0e459904522cebcd9e5964dcf34b47da59b4a Mon Sep 17 00:00:00 2001 From: Hosung Kim Date: Tue, 19 Jun 2018 14:00:28 +0900 Subject: [PATCH] [COMMON] lib: dss: fix condition exiting hook hardlockup function This commit fixes the condition when detecting hardlockup or allcore hardlockup. If path is return, others should be waited for 3 seconds. Checking dss_desc.allcorelockup_detected variable is not valid in this function. Change-Id: I4f65109368762cd1249a17af8d6d32f1cf873afa Signed-off-by: Hosung Kim --- lib/debug-snapshot-utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/debug-snapshot-utils.c b/lib/debug-snapshot-utils.c index c463dc3f9597..ba6f8529366d 100644 --- a/lib/debug-snapshot-utils.c +++ b/lib/debug-snapshot-utils.c @@ -71,7 +71,7 @@ void dbg_snapshot_hook_hardlockup_entry(void *v_regs) int ret; unsigned long last_pc; struct pt_regs *regs; - unsigned long timeout = USEC_PER_SEC * 3; + unsigned long timeout = USEC_PER_SEC * 2; do { /* @@ -93,8 +93,9 @@ void dbg_snapshot_hook_hardlockup_entry(void *v_regs) /* Then, we expect bug() function works well */ pr_emerg("\n--------------------------------------------------------------------------\n" - " Debugging Information for Hardlockup core - CPU %d" - "\n--------------------------------------------------------------------------\n\n", cpu); + " Debugging Information for Hardlockup core - CPU(%d), Mask:(0x%x)" + "\n--------------------------------------------------------------------------\n\n", + cpu, dss_desc.hardlockup_core_mask); } } @@ -103,8 +104,7 @@ void dbg_snapshot_hook_hardlockup_exit(void) int cpu = raw_smp_processor_id(); if (!dss_base.enabled || - !dss_desc.hardlockup_core_mask || - !dss_desc.allcorelockup_detected) { + !dss_desc.hardlockup_core_mask) { return; } -- 2.20.1