From 4d991c606e7d5d6eed205af5cd74aa9869fee304 Mon Sep 17 00:00:00 2001 From: Hosung Kim Date: Fri, 3 Aug 2018 16:25:33 +0900 Subject: [PATCH] [ERD][NEUS7920-76] [COMMON] lib: dss: remove dbg_snapshot_clockevents logging Change-Id: Ida00fe5f17b5bc4262cf3d7675b8db78c6862568 Signed-off-by: Hosung Kim --- kernel/time/clockevents.c | 3 --- lib/debug-snapshot-log.c | 27 --------------------------- lib/debug-snapshot-log.h | 13 ------------- 3 files changed, 43 deletions(-) diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 3d2baafdbac6..a5a744a6a424 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c @@ -254,7 +254,6 @@ static int clockevents_program_min_delta(struct clock_event_device *dev) dev->retries++; clc = ((unsigned long long) delta * dev->mult) >> dev->shift; - dbg_snapshot_clockevent(clc, delta, &dev->next_event); if (dev->set_next_event((unsigned long) clc, dev) == 0) return 0; @@ -292,7 +291,6 @@ static int clockevents_program_min_delta(struct clock_event_device *dev) dev->retries++; clc = ((unsigned long long) delta * dev->mult) >> dev->shift; - dbg_snapshot_clockevent(clc, delta, &dev->next_event); return dev->set_next_event((unsigned long) clc, dev); } @@ -339,7 +337,6 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires, delta = max(delta, (int64_t) dev->min_delta_ns); clc = ((unsigned long long) delta * dev->mult) >> dev->shift; - dbg_snapshot_clockevent(clc, delta, &dev->next_event); rc = dev->set_next_event((unsigned long) clc, dev); return (rc && force) ? clockevents_program_min_delta(dev) : rc; diff --git a/lib/debug-snapshot-log.c b/lib/debug-snapshot-log.c index 83471dd119a7..b0534d1bfad5 100644 --- a/lib/debug-snapshot-log.c +++ b/lib/debug-snapshot-log.c @@ -121,7 +121,6 @@ struct dbg_snapshot_log_idx { atomic_t binder_log_idx; #endif #ifndef CONFIG_DEBUG_SNAPSHOT_MINIMIZED_MODE - atomic_t clockevent_log_idx[DSS_NR_CPUS]; atomic_t printkl_log_idx; atomic_t printk_log_idx; #endif @@ -218,9 +217,6 @@ void __init dbg_snapshot_init_log_idx(void) for (i = 0; i < DSS_NR_CPUS; i++) { atomic_set(&(dss_idx.task_log_idx[i]), -1); atomic_set(&(dss_idx.work_log_idx[i]), -1); -#ifndef CONFIG_DEBUG_SNAPSHOT_MINIMIZED_MODE - atomic_set(&(dss_idx.clockevent_log_idx[i]), -1); -#endif atomic_set(&(dss_idx.cpuidle_log_idx[i]), -1); atomic_set(&(dss_idx.irq_log_idx[i]), -1); #ifdef CONFIG_DEBUG_SNAPSHOT_SPINLOCK @@ -1360,29 +1356,6 @@ void dbg_snapshot_reg(unsigned int read, size_t val, size_t reg, int en) #endif #ifndef CONFIG_DEBUG_SNAPSHOT_MINIMIZED_MODE -void dbg_snapshot_clockevent(unsigned long long clc, int64_t delta, void *next_event) -{ - struct dbg_snapshot_item *item = &dss_items[dss_desc.kevents_num]; - - if (unlikely(!dss_base.enabled || !item->entry.enabled)) - return; - { - int cpu = raw_smp_processor_id(); - unsigned long j, i = atomic_inc_return(&dss_idx.clockevent_log_idx[cpu]) & - (ARRAY_SIZE(dss_log->clockevent[0]) - 1); - - dss_log->clockevent[cpu][i].time = cpu_clock(cpu); - dss_log->clockevent[cpu][i].mct_cycle = clc; - dss_log->clockevent[cpu][i].delta_ns = delta; - dss_log->clockevent[cpu][i].next_event = *((ktime_t *)next_event); - - for (j = 0; j < dss_desc.callstack; j++) { - dss_log->clockevent[cpu][i].caller[j] = - (void *)((size_t)return_address(j + 1)); - } - } -} - void dbg_snapshot_printk(const char *fmt, ...) { struct dbg_snapshot_item *item = &dss_items[dss_desc.kevents_num]; diff --git a/lib/debug-snapshot-log.h b/lib/debug-snapshot-log.h index c672225998a6..9b3529e4200f 100644 --- a/lib/debug-snapshot-log.h +++ b/lib/debug-snapshot-log.h @@ -324,19 +324,6 @@ struct dbg_snapshot_log { #endif #ifndef CONFIG_DEBUG_SNAPSHOT_MINIMIZED_MODE - struct __clockevent_log { - unsigned long long time; - unsigned long long mct_cycle; -#ifdef CONFIG_DEBUG_SNAPSHOT_LINUX_BUILD - int64_t delta_ns; - ktime_t next_event; -#else - long long delta_ns; - long long next_event; -#endif - void *caller[DSS_CALLSTACK_MAX_NUM]; - } clockevent[DSS_NR_CPUS][DSS_LOG_MAX_NUM]; - struct __printkl_log { unsigned long long time; int cpu; -- 2.20.1