Skip to content

Commit

Permalink
base_fw: sync time between host and fw for logging
Browse files Browse the repository at this point in the history
It is a general implementation for logging and it doesn't use intel
audio hardware feature like ART counter. 64bits timestamp is needed
for accuracy since the timestamp used by host is beyond 32bits in most
cases.

Signed-off-by: Rander Wang <[email protected]>
  • Loading branch information
RanderWang committed Nov 15, 2023
1 parent 529277f commit a123465
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 4 deletions.
1 change: 1 addition & 0 deletions app/boards/intel_adsp_ace15_mtpm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,4 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y

CONFIG_PROBE=y
CONFIG_PROBE_DMA_MAX=2
CONFIG_LOG_TIMESTAMP_64BIT=y
1 change: 1 addition & 0 deletions app/boards/intel_adsp_ace20_lnl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,4 @@ CONFIG_COMP_KPB=y
CONFIG_COMP_ARIA=y
CONFIG_CLOCK_CONTROL_ADSP=y
CONFIG_CLOCK_CONTROL=y
CONFIG_LOG_TIMESTAMP_64BIT=y
1 change: 1 addition & 0 deletions app/boards/intel_adsp_cavs25.conf
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,4 @@ CONFIG_DMA_DW_FIFO_PARTITION=y
CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y

CONFIG_HEAP_MEM_POOL_SIZE=8192
CONFIG_LOG_TIMESTAMP_64BIT=y
1 change: 1 addition & 0 deletions app/boards/intel_adsp_cavs25_tgph.conf
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ CONFIG_DMA_DW_FIFO_PARTITION=y
CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y

CONFIG_HEAP_MEM_POOL_SIZE=8192
CONFIG_LOG_TIMESTAMP_64BIT=y
29 changes: 25 additions & 4 deletions src/audio/base_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <zephyr/device.h>
#include <zephyr/drivers/counter.h>
#endif
#include <zephyr/logging/log_ctrl.h>

/* TODO: Remove platform-specific code, see https://github.com/thesofproject/sof/issues/7549 */
#if defined(CONFIG_SOC_SERIES_INTEL_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
Expand All @@ -32,6 +33,7 @@ DECLARE_SOF_RT_UUID("basefw", basefw_comp_uuid, 0xe398c32, 0x5ade, 0xba4b,
DECLARE_TR_CTX(basefw_comp_tr, SOF_UUID(basefw_comp_uuid), LOG_LEVEL_INFO);

static struct ipc4_system_time_info global_system_time_info;
static uint64_t time_delta;

static int basefw_config(uint32_t *data_offset, char *data)
{
Expand Down Expand Up @@ -234,23 +236,42 @@ static int basefw_mem_state_info(uint32_t *data_offset, char *data)
return 0;
}

static log_timestamp_t basefw_get_timestamp(void)
{
return k_cycle_get_64() + time_delta;
}

static uint32_t basefw_set_system_time(uint32_t param_id,
bool first_block,
bool last_block,
uint32_t data_offset,
const char *data)
{
/* TODO: configurate time to logging subsystem */
uint64_t host_time, host_time_cycle;

if (!(first_block && last_block))
return IPC4_INVALID_REQUEST;

global_system_time_info.host_time.val_l = ((const struct ipc4_system_time *)data)->val_l;
global_system_time_info.host_time.val_u = ((const struct ipc4_system_time *)data)->val_u;

uint64_t current_dsp_time = sof_cycle_get_64();
uint64_t current_dsp_cycle = sof_cycle_get_64();

global_system_time_info.dsp_time.val_l = (uint32_t)(current_dsp_cycle);
global_system_time_info.dsp_time.val_u = (uint32_t)(current_dsp_cycle >> 32);

/* use default timestamp if 64bit is not enabled since 64bit is necessary for host time */
if (!IS_ENABLED(CONFIG_LOG_TIMESTAMP_64BIT)) {
LOG_WRN("64bits timestamp is disabled, so use default timestamp");
return IPC4_SUCCESS;
}

global_system_time_info.dsp_time.val_l = (uint32_t)(current_dsp_time);
global_system_time_info.dsp_time.val_u = (uint32_t)(current_dsp_time >> 32);
host_time = global_system_time_info.host_time.val_l |
((uint64_t)global_system_time_info.host_time.val_u << 32);
host_time_cycle = k_ns_to_cyc_ceil64(host_time);
time_delta = host_time_cycle - current_dsp_cycle;
log_set_timestamp_func(basefw_get_timestamp,
sys_clock_hw_cycles_per_sec());

return IPC4_SUCCESS;
}
Expand Down

0 comments on commit a123465

Please sign in to comment.