Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/include/sof/clk.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#define __INCLUDE_CLOCK__

#include <stdint.h>
#include <arch/timer.h>

#define CLOCK_NOTIFY_PRE 0
#define CLOCK_NOTIFY_POST 1
Expand All @@ -57,6 +58,8 @@ void clock_set_freq(int clock, uint32_t hz);

uint64_t clock_ms_to_ticks(int clock, uint64_t ms);

void platform_timer_set_delta(struct timer *timer, uint64_t ns);

void clock_init(void);

#endif
2 changes: 1 addition & 1 deletion src/include/uapi/ipc/trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct sof_ipc_dma_trace_params_ext {
struct sof_ipc_cmd_hdr hdr;
struct sof_ipc_host_buffer buffer;
uint32_t stream_tag;
uint64_t timestamp;
uint64_t timestamp_ns; /* in nanosecnd */
uint32_t reserved[8];
} __attribute__((packed));

Expand Down
4 changes: 2 additions & 2 deletions src/ipc/handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include <sof/alloc.h>
#include <sof/wait.h>
#include <sof/trace.h>
#include <sof/clk.h>
#include <sof/math/numbers.h>
#include <platform/interrupt.h>
#include <platform/mailbox.h>
Expand Down Expand Up @@ -726,8 +727,7 @@ static int ipc_dma_trace_config(uint32_t header)
IPC_COPY_CMD(params, _ipc->comp_data);

if (iCS(header) == SOF_IPC_TRACE_DMA_PARAMS_EXT)
platform_timer->delta = params.timestamp -
platform_timer_get(platform_timer);
platform_timer_set_delta(platform_timer, params.timestamp_ns);
else
platform_timer->delta = 0;

Expand Down
10 changes: 10 additions & 0 deletions src/lib/clk.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <platform/clk.h>
#include <platform/clk-map.h>
#include <platform/platform.h>
#include <sof/drivers/timer.h>
#include <config.h>
#include <stdint.h>
#include <limits.h>
Expand Down Expand Up @@ -152,6 +153,15 @@ uint64_t clock_ms_to_ticks(int clock, uint64_t ms)
return clk_pdata->clk[clock].ticks_per_msec * ms;
}

void platform_timer_set_delta(struct timer *timer, uint64_t ns)
{
uint64_t ticks;

ticks = clk_pdata->clk[PLATFORM_DEFAULT_CLOCK].ticks_per_msec /
1000 * ns / 1000;
timer->delta = ticks - platform_timer_get(timer);
}

void clock_init(void)
{
int i = 0;
Expand Down