Patched in Tegra support.

author: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
committer: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
commit: 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree: a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /sound/usb/card.c
parent: 406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
1 files changed, 19 insertions, 27 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c
index ccf95cfe186..d8f2bf40145 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -25,6 +25,9 @@
 *
 *  NOTES:
 *
+ *   - async unlink should be used for avoiding the sleep inside lock.
+ *     2.4.22 usb-uhci seems buggy for async unlinking and results in
+ *     oops.  in such a cse, pass async_unlink=0 option.
 *   - the linked URBs would be preferred but not used so far because of
 *     the instability of unlinking.
 *   - type II is not supported properly.  there is no device which supports
@@ -44,7 +47,6 @@
 #include <linux/mutex.h>
 #include <linux/usb/audio.h>
 #include <linux/usb/audio-v2.h>
-#include <linux/module.h>
 #include <sound/control.h>
 #include <sound/core.h>
@@ -63,9 +65,9 @@
 #include "helper.h"
 #include "debug.h"
 #include "pcm.h"
+#include "urb.h"
 #include "format.h"
 #include "power.h"
-#include "stream.h"
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("USB Audio");
@@ -75,13 +77,14 @@ MODULE_SUPPORTED_DEVICE("{{Generic,USB Audio}}");
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
 /* Vendor/product IDs for this card */
 static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
 static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
 static int nrpacks = 8;         /* max. number of packets per urb */
+static int async_unlink = 1;
 static int device_setup[SNDRV_CARDS]; /* device parameter for this card */
-static bool ignore_ctl_error;
+static int ignore_ctl_error;
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the USB audio adapter.");
@@ -95,6 +98,8 @@ module_param_array(pid, int, NULL, 0444);
 MODULE_PARM_DESC(pid, "Product ID for the USB audio device.");
 module_param(nrpacks, int, 0644);
 MODULE_PARM_DESC(nrpacks, "Max. number of packets per URB.");
+module_param(async_unlink, bool, 0444);
+MODULE_PARM_DESC(async_unlink, "Use async unlink mode.");
 module_param_array(device_setup, int, NULL, 0444);
 MODULE_PARM_DESC(device_setup, "Specific device setup (if needed).");
 module_param(ignore_ctl_error, bool, 0444);
@@ -125,9 +130,8 @@ static void snd_usb_stream_disconnect(struct list_head *head)
                subs = &as->substream[idx];
                if (!subs->num_formats)
                        continue;
+                snd_usb_release_substream_urbs(subs, 1);
                subs->interface = -1;
-                subs->data_endpoint = NULL;
-                subs->sync_endpoint = NULL;
        }
 }
@@ -181,7 +185,7 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
                return -EINVAL;
        }
-        if (! snd_usb_parse_audio_interface(chip, interface)) {
+        if (! snd_usb_parse_audio_endpoints(chip, interface)) {
                usb_set_interface(dev, interface, 0); /* reset the current interface */
                usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
                return -EINVAL;
@@ -271,7 +275,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
 static int snd_usb_audio_free(struct snd_usb_audio *chip)
 {
-        mutex_destroy(&chip->mutex);
        kfree(chip);
        return 0;
 }
@@ -332,19 +335,18 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
                return -ENOMEM;
        }
-        mutex_init(&chip->mutex);
+        mutex_init(&chip->shutdown_mutex);
-        init_rwsem(&chip->shutdown_rwsem);
        chip->index = idx;
        chip->dev = dev;
        chip->card = card;
        chip->setup = device_setup[idx];
        chip->nrpacks = nrpacks;
+        chip->async_unlink = async_unlink;
        chip->probing = 1;
        chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
                              le16_to_cpu(dev->descriptor.idProduct));
        INIT_LIST_HEAD(&chip->pcm_list);
-        INIT_LIST_HEAD(&chip->ep_list);
        INIT_LIST_HEAD(&chip->midi_list);
        INIT_LIST_HEAD(&chip->mixer_list);
@@ -546,17 +548,15 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
                                     struct snd_usb_audio *chip)
 {
        struct snd_card *card;
-        struct list_head *p, *n;
+        struct list_head *p;
        if (chip == (void *)-1L)
                return;
        card = chip->card;
-        down_write(&chip->shutdown_rwsem);
-        chip->shutdown = 1;
-        up_write(&chip->shutdown_rwsem);
        mutex_lock(&register_mutex);
+        mutex_lock(&chip->shutdown_mutex);
+        chip->shutdown = 1;
        chip->num_interfaces--;
        if (chip->num_interfaces <= 0) {
                snd_card_disconnect(card);
@@ -564,10 +564,6 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
                list_for_each(p, &chip->pcm_list) {
                        snd_usb_stream_disconnect(p);
                }
-                /* release the endpoint resources */
-                list_for_each_safe(p, n, &chip->ep_list) {
-                        snd_usb_endpoint_free(p);
-                }
                /* release the midi resources */
                list_for_each(p, &chip->midi_list) {
                        snd_usbmidi_disconnect(p);
@@ -577,9 +573,11 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
                        snd_usb_mixer_disconnect(p);
                }
                usb_chip[chip->index] = NULL;
+                mutex_unlock(&chip->shutdown_mutex);
                mutex_unlock(&register_mutex);
                snd_card_free_when_closed(card);
        } else {
+                mutex_unlock(&chip->shutdown_mutex);
                mutex_unlock(&register_mutex);
        }
 }
@@ -611,20 +609,16 @@ int snd_usb_autoresume(struct snd_usb_audio *chip)
 {
        int err = -ENODEV;
-        down_read(&chip->shutdown_rwsem);
        if (!chip->shutdown && !chip->probing)
                err = usb_autopm_get_interface(chip->pm_intf);
-        up_read(&chip->shutdown_rwsem);
        return err;
 }
 void snd_usb_autosuspend(struct snd_usb_audio *chip)
 {
-        down_read(&chip->shutdown_rwsem);
        if (!chip->shutdown && !chip->probing)
                usb_autopm_put_interface(chip->pm_intf);
-        up_read(&chip->shutdown_rwsem);
 }
 static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
@@ -637,14 +631,12 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
        if (chip == (void *)-1L)
                return 0;
-        if (!PMSG_IS_AUTO(message)) {
+        if (!(message.event & PM_EVENT_AUTO)) {
                snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
                if (!chip->num_suspended_intf++) {
                        list_for_each(p, &chip->pcm_list) {
                                as = list_entry(p, struct snd_usb_stream, list);
                                snd_pcm_suspend_all(as->pcm);
-                                as->substream[0].need_setup_ep =
-                                        as->substream[1].need_setup_ep = true;
                        }
                }
        } else {
author	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
committer	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
commit	8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree	a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /sound/usb/card.c
parent	406089d01562f1e2bf9f089fd7637009ebaad589 (diff)