From: Giuliano Pochini <pochini@shiny.it>
To: Mark Hills <mark@xwax.org>
Cc: Takashi Iwai <tiwai@suse.de>, alsa-devel@alsa-project.org
Subject: Re: [PATCH 3/3] echoaudio: Address bugs in the interrupt handling
Date: Wed, 17 Jun 2020 00:01:34 +0200 [thread overview]
Message-ID: <20200617000134.60c5e2b5@wc1> (raw)
In-Reply-To: <20200616131743.4793-3-mark@xwax.org>
On Tue, 16 Jun 2020 14:17:43 +0100
Mark Hills <mark@xwax.org> wrote:
> + counter = le32_to_cpu(*pipe->dma_counter);
> +
> + period = bytes_to_frames(runtime, counter)
> + / runtime->period_size;
> + last_period = bytes_to_frames(runtime, pipe->last_counter)
> + / runtime->period_size;
> +
> + if (period == last_period)
> + return 0; /* don't do any work yet */
> +
> + step = counter - pipe->last_counter;
Uhmm.. no, when the dma_counter wraps around the comparison gives wrong
result, unless 4G is divisible by the buffer size.
Please consider this patch (to apply after yours). It computes the new period
using pipe->position before and after adding the amount of bytes tranferred
since the previous period.
Briefly tested - It seems ok.
Signed-off-by: Giuliano Pochini <pochini@shiny.it>
--- sound/pci/echoaudio/echoaudio.c__orig 2020-06-16 23:36:02.818601055 +0200
+++ sound/pci/echoaudio/echoaudio.c 2020-06-16 23:52:46.593325066 +0200
@@ -1781,7 +1781,7 @@
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct audiopipe *pipe = runtime->private_data;
- unsigned counter, step, period, last_period;
+ u32 counter, step, period, last_period, pipe_position;
size_t buffer_bytes;
if (pipe->state != PIPE_STATE_STARTED)
@@ -1789,24 +1789,22 @@
counter = le32_to_cpu(*pipe->dma_counter);
- period = bytes_to_frames(runtime, counter)
+ step = counter - pipe->last_counter;
+ pipe_position = pipe->position + step; /* bytes */
+ buffer_bytes = frames_to_bytes(runtime, runtime->buffer_size);
+ while (pipe_position >= buffer_bytes)
+ pipe_position -= buffer_bytes;
+
+ period = bytes_to_frames(runtime, pipe_position)
/ runtime->period_size;
- last_period = bytes_to_frames(runtime, pipe->last_counter)
+ last_period = bytes_to_frames(runtime, pipe->position)
/ runtime->period_size;
if (period == last_period)
return 0; /* don't do any work yet */
- step = counter - pipe->last_counter;
+ pipe->position = pipe_position;
pipe->last_counter = counter;
-
- pipe->position += step; /* bytes */
-
- buffer_bytes = frames_to_bytes(runtime, runtime->buffer_size);
-
- while (pipe->position >= buffer_bytes)
- pipe->position -= buffer_bytes;
-
return 1;
}
--
Giuliano.
next prev parent reply other threads:[~2020-06-16 22:02 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 13:13 echoaudio: Fix some long standing bugs Mark Hills
2020-06-16 13:17 ` [PATCH 1/3] echoaudio: Race conditions around "opencount" Mark Hills
2020-06-16 13:17 ` [PATCH 2/3] echoaudio: Prevent races in calls to set_audio_format() Mark Hills
2020-06-16 13:24 ` Takashi Iwai
2020-06-16 13:17 ` [PATCH 3/3] echoaudio: Address bugs in the interrupt handling Mark Hills
2020-06-16 13:35 ` Takashi Iwai
2020-06-16 14:01 ` Mark Hills
2020-06-16 14:18 ` Takashi Iwai
2020-06-17 10:51 ` Mark Hills
2020-06-18 8:17 ` Takashi Iwai
2020-06-18 11:07 ` Mark Hills
2020-06-18 11:21 ` Takashi Iwai
2020-06-18 12:29 ` Mark Hills
2020-06-18 13:22 ` Mark Hills
2020-06-16 19:46 ` Giuliano Pochini
2020-06-17 10:57 ` Mark Hills
2020-06-16 22:01 ` Giuliano Pochini [this message]
2020-06-17 11:14 ` Mark Hills
2020-06-19 19:56 ` Giuliano Pochini
2020-06-19 21:21 ` Mark Hills
2020-06-28 22:02 ` Giuliano Pochini
2020-07-01 12:25 ` Mark Hills
2020-07-01 14:51 ` Giuliano Pochini
2020-07-01 12:25 ` echoaudio: Fix some long standing bugs Mark Hills
2020-07-01 12:27 ` [PATCH 1/4] echoaudio: Race conditions around "opencount" Mark Hills
2020-07-01 16:37 ` kernel test robot
2020-07-01 16:37 ` kernel test robot
2020-07-01 17:32 ` kernel test robot
2020-07-01 17:32 ` kernel test robot
2020-07-02 9:53 ` Mark Hills
2020-07-07 8:28 ` Takashi Iwai
2020-07-08 10:16 ` Mark Hills
2020-07-08 10:18 ` [PATCH 1/5] echoaudio: Remove redundant check Mark Hills
2020-07-09 11:00 ` Takashi Iwai
2020-07-08 10:18 ` [PATCH 2/5] echoaudio: Race conditions around "opencount" Mark Hills
2020-07-09 11:00 ` Takashi Iwai
2020-07-08 10:18 ` [PATCH 3/5] echoaudio: Prevent races in calls to set_audio_format() Mark Hills
2020-07-09 11:00 ` Takashi Iwai
2020-07-08 10:18 ` [PATCH 4/5] echoaudio: Prevent some noise on unloading the module Mark Hills
2020-07-09 11:00 ` Takashi Iwai
2020-07-08 10:18 ` [PATCH 5/5] echoaudio: Address bugs in the interrupt handling Mark Hills
2020-07-09 11:01 ` Takashi Iwai
2020-07-01 12:27 ` [PATCH 2/4] echoaudio: Prevent races in calls to set_audio_format() Mark Hills
2020-07-01 12:27 ` [PATCH 3/4] echoaudio: Prevent some noise on unloading the module Mark Hills
2020-07-01 12:27 ` [PATCH 4/4] echoaudio: Address bugs in the interrupt handling Mark Hills
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200617000134.60c5e2b5@wc1 \
--to=pochini@shiny.it \
--cc=alsa-devel@alsa-project.org \
--cc=mark@xwax.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.