From patchwork Mon Aug 7 11:50:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Andrushchenko X-Patchwork-Id: 9885155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0ECEC60363 for ; Mon, 7 Aug 2017 11:53:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 019A028514 for ; Mon, 7 Aug 2017 11:53:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA6C52860D; Mon, 7 Aug 2017 11:53:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 83858285DA for ; Mon, 7 Aug 2017 11:53:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1degYt-00043S-IN; Mon, 07 Aug 2017 11:51:07 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1degYs-000413-0a for xen-devel@lists.xen.org; Mon, 07 Aug 2017 11:51:06 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id 04/67-03582-92458895; Mon, 07 Aug 2017 11:51:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRWlGSWpSXmKPExsVyMfS6o65GSEe kwas2VYslHxezODB6HN39mymAMYo1My8pvyKBNaOnp4utYKpyxbdvLewNjB/kuhi5OIQE+hkl DizrYAJxWAReskhM2f6cHcSREOhnldi68DSQwwnkxEl8fjMDyi6RuPZxIzOILSSgKPH12XQmi FErmSSmXp3ICpJgEzCSWH7jBwuILSIQIXHs8Qc2EJtZoFTixv45YM3CAkES56ZtBRvKIqAqsb V7I1gNr4CjxJRpP5ghlslJ3DzXCWRzcHAKOEm0Lq2A2OsocXf3bPYJjAILGBlWMWoUpxaVpRb pGhrrJRVlpmeU5CZm5ugaGpjp5aYWFyemp+YkJhXrJefnbmIEhhYDEOxg/LIs4BCjJAeTkihv /Iq2SCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvInBHZFCgkWp6akVaZk5wCCHSUtw8CiJ8GYHA aV5iwsSc4sz0yFSpxjtOa5cWfeFiWPD6vVAcsqB7UDy1YT/35iEWPLy81KlxHlZQaYKgLRllO bBDYVF5SVGWSlhXkagM4V4ClKLcjNLUOVfMYpzMCoJ8z4AWc6TmVcCt/sV0FlMQGe9SWwFOas kESEl1cDY6KPXu5Z3+0zu0GvvYrcLNdmHTJ7RkSfrLFw491711qn6VzkuHpl3zElvUQY3o+VS kSZV1euq74pmSQuxLKt7cPut3CwHiWNxvb0fRN7ZTHCv1ObY1v/gzEr21JNC5wUD0u9PUmKsZ Km/UvVo/X9t7wPPj6/bZS/wxYJh6QSL+M0ydSd4cxqUWIozEg21mIuKEwG8uV2cxQIAAA== X-Env-Sender: andr2000@gmail.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1502106664!73660218!1 X-Originating-IP: [209.85.215.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40193 invoked from network); 7 Aug 2017 11:51:04 -0000 Received: from mail-lf0-f65.google.com (HELO mail-lf0-f65.google.com) (209.85.215.65) by server-11.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Aug 2017 11:51:04 -0000 Received: by mail-lf0-f65.google.com with SMTP id o85so166515lff.1 for ; Mon, 07 Aug 2017 04:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bQ4Taq0YTW0KLAU5fonfVvYQVPffkxiWOmbdQdfezmI=; b=vFXNGAUZlzfTK4Ui42ITUdqhjloKHm6L7Rf6glKkVcZSGsFzFEIJccHRLGUhOWkiIo TW9Gi19UHylZXMWF8h+EvJzzGlX9RCqMVdEVjZ2nY/lKRiRFQixPcQswapUVBrCW6j0R d4eyI2jPEYLT9fTtpBQcxb8Zhz7FIyOIBsrie5ZMltg9w0L2yTRhJb9V0ah+uAvPNocY jCUOBy3Zv/RhlV+2rTNgvgS8FNKhP1XBywBsGPOoIRC1TVJFl+Ey++/zGcX75g3QV7+i LaHAlBFUuIT/WJ9gRkmL72qZQV25rLPs88rd6zWKRwsOWSm2wqTnr3viBYkqqICJxTTZ +Wag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bQ4Taq0YTW0KLAU5fonfVvYQVPffkxiWOmbdQdfezmI=; b=bEkvKfolspf4iOlBa9ILQRVJ+NiGLT0X03+ohSm0Kx/2WUd1bYsiJIaSc5Hq/CHT0J 0aM+udmi6ud8Cto/+oY1FVtwRIRXhsJ7ldG5HNQiw0u379TzFZlkvH3kzMkRGRDyyqtS mkD+j9MHzMqb824+BXmzofY7WL/dVioNQTUH7CFxd35uYIT+DChaxQS26n4k61eGFHso sPQjNdc+5cpSvTO7jKn2sKP6ZXjmZt6JqCR020j1pR4rfU8kOe/0OvWAquLlaMHLzCda DhTFVzHcnQTSoGLKVbkm0BX7dkUdzMdrWvtCkb1AB21k32jrZCsdy/vW70h7PEvkwxLX /ZtQ== X-Gm-Message-State: AHYfb5gKoMDBVavcc6ekNqP01y+EZ99WsrrFDzwTH85hhLLL4hWP5wW1 XUvNVPrAx/Tc1w== X-Received: by 10.46.21.71 with SMTP id 7mr100695ljv.74.1502106663865; Mon, 07 Aug 2017 04:51:03 -0700 (PDT) Received: from a2k-HP-ProDesk-600-G2-SFF.kyiv.epam.com (ll-51.209.223.85.sovam.net.ua. [85.223.209.51]) by smtp.gmail.com with ESMTPSA id n88sm2844587lja.43.2017.08.07.04.51.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Aug 2017 04:51:02 -0700 (PDT) From: Oleksandr Andrushchenko To: alsa-devel@alsa-project.org, xen-devel@lists.xen.org, linux-kernel@vger.kernel.org Date: Mon, 7 Aug 2017 14:50:42 +0300 Message-Id: <1502106645-6731-9-git-send-email-andr2000@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502106645-6731-1-git-send-email-andr2000@gmail.com> References: <1502106645-6731-1-git-send-email-andr2000@gmail.com> Cc: andr2000@gmail.com, Oleksandr Andrushchenko , tiwai@suse.com, perex@perex.cz Subject: [Xen-devel] [PATCH RESEND 08/11] ALSA: vsnd: Add timer for period interrupt emulation X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Oleksandr Andrushchenko Front sound driver has no real interrupts, so playback/capture period passed interrupt needs to be emulated: this is done via timer. Add required timer operations, this is based on sound/drivers/dummy.c. Signed-off-by: Oleksandr Andrushchenko --- sound/drivers/xen-front.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/sound/drivers/xen-front.c b/sound/drivers/xen-front.c index 9f31e6832086..507c5eb343c8 100644 --- a/sound/drivers/xen-front.c +++ b/sound/drivers/xen-front.c @@ -67,12 +67,29 @@ struct sh_buf_info { size_t vbuffer_sz; }; +struct sdev_alsa_timer_info { + spinlock_t lock; + struct timer_list timer; + unsigned long base_time; + /* fractional sample position (based HZ) */ + unsigned int frac_pos; + unsigned int frac_period_rest; + /* buffer_size * HZ */ + unsigned int frac_buffer_size; + /* period_size * HZ */ + unsigned int frac_period_size; + unsigned int rate; + int elapsed; + struct snd_pcm_substream *substream; +}; + struct sdev_pcm_stream_info { int unique_id; struct snd_pcm_hardware pcm_hw; struct xdrv_evtchnl_info *evt_chnl; bool is_open; uint8_t req_next_id; + struct sdev_alsa_timer_info timer; struct sh_buf_info sh_buf; }; @@ -148,6 +165,110 @@ static struct sdev_pcm_stream_info *sdrv_stream_get( return stream; } +static inline void sdrv_alsa_timer_rearm(struct sdev_alsa_timer_info *dpcm) +{ + mod_timer(&dpcm->timer, jiffies + + (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate); +} + +static void sdrv_alsa_timer_update(struct sdev_alsa_timer_info *dpcm) +{ + unsigned long delta; + + delta = jiffies - dpcm->base_time; + if (!delta) + return; + dpcm->base_time += delta; + delta *= dpcm->rate; + dpcm->frac_pos += delta; + while (dpcm->frac_pos >= dpcm->frac_buffer_size) + dpcm->frac_pos -= dpcm->frac_buffer_size; + while (dpcm->frac_period_rest <= delta) { + dpcm->elapsed++; + dpcm->frac_period_rest += dpcm->frac_period_size; + } + dpcm->frac_period_rest -= delta; +} + +static int sdrv_alsa_timer_start(struct snd_pcm_substream *substream) +{ + struct sdev_pcm_stream_info *stream = sdrv_stream_get(substream); + struct sdev_alsa_timer_info *dpcm = &stream->timer; + + spin_lock(&dpcm->lock); + dpcm->base_time = jiffies; + sdrv_alsa_timer_rearm(dpcm); + spin_unlock(&dpcm->lock); + return 0; +} + +static int sdrv_alsa_timer_stop(struct snd_pcm_substream *substream) +{ + struct sdev_pcm_stream_info *stream = sdrv_stream_get(substream); + struct sdev_alsa_timer_info *dpcm = &stream->timer; + + spin_lock(&dpcm->lock); + del_timer(&dpcm->timer); + spin_unlock(&dpcm->lock); + return 0; +} + +static int sdrv_alsa_timer_prepare(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct sdev_pcm_stream_info *stream = sdrv_stream_get(substream); + struct sdev_alsa_timer_info *dpcm = &stream->timer; + + dpcm->frac_pos = 0; + dpcm->rate = runtime->rate; + dpcm->frac_buffer_size = runtime->buffer_size * HZ; + dpcm->frac_period_size = runtime->period_size * HZ; + dpcm->frac_period_rest = dpcm->frac_period_size; + dpcm->elapsed = 0; + return 0; +} + +static void sdrv_alsa_timer_callback(unsigned long data) +{ + struct sdev_alsa_timer_info *dpcm = (struct sdev_alsa_timer_info *)data; + int elapsed; + + spin_lock(&dpcm->lock); + sdrv_alsa_timer_update(dpcm); + sdrv_alsa_timer_rearm(dpcm); + elapsed = dpcm->elapsed; + dpcm->elapsed = 0; + spin_unlock(&dpcm->lock); + if (elapsed) + snd_pcm_period_elapsed(dpcm->substream); +} + +static snd_pcm_uframes_t sdrv_alsa_timer_pointer( + struct snd_pcm_substream *substream) +{ + struct sdev_pcm_stream_info *stream = sdrv_stream_get(substream); + struct sdev_alsa_timer_info *dpcm = &stream->timer; + snd_pcm_uframes_t pos; + + spin_lock(&dpcm->lock); + sdrv_alsa_timer_update(dpcm); + pos = dpcm->frac_pos / HZ; + spin_unlock(&dpcm->lock); + return pos; +} + +static int sdrv_alsa_timer_create(struct snd_pcm_substream *substream) +{ + struct sdev_pcm_stream_info *stream = sdrv_stream_get(substream); + struct sdev_alsa_timer_info *dpcm = &stream->timer; + + spin_lock_init(&dpcm->lock); + dpcm->substream = substream; + setup_timer(&dpcm->timer, sdrv_alsa_timer_callback, + (unsigned long) dpcm); + return 0; +} + static void sdrv_copy_pcm_hw(struct snd_pcm_hardware *dst, struct snd_pcm_hardware *src, struct snd_pcm_hardware *ref_pcm_hw)