From f21b6bd064abe66f015526d18431b6f761f95a02 Mon Sep 17 00:00:00 2001 From: ArturX Kloniecki Date: Thu, 4 Oct 2018 14:39:36 +0200 Subject: [PATCH] logging: Move trace class definitions to uapi/logging.h Move definitions into header that would be shared between SOF and SOFT. Paste SOF_ABI_VERSION into FW ready message. Also remove unused code from uapi/logging.h. Signed-off-by: ArturX Kloniecki --- src/include/sof/trace.h | 27 ------------ src/include/uapi/ipc.h | 3 +- src/include/uapi/logging.h | 70 ++++++++++++------------------ src/platform/baytrail/platform.c | 1 + src/platform/haswell/platform.c | 1 + src/platform/intel/cavs/platform.c | 1 + 6 files changed, 33 insertions(+), 70 deletions(-) diff --git a/src/include/sof/trace.h b/src/include/sof/trace.h index fcb741af6..323a7be2a 100644 --- a/src/include/sof/trace.h +++ b/src/include/sof/trace.h @@ -80,33 +80,6 @@ #define TRACE_BOOT_PLATFORM_DMIC (TRACE_BOOT_PLATFORM + 0x1a0) #define TRACE_BOOT_PLATFORM_IDC (TRACE_BOOT_PLATFORM + 0x1b0) -/* trace event classes - high 8 bits*/ -#define TRACE_CLASS_IRQ (1 << 24) -#define TRACE_CLASS_IPC (2 << 24) -#define TRACE_CLASS_PIPE (3 << 24) -#define TRACE_CLASS_HOST (4 << 24) -#define TRACE_CLASS_DAI (5 << 24) -#define TRACE_CLASS_DMA (6 << 24) -#define TRACE_CLASS_SSP (7 << 24) -#define TRACE_CLASS_COMP (8 << 24) -#define TRACE_CLASS_WAIT (9 << 24) -#define TRACE_CLASS_LOCK (10 << 24) -#define TRACE_CLASS_MEM (11 << 24) -#define TRACE_CLASS_MIXER (12 << 24) -#define TRACE_CLASS_BUFFER (13 << 24) -#define TRACE_CLASS_VOLUME (14 << 24) -#define TRACE_CLASS_SWITCH (15 << 24) -#define TRACE_CLASS_MUX (16 << 24) -#define TRACE_CLASS_SRC (17 << 24) -#define TRACE_CLASS_TONE (18 << 24) -#define TRACE_CLASS_EQ_FIR (19 << 24) -#define TRACE_CLASS_EQ_IIR (20 << 24) -#define TRACE_CLASS_SA (21 << 24) -#define TRACE_CLASS_DMIC (22 << 24) -#define TRACE_CLASS_POWER (23 << 24) -#define TRACE_CLASS_IDC (24 << 24) -#define TRACE_CLASS_CPU (25 << 24) - /* move to config.h */ #define TRACE 1 #define TRACEV 0 diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 38f856942..694ad4111 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -892,7 +892,8 @@ struct sof_ipc_fw_version { uint8_t date[12]; uint8_t time[10]; uint8_t tag[6]; - uint8_t pad[2]; /* Make sure the total size is 4 bytes aligned */ + uint16_t abi_version; + /* Make sure the total size is 4 bytes aligned */ } __attribute__((packed)); /* FW ready Message - sent by firmware when boot has completed */ diff --git a/src/include/uapi/logging.h b/src/include/uapi/logging.h index 94a903934..b97309c29 100644 --- a/src/include/uapi/logging.h +++ b/src/include/uapi/logging.h @@ -49,52 +49,38 @@ struct system_time { uint32_t val_u; /* Upper dword of current host time value */ }; +/* trace event classes - high 8 bits*/ +#define TRACE_CLASS_IRQ (1 << 24) +#define TRACE_CLASS_IPC (2 << 24) +#define TRACE_CLASS_PIPE (3 << 24) +#define TRACE_CLASS_HOST (4 << 24) +#define TRACE_CLASS_DAI (5 << 24) +#define TRACE_CLASS_DMA (6 << 24) +#define TRACE_CLASS_SSP (7 << 24) +#define TRACE_CLASS_COMP (8 << 24) +#define TRACE_CLASS_WAIT (9 << 24) +#define TRACE_CLASS_LOCK (10 << 24) +#define TRACE_CLASS_MEM (11 << 24) +#define TRACE_CLASS_MIXER (12 << 24) +#define TRACE_CLASS_BUFFER (13 << 24) +#define TRACE_CLASS_VOLUME (14 << 24) +#define TRACE_CLASS_SWITCH (15 << 24) +#define TRACE_CLASS_MUX (16 << 24) +#define TRACE_CLASS_SRC (17 << 24) +#define TRACE_CLASS_TONE (18 << 24) +#define TRACE_CLASS_EQ_FIR (19 << 24) +#define TRACE_CLASS_EQ_IIR (20 << 24) +#define TRACE_CLASS_SA (21 << 24) +#define TRACE_CLASS_DMIC (22 << 24) +#define TRACE_CLASS_POWER (23 << 24) +#define TRACE_CLASS_IDC (24 << 24) +#define TRACE_CLASS_CPU (25 << 24) + #define LOG_ENABLE 1 /* Enable logging */ #define LOG_DISABLE 0 /* Disable logging */ #define LOG_LEVEL_CRITICAL 1 /* (FDK fatal) */ -#define LOG_LEVEL_HIGH 2 /* (FDK error) */ -#define LOG_LEVEL_MEDIUM 3 /* (FDK warning) */ -#define LOG_LEVEL_LOW 4 -#define LOG_LEVEL_VERBOSE 5 - -/* - * Logging configuration per single core. - * - * (cavs: LogState). - */ -struct log_state_core { - uint32_t enabled; /* LOG_ENABLE / LOG_DISABLE */ - uint32_t level; /* Logging level, one of LOG_LEVEL_. */ -}; - -/* - * Logging settings. - * - * Aging timer period pecifies how frequently FW sends Log Buffer Status - * notification for new entries in case the usual notification sending - * criteria are not met (half of the buffer is full). - * - * FIFO full timer period specifies the latency of logging 'dropped log - * entries' information after the content is consumed by the driver but no - * new log entry appears (which would trigger logging 'dropped entries' as - * well). - * - * Core mask indicates which cores are targeted by the message. - * Bit[i] set to 1 means that configuration for i-th core, specified in - * logs_core[i] is valid. - * - * Logs core array specifies logging settings for each core. i-th entry is - * processed by FW only if bit[i] of core_mask is set. - * - * (cavs: LogStateInfo). - */ -struct log_state { - uint32_t aging_timer_period; /* Aging timer period */ - uint32_t fifo_full_timer_period; /* FIFO full timer period */ - uint32_t core_mask; /* Mask of cores */ - struct log_state_core logs_core[0]; /* Logging state per core */ -}; +#define LOG_LEVEL_VERBOSE 2 /* * Layout of a log fifo. diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index ede62278b..7fddf454c 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -69,6 +69,7 @@ static const struct sof_ipc_fw_ready ready = { .date = __DATE__, .time = __TIME__, .tag = SOF_TAG, + .abi_version = SOF_ABI_VERSION, }, /* TODO: add capabilities */ }; diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index 06871025c..187fa56e2 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -68,6 +68,7 @@ static const struct sof_ipc_fw_ready ready = { .date = __DATE__, .time = __TIME__, .tag = SOF_TAG, + .abi_version = SOF_ABI_VERSION, }, /* TODO: add capabilities */ }; diff --git a/src/platform/intel/cavs/platform.c b/src/platform/intel/cavs/platform.c index abab8e52e..15b16db6b 100644 --- a/src/platform/intel/cavs/platform.c +++ b/src/platform/intel/cavs/platform.c @@ -77,6 +77,7 @@ static const struct sof_ipc_fw_ready ready = { .date = __DATE__, .time = __TIME__, .tag = SOF_TAG, + .abi_version = SOF_ABI_VERSION, }, };