Skip to content
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

ASOC: SOF: Intel: hda-loader: add debug to IOC timeout #5142

Closed
wants to merge 2 commits into from
Closed

ASOC: SOF: Intel: hda-loader: add debug to IOC timeout #5142

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
7178a97
ASOC: SOF: Intel: hda-stream: do not filter position==bufsize
kv2019i Aug 7, 2024
e864e4c
ASOC: SOF: Intel: hda-loader: add debug to IOC timeout
kv2019i Aug 7, 2024
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
5 changes: 4 additions & 1 deletion sound/soc/sof/intel/hda-loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@ int hda_cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_stream
msecs_to_jiffies(HDA_CL_DMA_IOC_TIMEOUT_MS));

if (!time_left) {
dev_err(sdev->dev, "Code loader DMA did not complete\n");
struct hdac_stream *hstream = &hext_stream->hstream;
snd_pcm_uframes_t pos = hda_dsp_stream_get_position(hstream, SNDRV_PCM_STREAM_PLAYBACK, 0);
dev_err(sdev->dev, "Code loader DMA did not complete, DMA pos %lu/%u\n",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty line between variable declaration and code block.

pos, hstream->bufsize);
return -ETIMEDOUT;
}
dev_dbg(sdev->dev, "Code loader DMA done\n");
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hda-stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,7 @@ snd_pcm_uframes_t hda_dsp_stream_get_position(struct hdac_stream *hstream,
break;
}

if (pos >= hstream->bufsize)
if (pos > hstream->bufsize)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could make this conditional and apply it to non cyclic (one shot) transfers only, like the fw loading, library loading.

pos = 0;

return pos;
Expand Down
Loading