From: Takashi Iwai <tiwai@suse.de>
To: Anton Yakovlev <anton.yakovlev@opensynergy.com>
Cc: virtio-dev@lists.oasis-open.org, alsa-devel@alsa-project.org,
"Michael S. Tsirkin" <mst@redhat.com>,
linux-kernel@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
virtualization@lists.linux-foundation.org
Subject: Re: [PATCH v6 9/9] ALSA: virtio: introduce device suspend/resume support
Date: Sun, 28 Feb 2021 13:05:22 +0100 [thread overview]
Message-ID: <s5hpn0kjt31.wl-tiwai@suse.de> (raw)
In-Reply-To: <20210227085956.1700687-10-anton.yakovlev@opensynergy.com>
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 <anton.yakovlev@opensynergy.com>
> ---
> 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
next prev parent reply other threads:[~2021-02-28 12:06 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-27 8:59 [PATCH v6 0/9] ALSA: add virtio sound driver Anton Yakovlev
2021-02-27 8:59 ` [PATCH v6 1/9] uapi: virtio_ids: add a sound device type ID from OASIS spec Anton Yakovlev
2021-02-27 8:59 ` [PATCH v6 2/9] ALSA: virtio: add virtio sound driver Anton Yakovlev
2021-02-27 8:59 ` [PATCH v6 3/9] ALSA: virtio: handling control messages Anton Yakovlev
2021-02-28 11:04 ` Takashi Iwai
2021-02-28 18:39 ` Anton Yakovlev
2021-02-27 8:59 ` [PATCH v6 4/9] ALSA: virtio: build PCM devices and substream hardware descriptors Anton Yakovlev
2021-02-28 11:15 ` Takashi Iwai
2021-02-27 8:59 ` [PATCH v6 5/9] ALSA: virtio: handling control and I/O messages for the PCM device Anton Yakovlev
2021-02-28 11:27 ` Takashi Iwai
2021-03-01 9:25 ` Anton Yakovlev
2021-03-01 13:32 ` Takashi Iwai
2021-03-01 14:47 ` Anton Yakovlev
2021-03-01 14:56 ` Takashi Iwai
2021-03-01 15:24 ` Anton Yakovlev
2021-03-01 15:30 ` Takashi Iwai
2021-02-27 8:59 ` [PATCH v6 6/9] ALSA: virtio: PCM substream operators Anton Yakovlev
2021-02-28 11:32 ` Takashi Iwai
2021-03-01 9:29 ` Anton Yakovlev
2021-03-01 13:33 ` Takashi Iwai
2021-02-27 8:59 ` [PATCH v6 7/9] ALSA: virtio: introduce jack support Anton Yakovlev
2021-02-27 8:59 ` [PATCH v6 8/9] ALSA: virtio: introduce PCM channel map support Anton Yakovlev
2021-02-27 8:59 ` [PATCH v6 9/9] ALSA: virtio: introduce device suspend/resume support Anton Yakovlev
2021-02-28 12:05 ` Takashi Iwai [this message]
2021-03-01 10:03 ` Anton Yakovlev
2021-03-01 13:38 ` Takashi Iwai
2021-03-01 15:30 ` Anton Yakovlev
2021-03-02 6:29 ` Anton Yakovlev
2021-03-02 6:48 ` Takashi Iwai
2021-03-02 8:09 ` Anton Yakovlev
2021-03-02 9:11 ` Takashi Iwai
2021-03-02 15:35 ` Anton Yakovlev
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=s5hpn0kjt31.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=anton.yakovlev@opensynergy.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=tiwai@suse.com \
--cc=virtio-dev@lists.oasis-open.org \
--cc=virtualization@lists.linux-foundation.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox