ALSA: usb-audio: Add UAC3 Power Domains to suspend/resume

Set the UAC3 Power Domain state for an Audio Streaming interface
to D2 state before suspending the device (usb_driver callback).
This lets the device know there is no intention to use any of the
Units in the Audio Function and that the host is not going to
even listen for wake-up events (interrupts) on the units.

When the usb_driver gets resumed, the state D0 (fully powered) will
be set. This ties up the UAC3 Power Domains to the runtime PM.

Signed-off-by: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/card.c b/sound/usb/card.c
index a1ed798a1c6b91311a1f8bced62c388f7cbacb45..2bfe4e80a6b92b467c502d66ddf04d2b64f8154c 100644 (file)
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -809,6 +809,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
        if (!chip->num_suspended_intf++) {
                list_for_each_entry(as, &chip->pcm_list, list) {
                        snd_pcm_suspend_all(as->pcm);
+                       snd_usb_pcm_suspend(as);
                        as->substream[0].need_setup_ep =
                                as->substream[1].need_setup_ep = true;
                }
@@ -824,6 +825,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
 static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume)
 {
        struct snd_usb_audio *chip = usb_get_intfdata(intf);
+       struct snd_usb_stream *as;
        struct usb_mixer_interface *mixer;
        struct list_head *p;
        int err = 0;
@@ -834,6 +836,13 @@ static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume)
                return 0;
 
        atomic_inc(&chip->active); /* avoid autopm */
+
+       list_for_each_entry(as, &chip->pcm_list, list) {
+               err = snd_usb_pcm_resume(as);
+               if (err < 0)
+                       goto err_out;
+       }
+
        /*
         * ALSA leaves material resumption to user space
         * we just notify and restart the mixers

diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 4b930fa472778bd42af95aca942a25403c0ed001..99ec9d5caa58cb7afd62df6b3a7675455e505f15 100644 (file)
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -711,6 +711,54 @@ static int configure_endpoint(struct snd_usb_substream *subs)
        return ret;
 }
 
+static int snd_usb_pcm_change_state(struct snd_usb_substream *subs, int state)
+{
+       int ret;
+
+       if (!subs->str_pd)
+               return 0;
+
+       ret = snd_usb_power_domain_set(subs->stream->chip, subs->str_pd, state);
+       if (ret < 0) {
+               dev_err(&subs->dev->dev,
+                       "Cannot change Power Domain ID: %d to state: %d. Err: %d\n",
+                       subs->str_pd->pd_id, state, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+int snd_usb_pcm_suspend(struct snd_usb_stream *as)
+{
+       int ret;
+
+       ret = snd_usb_pcm_change_state(&as->substream[0], UAC3_PD_STATE_D2);
+       if (ret < 0)
+               return ret;
+
+       ret = snd_usb_pcm_change_state(&as->substream[1], UAC3_PD_STATE_D2);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
+int snd_usb_pcm_resume(struct snd_usb_stream *as)
+{
+       int ret;
+
+       ret = snd_usb_pcm_change_state(&as->substream[0], UAC3_PD_STATE_D0);
+       if (ret < 0)
+               return ret;
+
+       ret = snd_usb_pcm_change_state(&as->substream[1], UAC3_PD_STATE_D0);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
 /*
  * hw_params callback
  *

diff --git a/sound/usb/pcm.h b/sound/usb/pcm.h
index f77ec58bf1a1eeffcfe321d3eae863716be60abd..9833627c1eca5f0afe01b2aaab2ce003acc89d46 100644 (file)
--- a/sound/usb/pcm.h
+++ b/sound/usb/pcm.h
@@ -6,6 +6,8 @@ snd_pcm_uframes_t snd_usb_pcm_delay(struct snd_usb_substream *subs,
                                    unsigned int rate);
 
 void snd_usb_set_pcm_ops(struct snd_pcm *pcm, int stream);
+int snd_usb_pcm_suspend(struct snd_usb_stream *as);
+int snd_usb_pcm_resume(struct snd_usb_stream *as);
 
 int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,
                       struct usb_host_interface *alts,