Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2530963pxb; Sun, 28 Feb 2021 04:28:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwAmnoMRGjL84vYdxCxnzc1eqs/1jNYVlGfVmaDVr87ITRuI9AHlFIZO+tyl2NIFkC3j73c X-Received: by 2002:a17:906:af91:: with SMTP id mj17mr11118251ejb.230.1614515293010; Sun, 28 Feb 2021 04:28:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614515293; cv=none; d=google.com; s=arc-20160816; b=Rbpb1b6DZNRSjlgLAd9hRKZy3h1r7yaaR+6cxPgXYEEtiH2dVMZEpmhgY+gDB/6xL/ 0cV7xn7x3vsamyJHRo4JJecaC9GWli3KAYreeQxwSaQB5f8hHQL35URS4sHENHamoRfW 61VVJyVmkkYzjaU446Rizcyn7DyNuz36neCCLJPMkB24UNj+etEijpIILYEsJjdY/63E kNlBQ0udyJTt9RmnFqcu0QjJRAM//hRxbUw7oiPWt7CnE+R7LTQCjQ6EbUhFT/Lnfp+p QMUtXemf/xYP+eP9GrRZ/O0tE8GV/EwWI7McwzlmVChDBmhFAXoN2EBLfH0bhwrulpli iU7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:references:in-reply-to :subject:cc:to:from:message-id:date; bh=t6Zdxd7GsojKh6dde3lIREkPy67jZA/qGnqVljwPpwU=; b=XoCfT234Pjle7Cojq/gmMT34iDNCnO/3JtLM60++ImMpqWo7c6MV3u5y2cVz8gVENL aY4nqykBectetf22+HMTsX0ITwpj2sGzqfR8ilMnBm/zwv4bWiEmjDGEYXYhAN+oXNsw iaNjIAgwtbOBbpU7f7A/GcsnqkX7ozrVGv/r0h9kB9/YTSPkWR+LSODPmRQW/T9HCSVK yO5R8sDl2pWC3MXecyAk+0DylGpd3lnc7OacX8f/GD+qX/GtWa2EPDu/3WhZQN3z3Gg9 4njioq147IFklcWuwDSOPr56cWUmW/EyOfksdMoVtgXwWYOeroFaDWhazVEsjDlo/nwu NXlA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p10si1806796eji.76.2021.02.28.04.27.27; Sun, 28 Feb 2021 04:28:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230446AbhB1MGH (ORCPT + 99 others); Sun, 28 Feb 2021 07:06:07 -0500 Received: from mx2.suse.de ([195.135.220.15]:45244 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230045AbhB1MGF (ORCPT ); Sun, 28 Feb 2021 07:06:05 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 25B02AB7D; Sun, 28 Feb 2021 12:05:23 +0000 (UTC) Date: Sun, 28 Feb 2021 13:05:22 +0100 Message-ID: From: Takashi Iwai To: Anton Yakovlev Cc: , , , "Michael S. Tsirkin" , Jaroslav Kysela , Takashi Iwai , Subject: Re: [PATCH v6 9/9] ALSA: virtio: introduce device suspend/resume support In-Reply-To: <20210227085956.1700687-10-anton.yakovlev@opensynergy.com> References: <20210227085956.1700687-1-anton.yakovlev@opensynergy.com> <20210227085956.1700687-10-anton.yakovlev@opensynergy.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 27 Feb 2021 09:59:56 +0100, Anton Yakovlev wrote: > > All running PCM substreams are stopped on device suspend and restarted > on device resume. > > Signed-off-by: Anton Yakovlev > --- > sound/virtio/virtio_card.c | 56 +++++++++++++++++++++++++++++++++++ > sound/virtio/virtio_pcm.c | 1 + > sound/virtio/virtio_pcm_ops.c | 41 ++++++++++++++++++++----- > 3 files changed, 90 insertions(+), 8 deletions(-) > > diff --git a/sound/virtio/virtio_card.c b/sound/virtio/virtio_card.c > index 59455a562018..c7ae8801991d 100644 > --- a/sound/virtio/virtio_card.c > +++ b/sound/virtio/virtio_card.c > @@ -323,6 +323,58 @@ static void virtsnd_remove(struct virtio_device *vdev) > kfree(snd->event_msgs); > } > > +#ifdef CONFIG_PM_SLEEP > +/** > + * virtsnd_freeze() - Suspend device. > + * @vdev: VirtIO parent device. > + * > + * Context: Any context. > + * Return: 0 on success, -errno on failure. > + */ > +static int virtsnd_freeze(struct virtio_device *vdev) > +{ > + struct virtio_snd *snd = vdev->priv; > + > + virtsnd_ctl_msg_cancel_all(snd); > + > + vdev->config->del_vqs(vdev); > + vdev->config->reset(vdev); > + > + kfree(snd->event_msgs); > + > + /* > + * If the virtsnd_restore() fails before re-allocating events, then we > + * get a dangling pointer here. > + */ > + snd->event_msgs = NULL; > + > + return 0; I suppose some cancel of inflight works is needed? Ditto for the device removal, too. > --- a/sound/virtio/virtio_pcm.c > +++ b/sound/virtio/virtio_pcm.c > @@ -109,6 +109,7 @@ static int virtsnd_pcm_build_hw(struct virtio_pcm_substream *vss, > SNDRV_PCM_INFO_BATCH | > SNDRV_PCM_INFO_BLOCK_TRANSFER | > SNDRV_PCM_INFO_INTERLEAVED | > + SNDRV_PCM_INFO_RESUME | > SNDRV_PCM_INFO_PAUSE; Actually you don't need to set SNDRV_PCM_INFO_RESUME. This flag means that the driver supports the full resume procedure, which isn't often the case; with this, the driver is supposed to resume the stream exactly from the suspended position. Most drivers don't set this but implement only the suspend-stop action. Then the application (or the sound backend) will re-setup the stream and restart accordingly. > @@ -309,6 +318,21 @@ static int virtsnd_pcm_trigger(struct snd_pcm_substream *substream, int command) > int rc; > > switch (command) { > + case SNDRV_PCM_TRIGGER_RESUME: { > + /* > + * We restart the substream by executing the standard command > + * sequence. > + */ > + rc = virtsnd_pcm_hw_params(substream, NULL); > + if (rc) > + return rc; > + > + rc = virtsnd_pcm_prepare(substream); > + if (rc) > + return rc; And this won't work at all unless nonatomic PCM ops. thanks, Takashi