Skip to content

ASoC: SOF: force end-of-file for debugfs trace at suspend #781

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 16, 2019
Merged

ASoC: SOF: force end-of-file for debugfs trace at suspend #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46266b2
ASoC: SOF: trace: remove code duplication in sof_wait_trace_avail()
kv2019i Apr 26, 2019
891b86b
ASoC: SOF: force end-of-file for debugfs trace at suspend
kv2019i Apr 26, 2019
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
2 changes: 2 additions & 0 deletions sound/soc/sof/sof-priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,8 @@ struct snd_sof_dev {
u32 host_offset;
u32 dtrace_is_enabled;
u32 dtrace_error;
u32 dtrace_draining;

u32 msi_enabled;

void *private; /* core does not touch this */
Expand Down
50 changes: 41 additions & 9 deletions sound/soc/sof/trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
#include "sof-priv.h"
#include "ops.h"

static size_t sof_wait_trace_avail(struct snd_sof_dev *sdev,
loff_t pos, size_t buffer_size)
static size_t sof_trace_avail(struct snd_sof_dev *sdev,
loff_t pos, size_t buffer_size)
{
wait_queue_entry_t wait;
loff_t host_offset = READ_ONCE(sdev->host_offset);

/*
Expand All @@ -31,6 +30,28 @@ static size_t sof_wait_trace_avail(struct snd_sof_dev *sdev,
if (host_offset > pos)
return host_offset - pos;

return 0;
}

static size_t sof_wait_trace_avail(struct snd_sof_dev *sdev,
loff_t pos, size_t buffer_size)
{
wait_queue_entry_t wait;
size_t ret = sof_trace_avail(sdev, pos, buffer_size);

/* data immediately available */
if (ret)
return ret;

if (!sdev->dtrace_is_enabled && sdev->dtrace_draining) {
/*
* tracing has ended and all traces have been
* read by client, return EOF
*/
sdev->dtrace_draining = false;
return 0;
}

/* wait for available trace data from FW */
init_waitqueue_entry(&wait, current);
set_current_state(TASK_INTERRUPTIBLE);
Expand All @@ -42,12 +63,7 @@ static size_t sof_wait_trace_avail(struct snd_sof_dev *sdev,
}
remove_wait_queue(&sdev->trace_sleep, &wait);

/* return bytes available for copy */
host_offset = READ_ONCE(sdev->host_offset);
if (host_offset < pos)
return buffer_size - pos;

return host_offset - pos;
return sof_trace_avail(sdev, pos, buffer_size);
}

static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer,
Expand Down Expand Up @@ -97,10 +113,23 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer,
return count;
}

static int sof_dfsentry_trace_release(struct inode *inode, struct file *file)
{
struct snd_sof_dfsentry *dfse = inode->i_private;
struct snd_sof_dev *sdev = dfse->sdev;

/* avoid duplicate traces at next open */
if (!sdev->dtrace_is_enabled)
sdev->host_offset = 0;

return 0;
}

static const struct file_operations sof_dfs_trace_fops = {
.open = simple_open,
.read = sof_dfsentry_trace_read,
.llseek = default_llseek,
.release = sof_dfsentry_trace_release,
};

static int trace_debugfs_create(struct snd_sof_dev *sdev)
Expand Down Expand Up @@ -148,6 +177,7 @@ int snd_sof_init_trace_ipc(struct snd_sof_dev *sdev)
params.stream_tag = 0;

sdev->host_offset = 0;
sdev->dtrace_draining = false;

ret = snd_sof_dma_trace_init(sdev, &params.stream_tag);
if (ret < 0) {
Expand Down Expand Up @@ -284,6 +314,8 @@ void snd_sof_release_trace(struct snd_sof_dev *sdev)
"error: fail in snd_sof_dma_trace_release %d\n", ret);

sdev->dtrace_is_enabled = false;
sdev->dtrace_draining = true;
wake_up(&sdev->trace_sleep);
}
EXPORT_SYMBOL(snd_sof_release_trace);

Expand Down