/* lock to protect id_map and cpu data  */
 static DEFINE_SPINLOCK(id_map_lock);
 
+/* #define TRACE_ID_DEBUG 1 */
+#if defined(TRACE_ID_DEBUG) || defined(CONFIG_COMPILE_TEST)
+
+static void coresight_trace_id_dump_table(struct coresight_trace_id_map *id_map,
+                                         const char *func_name)
+{
+       pr_debug("%s id_map::\n", func_name);
+       pr_debug("Used = %*pb\n", CORESIGHT_TRACE_IDS_MAX, id_map->used_ids);
+       pr_debug("Pend = %*pb\n", CORESIGHT_TRACE_IDS_MAX, id_map->pend_rel_ids);
+}
+#define DUMP_ID_MAP(map)   coresight_trace_id_dump_table(map, __func__)
+#define DUMP_ID_CPU(cpu, id) pr_debug("%s called;  cpu=%d, id=%d\n", __func__, cpu, id)
+#define DUMP_ID(id)   pr_debug("%s called; id=%d\n", __func__, id)
+#define PERF_SESSION(n) pr_debug("%s perf count %d\n", __func__, n)
+#else
+#define DUMP_ID_MAP(map)
+#define DUMP_ID(id)
+#define DUMP_ID_CPU(cpu, id)
+#define PERF_SESSION(n)
+#endif
+
 /* unlocked read of current trace ID value for given CPU */
 static int _coresight_trace_id_read_cpu_id(int cpu)
 {
                cpumask_clear_cpu(cpu, &cpu_id_release_pending);
        }
        spin_unlock_irqrestore(&id_map_lock, flags);
+       DUMP_ID_MAP(id_map);
 }
 
 static int coresight_trace_id_map_get_cpu_id(int cpu, struct coresight_trace_id_map *id_map)
 get_cpu_id_out_unlock:
        spin_unlock_irqrestore(&id_map_lock, flags);
 
+       DUMP_ID_CPU(cpu, id);
+       DUMP_ID_MAP(id_map);
        return id;
 }
 
        }
 
        spin_unlock_irqrestore(&id_map_lock, flags);
+       DUMP_ID_CPU(cpu, id);
+       DUMP_ID_MAP(id_map);
 }
 
 static int coresight_trace_id_map_get_system_id(struct coresight_trace_id_map *id_map)
        id = coresight_trace_id_alloc_new_id(id_map, 0, true);
        spin_unlock_irqrestore(&id_map_lock, flags);
 
+       DUMP_ID(id);
+       DUMP_ID_MAP(id_map);
        return id;
 }
 
        spin_lock_irqsave(&id_map_lock, flags);
        coresight_trace_id_free(id, id_map);
        spin_unlock_irqrestore(&id_map_lock, flags);
+
+       DUMP_ID(id);
+       DUMP_ID_MAP(id_map);
 }
 
 /* API functions */
 void coresight_trace_id_perf_start(void)
 {
        atomic_inc(&perf_cs_etm_session_active);
+       PERF_SESSION(atomic_read(&perf_cs_etm_session_active));
 }
 EXPORT_SYMBOL_GPL(coresight_trace_id_perf_start);
 
 {
        if (!atomic_dec_return(&perf_cs_etm_session_active))
                coresight_trace_id_release_all_pending();
+       PERF_SESSION(atomic_read(&perf_cs_etm_session_active));
 }
 EXPORT_SYMBOL_GPL(coresight_trace_id_perf_stop);