android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: firewire-lib: tune the maximum available size of PCM period

Browse Source 
Linux driver for 1394 OHCI controller voluntarily flushes isoc context
when total size of accumulated context header reached PAGE_SIZE. This
kicks tasklet for the isoc context. This is inconvenient to process
runtime of PCM substream.

This commit adds a restriction of the maximum size of PCM period to
avoid this behaviour.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191017155424.885-12-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2019-10-18 00:54:23 +09:00 committed by Takashi Iwai
parent e229853d50
commit 99921ec67d
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sound/firewire/amdtp-stream.c
View File

@ -176,6 +176,8 @@ int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s,
struct snd_pcm_runtime *runtime) struct snd_pcm_runtime *runtime)
{ {
struct snd_pcm_hardware *hw = &runtime->hw; struct snd_pcm_hardware *hw = &runtime->hw;
unsigned int ctx_header_size;
unsigned int maximum_usec_per_period;
int err; int err;
hw->info = SNDRV_PCM_INFO_BATCH | hw->info = SNDRV_PCM_INFO_BATCH |
@ -196,19 +198,24 @@ int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s,
hw->period_bytes_max = hw->period_bytes_min * 2048; hw->period_bytes_max = hw->period_bytes_min * 2048;
hw->buffer_bytes_max = hw->period_bytes_max * hw->periods_min; hw->buffer_bytes_max = hw->period_bytes_max * hw->periods_min;
/* // Linux driver for 1394 OHCI controller voluntarily flushes isoc
* Currently firewire-lib processes 16 packets in one software // context when total size of accumulated context header reaches
* interrupt callback. This equals to 2msec but actually the // PAGE_SIZE. This kicks tasklet for the isoc context and brings
* interval of the interrupts has a jitter. // callback in the middle of scheduled interrupts.
* Additionally, even if adding a constraint to fit period size to // Although AMDTP streams in the same domain use the same events per
* 2msec, actual calculated frames per period doesn't equal to 2msec, // IRQ, use the largest size of context header between IT/IR contexts.
* depending on sampling rate. // Here, use the value of context header in IR context is for both
* Anyway, the interval to call snd_pcm_period_elapsed() cannot 2msec. // contexts.
* Here let us use 5msec for safe period interrupt. if (!(s->flags & CIP_NO_HEADER))
*/ ctx_header_size = IR_CTX_HEADER_SIZE_CIP;
else
ctx_header_size = IR_CTX_HEADER_SIZE_NO_CIP;
maximum_usec_per_period = USEC_PER_SEC * PAGE_SIZE /
CYCLES_PER_SECOND / ctx_header_size;
err = snd_pcm_hw_constraint_minmax(runtime, err = snd_pcm_hw_constraint_minmax(runtime,
SNDRV_PCM_HW_PARAM_PERIOD_TIME, SNDRV_PCM_HW_PARAM_PERIOD_TIME,
5000, UINT_MAX); 5000, maximum_usec_per_period);
if (err < 0) if (err < 0)
goto end; goto end;