Skip to content

ASoC: SOF: trace: sdev->host_offset management changes #3516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 2 commits into from
May 20, 2022
Merged

ASoC: SOF: trace: sdev->host_offset management changes #3516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd9eae5
ASoC: SOF: ipc3-dtrace: Add helper function to update the sdev->host_…
ujfalusi Mar 14, 2022
9c037af
ASoC: SOF: ipc3-dtrace: Return from dtrace_read if there is no new da…
ujfalusi Mar 14, 2022
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
27 changes: 22 additions & 5 deletions sound/soc/sof/ipc3-dtrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,21 @@ static int debugfs_create_trace_filter(struct snd_sof_dev *sdev)
return 0;
}

static bool sof_dtrace_set_host_offset(struct sof_dtrace_priv *priv, u32 new_offset)
{
u32 host_offset = READ_ONCE(priv->host_offset);

if (host_offset != new_offset) {
/* This is a bit paranoid and unlikely that it is needed */
u32 ret = cmpxchg(&priv->host_offset, host_offset, new_offset);

if (ret == host_offset)
return true;
}

return false;
}

static size_t sof_dtrace_avail(struct snd_sof_dev *sdev,
loff_t pos, size_t buffer_size)
{
Expand Down Expand Up @@ -337,6 +352,10 @@ static ssize_t dfsentry_dtrace_read(struct file *file, char __user *buffer,
return -EIO;
}

/* no new trace data */
if (!avail)
return 0;

/* make sure count is <= avail */
if (count > avail)
count = avail;
Expand Down Expand Up @@ -367,7 +386,7 @@ static int dfsentry_dtrace_release(struct inode *inode, struct file *file)

/* avoid duplicate traces at next open */
if (priv->dtrace_state != SOF_DTRACE_ENABLED)
priv->host_offset = 0;
sof_dtrace_set_host_offset(priv, 0);

return 0;
}
Expand Down Expand Up @@ -443,7 +462,7 @@ static int ipc3_dtrace_enable(struct snd_sof_dev *sdev)
params.buffer.pages = priv->dma_trace_pages;
params.stream_tag = 0;

priv->host_offset = 0;
sof_dtrace_set_host_offset(priv, 0);
priv->dtrace_draining = false;

ret = sof_dtrace_host_init(sdev, &priv->dmatb, &params);
Expand Down Expand Up @@ -558,10 +577,8 @@ int ipc3_dtrace_posn_update(struct snd_sof_dev *sdev,
return 0;

if (trace_pos_update_expected(priv) &&
priv->host_offset != posn->host_offset) {
priv->host_offset = posn->host_offset;
sof_dtrace_set_host_offset(priv, posn->host_offset))
wake_up(&priv->trace_sleep);
}

if (posn->overflow != 0)
dev_err(sdev->dev,
Expand Down