trace: add 'atomic' argument to mtrace_dict_entry()

Preparation to use mtrace_dict_entry() also the _log_message() level too
and not just for very early mtrace_printf() tracing.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>

Author: marc-hb

src/include/sof/trace/trace.h

@@ -116,6 +116,7 @@ struct trace_filter {
  * image size. This way more elaborate log messages are possible and encouraged,
  * for better debugging experience, without worrying about runtime performance.
  */
+
 /* Map the different trace_xxxx_with_ids(... ) levels to the
  * _trace_event_with_ids(level_xxxx, ...) macro shared across log
  * levels.
@@ -158,6 +159,20 @@ int trace_filter_update(const struct trace_filter *elem);
 #define _trace_event_atomic_with_ids(lvl, class, ctx, id_1, id_2, format, ...)	\
 	_log_message(trace_log_filtered, true, lvl, class, ctx, id_1, id_2, format, ##__VA_ARGS__)
 
+/**
+ * Appends one SOF dictionary entry and log statement to the ring buffer
+ * implementing the 'etrace' in shared memory.
+ *
+ * @param atomic_context Take the trace->lock if false.
+ * @param log_entry_pointer dictionary index produced by the
+ *        _DECLARE_LOG_ENTRY macro.
+ * @param n_args number of va_args
+ */
+void mtrace_dict_entry(bool atomic_context, uint32_t log_entry_pointer, int n_args, ...);
+
+/** Posts a fully prepared log header + log entry */
+void mtrace_event(const char *complete_packet, uint32_t length);
+
 /** The start of this linker output MUST match the 'ldc_entry_header'
  *  struct defined in the logger program running in user space.
  */
@@ -431,16 +446,11 @@ struct tr_ctx {
 			      too_many_mtrace_printf_arguments);	\
 		_DECLARE_LOG_ENTRY(log_level, format_str, _TRACE_INV_CLASS, \
 				   META_COUNT_VARAGS_BEFORE_COMPILE(__VA_ARGS__)); \
-		mtrace_dict_entry((uint32_t)&log_entry,			\
+		mtrace_dict_entry(true, (uint32_t)&log_entry,			\
 				  META_COUNT_VARAGS_BEFORE_COMPILE(__VA_ARGS__), \
 				  ##__VA_ARGS__);			\
 	} while (0)
 
-/** Adds log_header prefix and appends  arguments before sending */
-void mtrace_dict_entry(uint32_t log_entry_pointer, int n_args, ...);
-
-/** Posts a fully prepared log header + log entry */
-void mtrace_event(const char *complete_packet, uint32_t length);
 
 #else
 

src/trace/trace.c

@@ -532,7 +532,7 @@ void trace_init(struct sof *sof)
 	dma_trace_init_early(sof);
 }
 
-void mtrace_dict_entry(uint32_t dict_entry_address, int n_args, ...)
+void mtrace_dict_entry(bool atomic_context, uint32_t dict_entry_address, int n_args, ...)
 {
 	va_list ap;
 	int i;
@@ -544,9 +544,18 @@ void mtrace_dict_entry(uint32_t dict_entry_address, int n_args, ...)
 		   dict_entry_address, tstamp);
 
 	va_start(ap, n_args);
-	for (i = 0; i < n_args; i++)
+	for (i = 0; i < MIN(n_args, _TRACE_EVENT_MAX_ARGUMENT_COUNT); i++)
 		args[i] = va_arg(ap, uint32_t);
 	va_end(ap);
 
-	mtrace_event(packet, MESSAGE_SIZE(n_args));
+	if (atomic_context) {
+		mtrace_event(packet, MESSAGE_SIZE(n_args));
+	} else {
+		struct trace * const trace = trace_get();
+		uint32_t saved_flags;
+
+		spin_lock_irq(&trace->lock, saved_flags);
+		mtrace_event(packet, MESSAGE_SIZE(n_args));
+		spin_unlock_irq(&trace->lock, saved_flags);
+	}
 }