2010-03-05 02:46:13 +08:00
|
|
|
/*
|
|
|
|
* (Tentative) USB Audio Driver for ALSA
|
|
|
|
*
|
|
|
|
* Copyright (c) 2002 by Takashi Iwai <tiwai@suse.de>
|
|
|
|
*
|
|
|
|
* Many codes borrowed from audio.c by
|
|
|
|
* Alan Cox (alan@lxorguk.ukuu.org.uk)
|
|
|
|
* Thomas Sailer (sailer@ife.ee.ethz.ch)
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* NOTES:
|
|
|
|
*
|
|
|
|
* - 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
|
|
|
|
* this type *correctly*. SB extigy looks as if it supports, but it's
|
|
|
|
* indeed an AC3 stream packed in SPDIF frames (i.e. no real AC3 stream).
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <linux/bitops.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/string.h>
|
2011-03-21 19:00:00 +08:00
|
|
|
#include <linux/ctype.h>
|
2010-03-05 02:46:13 +08:00
|
|
|
#include <linux/usb.h>
|
|
|
|
#include <linux/moduleparam.h>
|
|
|
|
#include <linux/mutex.h>
|
|
|
|
#include <linux/usb/audio.h>
|
2010-03-12 04:13:20 +08:00
|
|
|
#include <linux/usb/audio-v2.h>
|
2011-07-16 00:38:28 +08:00
|
|
|
#include <linux/module.h>
|
2010-03-05 02:46:13 +08:00
|
|
|
|
2011-05-25 15:09:01 +08:00
|
|
|
#include <sound/control.h>
|
2010-03-05 02:46:13 +08:00
|
|
|
#include <sound/core.h>
|
|
|
|
#include <sound/info.h>
|
|
|
|
#include <sound/pcm.h>
|
|
|
|
#include <sound/pcm_params.h>
|
|
|
|
#include <sound/initval.h>
|
|
|
|
|
|
|
|
#include "usbaudio.h"
|
|
|
|
#include "card.h"
|
|
|
|
#include "midi.h"
|
2010-03-12 04:13:23 +08:00
|
|
|
#include "mixer.h"
|
2010-03-05 02:46:13 +08:00
|
|
|
#include "proc.h"
|
|
|
|
#include "quirks.h"
|
|
|
|
#include "endpoint.h"
|
|
|
|
#include "helper.h"
|
|
|
|
#include "debug.h"
|
|
|
|
#include "pcm.h"
|
|
|
|
#include "format.h"
|
2011-03-11 21:51:12 +08:00
|
|
|
#include "power.h"
|
2011-09-13 00:54:12 +08:00
|
|
|
#include "stream.h"
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
|
|
|
|
MODULE_DESCRIPTION("USB Audio");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
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 */
|
2011-12-15 11:19:36 +08:00
|
|
|
static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
|
2010-03-05 02:46:13 +08:00
|
|
|
/* 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 device_setup[SNDRV_CARDS]; /* device parameter for this card */
|
2011-12-15 11:19:36 +08:00
|
|
|
static bool ignore_ctl_error;
|
2013-04-04 05:18:56 +08:00
|
|
|
static bool autoclock = true;
|
ALSA: usb-audio: Add quirk_alias option
This patch adds a new option "quirk_alias" to snd-usb-audio driver for
allowing user to pass the quirk alias list. A quirk alias consists of
a string form like 0123abcd:5678beef, which makes to apply a quirk to
a device with USB ID 0123:abcd treated as if it were 5678:beef.
This feature is useful to test an existing quirk, typically for a
newer model of the same vendor, without patching / rebuilding the
kernel driver.
The current implementation is fairly simplistic: since there is no API
for matching a usb_device_id to the given ID pair, it has an open code
to loop over the id table and matches only with vendor:product pair.
So far, this is OK, as all existing entries are with vendor:product
pairs, indeed. Once when we have another matching entry, however,
we'd need to update get_alias_quirk() as well.
Note that this option is provided only for testing / development. If
you want to have a proper support, contact to upstream for adding the
matching quirk in the driver code statically.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2016-01-11 21:39:12 +08:00
|
|
|
static char *quirk_alias[SNDRV_CARDS];
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
module_param_array(index, int, NULL, 0444);
|
|
|
|
MODULE_PARM_DESC(index, "Index value for the USB audio adapter.");
|
|
|
|
module_param_array(id, charp, NULL, 0444);
|
|
|
|
MODULE_PARM_DESC(id, "ID string for the USB audio adapter.");
|
|
|
|
module_param_array(enable, bool, NULL, 0444);
|
|
|
|
MODULE_PARM_DESC(enable, "Enable USB audio adapter.");
|
|
|
|
module_param_array(vid, int, NULL, 0444);
|
|
|
|
MODULE_PARM_DESC(vid, "Vendor ID for the USB audio device.");
|
|
|
|
module_param_array(pid, int, NULL, 0444);
|
|
|
|
MODULE_PARM_DESC(pid, "Product ID for the USB audio device.");
|
|
|
|
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);
|
|
|
|
MODULE_PARM_DESC(ignore_ctl_error,
|
|
|
|
"Ignore errors from USB controller for mixer interfaces.");
|
2013-04-04 05:18:56 +08:00
|
|
|
module_param(autoclock, bool, 0444);
|
|
|
|
MODULE_PARM_DESC(autoclock, "Enable auto-clock selection for UAC2 devices (default: yes).");
|
ALSA: usb-audio: Add quirk_alias option
This patch adds a new option "quirk_alias" to snd-usb-audio driver for
allowing user to pass the quirk alias list. A quirk alias consists of
a string form like 0123abcd:5678beef, which makes to apply a quirk to
a device with USB ID 0123:abcd treated as if it were 5678:beef.
This feature is useful to test an existing quirk, typically for a
newer model of the same vendor, without patching / rebuilding the
kernel driver.
The current implementation is fairly simplistic: since there is no API
for matching a usb_device_id to the given ID pair, it has an open code
to loop over the id table and matches only with vendor:product pair.
So far, this is OK, as all existing entries are with vendor:product
pairs, indeed. Once when we have another matching entry, however,
we'd need to update get_alias_quirk() as well.
Note that this option is provided only for testing / development. If
you want to have a proper support, contact to upstream for adding the
matching quirk in the driver code statically.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2016-01-11 21:39:12 +08:00
|
|
|
module_param_array(quirk_alias, charp, NULL, 0444);
|
|
|
|
MODULE_PARM_DESC(quirk_alias, "Quirk aliases, e.g. 0123abcd:5678beef.");
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* we keep the snd_usb_audio_t instances by ourselves for merging
|
|
|
|
* the all interfaces on the same card as one sound device.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static DEFINE_MUTEX(register_mutex);
|
|
|
|
static struct snd_usb_audio *usb_chip[SNDRV_CARDS];
|
|
|
|
static struct usb_driver usb_audio_driver;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* disconnect streams
|
2014-10-31 18:00:23 +08:00
|
|
|
* called from usb_audio_disconnect()
|
2010-03-05 02:46:13 +08:00
|
|
|
*/
|
2014-10-31 18:24:32 +08:00
|
|
|
static void snd_usb_stream_disconnect(struct snd_usb_stream *as)
|
2010-03-05 02:46:13 +08:00
|
|
|
{
|
|
|
|
int idx;
|
|
|
|
struct snd_usb_substream *subs;
|
|
|
|
|
|
|
|
for (idx = 0; idx < 2; idx++) {
|
|
|
|
subs = &as->substream[idx];
|
|
|
|
if (!subs->num_formats)
|
2010-09-08 14:27:02 +08:00
|
|
|
continue;
|
2010-03-05 02:46:13 +08:00
|
|
|
subs->interface = -1;
|
2012-04-12 19:51:12 +08:00
|
|
|
subs->data_endpoint = NULL;
|
|
|
|
subs->sync_endpoint = NULL;
|
2010-03-05 02:46:13 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int interface)
|
|
|
|
{
|
|
|
|
struct usb_device *dev = chip->dev;
|
|
|
|
struct usb_host_interface *alts;
|
|
|
|
struct usb_interface_descriptor *altsd;
|
|
|
|
struct usb_interface *iface = usb_ifnum_to_if(dev, interface);
|
|
|
|
|
|
|
|
if (!iface) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "%u:%d : does not exist\n",
|
|
|
|
ctrlif, interface);
|
2010-03-05 02:46:13 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2013-06-15 17:21:09 +08:00
|
|
|
alts = &iface->altsetting[0];
|
|
|
|
altsd = get_iface_desc(alts);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Android with both accessory and audio interfaces enabled gets the
|
|
|
|
* interface numbers wrong.
|
|
|
|
*/
|
|
|
|
if ((chip->usb_id == USB_ID(0x18d1, 0x2d04) ||
|
|
|
|
chip->usb_id == USB_ID(0x18d1, 0x2d05)) &&
|
|
|
|
interface == 0 &&
|
|
|
|
altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC &&
|
|
|
|
altsd->bInterfaceSubClass == USB_SUBCLASS_VENDOR_SPEC) {
|
|
|
|
interface = 2;
|
|
|
|
iface = usb_ifnum_to_if(dev, interface);
|
|
|
|
if (!iface)
|
|
|
|
return -EINVAL;
|
|
|
|
alts = &iface->altsetting[0];
|
|
|
|
altsd = get_iface_desc(alts);
|
|
|
|
}
|
|
|
|
|
2010-03-05 02:46:13 +08:00
|
|
|
if (usb_interface_claimed(iface)) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_dbg(&dev->dev, "%d:%d: skipping, already claimed\n",
|
|
|
|
ctrlif, interface);
|
2010-03-05 02:46:13 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((altsd->bInterfaceClass == USB_CLASS_AUDIO ||
|
|
|
|
altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC) &&
|
|
|
|
altsd->bInterfaceSubClass == USB_SUBCLASS_MIDISTREAMING) {
|
2016-01-11 18:33:34 +08:00
|
|
|
int err = __snd_usbmidi_create(chip->card, iface,
|
|
|
|
&chip->midi_list, NULL,
|
|
|
|
chip->usb_id);
|
2010-03-05 02:46:13 +08:00
|
|
|
if (err < 0) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev,
|
|
|
|
"%u:%d: cannot create sequencer device\n",
|
|
|
|
ctrlif, interface);
|
2010-03-05 02:46:13 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((altsd->bInterfaceClass != USB_CLASS_AUDIO &&
|
|
|
|
altsd->bInterfaceClass != USB_CLASS_VENDOR_SPEC) ||
|
|
|
|
altsd->bInterfaceSubClass != USB_SUBCLASS_AUDIOSTREAMING) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_dbg(&dev->dev,
|
|
|
|
"%u:%d: skipping non-supported interface %d\n",
|
|
|
|
ctrlif, interface, altsd->bInterfaceClass);
|
2010-03-05 02:46:13 +08:00
|
|
|
/* skip non-supported classes */
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (snd_usb_get_speed(dev) == USB_SPEED_LOW) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "low speed audio streaming not supported\n");
|
2010-03-05 02:46:13 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2011-09-13 00:54:12 +08:00
|
|
|
if (! snd_usb_parse_audio_interface(chip, interface)) {
|
2010-03-05 02:46:13 +08:00
|
|
|
usb_set_interface(dev, interface, 0); /* reset the current interface */
|
|
|
|
usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* parse audio control descriptor and create pcm/midi streams
|
|
|
|
*/
|
|
|
|
static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
|
|
|
|
{
|
|
|
|
struct usb_device *dev = chip->dev;
|
|
|
|
struct usb_host_interface *host_iface;
|
|
|
|
struct usb_interface_descriptor *altsd;
|
|
|
|
void *control_header;
|
|
|
|
int i, protocol;
|
|
|
|
|
|
|
|
/* find audiocontrol interface */
|
|
|
|
host_iface = &usb_ifnum_to_if(dev, ctrlif)->altsetting[0];
|
|
|
|
control_header = snd_usb_find_csint_desc(host_iface->extra,
|
|
|
|
host_iface->extralen,
|
|
|
|
NULL, UAC_HEADER);
|
|
|
|
altsd = get_iface_desc(host_iface);
|
|
|
|
protocol = altsd->bInterfaceProtocol;
|
|
|
|
|
|
|
|
if (!control_header) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "cannot find UAC_HEADER\n");
|
2010-03-05 02:46:13 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (protocol) {
|
2010-09-03 16:53:11 +08:00
|
|
|
default:
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_warn(&dev->dev,
|
|
|
|
"unknown interface protocol %#02x, assuming v1\n",
|
|
|
|
protocol);
|
2010-09-03 16:53:11 +08:00
|
|
|
/* fall through */
|
|
|
|
|
2010-03-05 02:46:13 +08:00
|
|
|
case UAC_VERSION_1: {
|
2010-06-16 23:57:28 +08:00
|
|
|
struct uac1_ac_header_descriptor *h1 = control_header;
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
if (!h1->bInCollection) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_info(&dev->dev, "skipping empty audio interface (v1)\n");
|
2010-03-05 02:46:13 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h1->bLength < sizeof(*h1) + h1->bInCollection) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "invalid UAC_HEADER (v1)\n");
|
2010-03-05 02:46:13 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < h1->bInCollection; i++)
|
|
|
|
snd_usb_create_stream(chip, ctrlif, h1->baInterfaceNr[i]);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case UAC_VERSION_2: {
|
|
|
|
struct usb_interface_assoc_descriptor *assoc =
|
|
|
|
usb_ifnum_to_if(dev, ctrlif)->intf_assoc;
|
|
|
|
|
2013-03-12 03:15:34 +08:00
|
|
|
if (!assoc) {
|
|
|
|
/*
|
|
|
|
* Firmware writers cannot count to three. So to find
|
|
|
|
* the IAD on the NuForce UDH-100, also check the next
|
|
|
|
* interface.
|
|
|
|
*/
|
|
|
|
struct usb_interface *iface =
|
|
|
|
usb_ifnum_to_if(dev, ctrlif + 1);
|
|
|
|
if (iface &&
|
|
|
|
iface->intf_assoc &&
|
|
|
|
iface->intf_assoc->bFunctionClass == USB_CLASS_AUDIO &&
|
|
|
|
iface->intf_assoc->bFunctionProtocol == UAC_VERSION_2)
|
|
|
|
assoc = iface->intf_assoc;
|
|
|
|
}
|
|
|
|
|
2010-03-05 02:46:13 +08:00
|
|
|
if (!assoc) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "Audio class v2 interfaces need an interface association\n");
|
2010-03-05 02:46:13 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < assoc->bInterfaceCount; i++) {
|
|
|
|
int intf = assoc->bFirstInterface + i;
|
|
|
|
|
|
|
|
if (intf != ctrlif)
|
|
|
|
snd_usb_create_stream(chip, ctrlif, intf);
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* free the chip instance
|
|
|
|
*
|
|
|
|
* here we have to do not much, since pcm and controls are already freed
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int snd_usb_audio_free(struct snd_usb_audio *chip)
|
|
|
|
{
|
2014-10-31 18:24:32 +08:00
|
|
|
struct snd_usb_endpoint *ep, *n;
|
2014-06-25 20:24:47 +08:00
|
|
|
|
2014-10-31 18:24:32 +08:00
|
|
|
list_for_each_entry_safe(ep, n, &chip->ep_list, list)
|
|
|
|
snd_usb_endpoint_free(ep);
|
2014-06-25 20:24:47 +08:00
|
|
|
|
2012-04-12 19:51:10 +08:00
|
|
|
mutex_destroy(&chip->mutex);
|
2016-01-11 18:33:34 +08:00
|
|
|
dev_set_drvdata(&chip->dev->dev, NULL);
|
2010-03-05 02:46:13 +08:00
|
|
|
kfree(chip);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int snd_usb_audio_dev_free(struct snd_device *device)
|
|
|
|
{
|
|
|
|
struct snd_usb_audio *chip = device->device_data;
|
|
|
|
return snd_usb_audio_free(chip);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* create a chip instance and set its names.
|
|
|
|
*/
|
2014-01-29 21:22:20 +08:00
|
|
|
static int snd_usb_audio_create(struct usb_interface *intf,
|
|
|
|
struct usb_device *dev, int idx,
|
2010-03-05 02:46:13 +08:00
|
|
|
const struct snd_usb_audio_quirk *quirk,
|
|
|
|
struct snd_usb_audio **rchip)
|
|
|
|
{
|
|
|
|
struct snd_card *card;
|
|
|
|
struct snd_usb_audio *chip;
|
|
|
|
int err, len;
|
|
|
|
char component[14];
|
|
|
|
static struct snd_device_ops ops = {
|
|
|
|
.dev_free = snd_usb_audio_dev_free,
|
|
|
|
};
|
|
|
|
|
|
|
|
*rchip = NULL;
|
|
|
|
|
2010-08-14 03:42:07 +08:00
|
|
|
switch (snd_usb_get_speed(dev)) {
|
|
|
|
case USB_SPEED_LOW:
|
|
|
|
case USB_SPEED_FULL:
|
|
|
|
case USB_SPEED_HIGH:
|
2013-10-02 03:32:15 +08:00
|
|
|
case USB_SPEED_WIRELESS:
|
2010-08-14 03:42:07 +08:00
|
|
|
case USB_SPEED_SUPER:
|
2016-05-04 20:18:39 +08:00
|
|
|
case USB_SPEED_SUPER_PLUS:
|
2010-08-14 03:42:07 +08:00
|
|
|
break;
|
|
|
|
default:
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "unknown device speed %d\n", snd_usb_get_speed(dev));
|
2010-03-05 02:46:13 +08:00
|
|
|
return -ENXIO;
|
|
|
|
}
|
|
|
|
|
2014-01-29 21:22:20 +08:00
|
|
|
err = snd_card_new(&intf->dev, index[idx], id[idx], THIS_MODULE,
|
|
|
|
0, &card);
|
2010-03-05 02:46:13 +08:00
|
|
|
if (err < 0) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "cannot create card instance %d\n", idx);
|
2010-03-05 02:46:13 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
|
|
|
|
if (! chip) {
|
|
|
|
snd_card_free(card);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2012-04-12 19:51:10 +08:00
|
|
|
mutex_init(&chip->mutex);
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
init_waitqueue_head(&chip->shutdown_wait);
|
2010-03-05 02:46:13 +08:00
|
|
|
chip->index = idx;
|
|
|
|
chip->dev = dev;
|
|
|
|
chip->card = card;
|
|
|
|
chip->setup = device_setup[idx];
|
2013-04-04 05:18:56 +08:00
|
|
|
chip->autoclock = autoclock;
|
2015-08-26 16:20:59 +08:00
|
|
|
atomic_set(&chip->active, 1); /* avoid autopm during probing */
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
atomic_set(&chip->usage_count, 0);
|
|
|
|
atomic_set(&chip->shutdown, 0);
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
|
|
|
|
le16_to_cpu(dev->descriptor.idProduct));
|
|
|
|
INIT_LIST_HEAD(&chip->pcm_list);
|
2012-04-12 19:51:12 +08:00
|
|
|
INIT_LIST_HEAD(&chip->ep_list);
|
2010-03-05 02:46:13 +08:00
|
|
|
INIT_LIST_HEAD(&chip->midi_list);
|
|
|
|
INIT_LIST_HEAD(&chip->mixer_list);
|
|
|
|
|
|
|
|
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
|
|
|
|
snd_usb_audio_free(chip);
|
|
|
|
snd_card_free(card);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
strcpy(card->driver, "USB-Audio");
|
|
|
|
sprintf(component, "USB%04x:%04x",
|
|
|
|
USB_ID_VENDOR(chip->usb_id), USB_ID_PRODUCT(chip->usb_id));
|
|
|
|
snd_component_add(card, component);
|
|
|
|
|
|
|
|
/* retrieve the device string as shortname */
|
2011-03-21 19:00:00 +08:00
|
|
|
if (quirk && quirk->product_name && *quirk->product_name) {
|
2010-03-05 02:46:13 +08:00
|
|
|
strlcpy(card->shortname, quirk->product_name, sizeof(card->shortname));
|
|
|
|
} else {
|
|
|
|
if (!dev->descriptor.iProduct ||
|
|
|
|
usb_string(dev, dev->descriptor.iProduct,
|
|
|
|
card->shortname, sizeof(card->shortname)) <= 0) {
|
|
|
|
/* no name available from anywhere, so use ID */
|
|
|
|
sprintf(card->shortname, "USB Device %#04x:%#04x",
|
|
|
|
USB_ID_VENDOR(chip->usb_id),
|
|
|
|
USB_ID_PRODUCT(chip->usb_id));
|
|
|
|
}
|
|
|
|
}
|
2014-10-31 18:32:19 +08:00
|
|
|
strim(card->shortname);
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
/* retrieve the vendor and device strings as longname */
|
2011-03-21 19:00:00 +08:00
|
|
|
if (quirk && quirk->vendor_name && *quirk->vendor_name) {
|
2010-03-05 02:46:13 +08:00
|
|
|
len = strlcpy(card->longname, quirk->vendor_name, sizeof(card->longname));
|
|
|
|
} else {
|
|
|
|
if (dev->descriptor.iManufacturer)
|
|
|
|
len = usb_string(dev, dev->descriptor.iManufacturer,
|
|
|
|
card->longname, sizeof(card->longname));
|
|
|
|
else
|
|
|
|
len = 0;
|
|
|
|
/* we don't really care if there isn't any vendor string */
|
|
|
|
}
|
2011-03-21 19:00:00 +08:00
|
|
|
if (len > 0) {
|
2014-10-31 18:32:19 +08:00
|
|
|
strim(card->longname);
|
2011-03-21 19:00:00 +08:00
|
|
|
if (*card->longname)
|
|
|
|
strlcat(card->longname, " ", sizeof(card->longname));
|
|
|
|
}
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
strlcat(card->longname, card->shortname, sizeof(card->longname));
|
|
|
|
|
|
|
|
len = strlcat(card->longname, " at ", sizeof(card->longname));
|
|
|
|
|
|
|
|
if (len < sizeof(card->longname))
|
|
|
|
usb_make_path(dev, card->longname + len, sizeof(card->longname) - len);
|
|
|
|
|
2010-08-14 03:42:07 +08:00
|
|
|
switch (snd_usb_get_speed(dev)) {
|
|
|
|
case USB_SPEED_LOW:
|
|
|
|
strlcat(card->longname, ", low speed", sizeof(card->longname));
|
|
|
|
break;
|
|
|
|
case USB_SPEED_FULL:
|
|
|
|
strlcat(card->longname, ", full speed", sizeof(card->longname));
|
|
|
|
break;
|
|
|
|
case USB_SPEED_HIGH:
|
|
|
|
strlcat(card->longname, ", high speed", sizeof(card->longname));
|
|
|
|
break;
|
|
|
|
case USB_SPEED_SUPER:
|
|
|
|
strlcat(card->longname, ", super speed", sizeof(card->longname));
|
|
|
|
break;
|
2016-05-04 20:18:39 +08:00
|
|
|
case USB_SPEED_SUPER_PLUS:
|
|
|
|
strlcat(card->longname, ", super speed plus", sizeof(card->longname));
|
|
|
|
break;
|
2010-08-14 03:42:07 +08:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
snd_usb_audio_create_proc(chip);
|
|
|
|
|
|
|
|
*rchip = chip;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
ALSA: usb-audio: Add quirk_alias option
This patch adds a new option "quirk_alias" to snd-usb-audio driver for
allowing user to pass the quirk alias list. A quirk alias consists of
a string form like 0123abcd:5678beef, which makes to apply a quirk to
a device with USB ID 0123:abcd treated as if it were 5678:beef.
This feature is useful to test an existing quirk, typically for a
newer model of the same vendor, without patching / rebuilding the
kernel driver.
The current implementation is fairly simplistic: since there is no API
for matching a usb_device_id to the given ID pair, it has an open code
to loop over the id table and matches only with vendor:product pair.
So far, this is OK, as all existing entries are with vendor:product
pairs, indeed. Once when we have another matching entry, however,
we'd need to update get_alias_quirk() as well.
Note that this option is provided only for testing / development. If
you want to have a proper support, contact to upstream for adding the
matching quirk in the driver code statically.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2016-01-11 21:39:12 +08:00
|
|
|
/* look for a matching quirk alias id */
|
|
|
|
static bool get_alias_id(struct usb_device *dev, unsigned int *id)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
unsigned int src, dst;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(quirk_alias); i++) {
|
|
|
|
if (!quirk_alias[i] ||
|
|
|
|
sscanf(quirk_alias[i], "%x:%x", &src, &dst) != 2 ||
|
|
|
|
src != *id)
|
|
|
|
continue;
|
|
|
|
dev_info(&dev->dev,
|
|
|
|
"device (%04x:%04x): applying quirk alias %04x:%04x\n",
|
|
|
|
USB_ID_VENDOR(*id), USB_ID_PRODUCT(*id),
|
|
|
|
USB_ID_VENDOR(dst), USB_ID_PRODUCT(dst));
|
|
|
|
*id = dst;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct usb_device_id usb_audio_ids[]; /* defined below */
|
|
|
|
|
|
|
|
/* look for the corresponding quirk */
|
|
|
|
static const struct snd_usb_audio_quirk *
|
|
|
|
get_alias_quirk(struct usb_device *dev, unsigned int id)
|
|
|
|
{
|
|
|
|
const struct usb_device_id *p;
|
|
|
|
|
|
|
|
for (p = usb_audio_ids; p->match_flags; p++) {
|
|
|
|
/* FIXME: this checks only vendor:product pair in the list */
|
|
|
|
if ((p->match_flags & USB_DEVICE_ID_MATCH_DEVICE) ==
|
|
|
|
USB_DEVICE_ID_MATCH_DEVICE &&
|
|
|
|
p->idVendor == USB_ID_VENDOR(id) &&
|
|
|
|
p->idProduct == USB_ID_PRODUCT(id))
|
|
|
|
return (const struct snd_usb_audio_quirk *)p->driver_info;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2010-03-05 02:46:13 +08:00
|
|
|
/*
|
|
|
|
* probe the active usb device
|
|
|
|
*
|
|
|
|
* note that this can be called multiple times per a device, when it
|
|
|
|
* includes multiple audio control interfaces.
|
|
|
|
*
|
|
|
|
* thus we check the usb device pointer and creates the card instance
|
|
|
|
* only at the first time. the successive calls of this function will
|
|
|
|
* append the pcm interface to the corresponding card.
|
|
|
|
*/
|
2014-10-31 18:00:23 +08:00
|
|
|
static int usb_audio_probe(struct usb_interface *intf,
|
|
|
|
const struct usb_device_id *usb_id)
|
2010-03-05 02:46:13 +08:00
|
|
|
{
|
2014-10-31 18:00:23 +08:00
|
|
|
struct usb_device *dev = interface_to_usbdev(intf);
|
|
|
|
const struct snd_usb_audio_quirk *quirk =
|
|
|
|
(const struct snd_usb_audio_quirk *)usb_id->driver_info;
|
2010-03-05 02:46:13 +08:00
|
|
|
struct snd_usb_audio *chip;
|
2014-10-31 18:00:23 +08:00
|
|
|
int i, err;
|
2010-03-05 02:46:13 +08:00
|
|
|
struct usb_host_interface *alts;
|
|
|
|
int ifnum;
|
|
|
|
u32 id;
|
|
|
|
|
|
|
|
alts = &intf->altsetting[0];
|
|
|
|
ifnum = get_iface_desc(alts)->bInterfaceNumber;
|
|
|
|
id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
|
|
|
|
le16_to_cpu(dev->descriptor.idProduct));
|
ALSA: usb-audio: Add quirk_alias option
This patch adds a new option "quirk_alias" to snd-usb-audio driver for
allowing user to pass the quirk alias list. A quirk alias consists of
a string form like 0123abcd:5678beef, which makes to apply a quirk to
a device with USB ID 0123:abcd treated as if it were 5678:beef.
This feature is useful to test an existing quirk, typically for a
newer model of the same vendor, without patching / rebuilding the
kernel driver.
The current implementation is fairly simplistic: since there is no API
for matching a usb_device_id to the given ID pair, it has an open code
to loop over the id table and matches only with vendor:product pair.
So far, this is OK, as all existing entries are with vendor:product
pairs, indeed. Once when we have another matching entry, however,
we'd need to update get_alias_quirk() as well.
Note that this option is provided only for testing / development. If
you want to have a proper support, contact to upstream for adding the
matching quirk in the driver code statically.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2016-01-11 21:39:12 +08:00
|
|
|
if (get_alias_id(dev, &id))
|
|
|
|
quirk = get_alias_quirk(dev, id);
|
2010-03-05 02:46:13 +08:00
|
|
|
if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum)
|
2014-10-31 18:00:23 +08:00
|
|
|
return -ENXIO;
|
2010-03-05 02:46:13 +08:00
|
|
|
|
2016-01-11 18:33:34 +08:00
|
|
|
err = snd_usb_apply_boot_quirk(dev, intf, quirk, id);
|
2014-10-31 18:00:23 +08:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* found a config. now register to ALSA
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* check whether it's already registered */
|
|
|
|
chip = NULL;
|
|
|
|
mutex_lock(®ister_mutex);
|
|
|
|
for (i = 0; i < SNDRV_CARDS; i++) {
|
|
|
|
if (usb_chip[i] && usb_chip[i]->dev == dev) {
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
if (atomic_read(&usb_chip[i]->shutdown)) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "USB device is in the shutdown state, cannot create a card instance\n");
|
2014-10-31 18:00:23 +08:00
|
|
|
err = -EIO;
|
2010-03-05 02:46:13 +08:00
|
|
|
goto __error;
|
|
|
|
}
|
|
|
|
chip = usb_chip[i];
|
2015-08-26 16:20:59 +08:00
|
|
|
atomic_inc(&chip->active); /* avoid autopm */
|
2010-03-05 02:46:13 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (! chip) {
|
|
|
|
/* it's a fresh one.
|
|
|
|
* now look for an empty slot and create a new card instance
|
|
|
|
*/
|
|
|
|
for (i = 0; i < SNDRV_CARDS; i++)
|
|
|
|
if (enable[i] && ! usb_chip[i] &&
|
|
|
|
(vid[i] == -1 || vid[i] == USB_ID_VENDOR(id)) &&
|
|
|
|
(pid[i] == -1 || pid[i] == USB_ID_PRODUCT(id))) {
|
2014-10-31 18:00:23 +08:00
|
|
|
err = snd_usb_audio_create(intf, dev, i, quirk,
|
|
|
|
&chip);
|
|
|
|
if (err < 0)
|
2010-03-05 02:46:13 +08:00
|
|
|
goto __error;
|
2011-03-11 21:51:12 +08:00
|
|
|
chip->pm_intf = intf;
|
2010-03-05 02:46:13 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!chip) {
|
2014-02-26 20:02:17 +08:00
|
|
|
dev_err(&dev->dev, "no available usb audio device\n");
|
2014-10-31 18:00:23 +08:00
|
|
|
err = -ENODEV;
|
2010-03-05 02:46:13 +08:00
|
|
|
goto __error;
|
|
|
|
}
|
|
|
|
}
|
2016-07-18 00:16:15 +08:00
|
|
|
dev_set_drvdata(&dev->dev, chip);
|
2010-03-05 02:46:13 +08:00
|
|
|
|
2010-09-02 17:13:15 +08:00
|
|
|
/*
|
|
|
|
* For devices with more than one control interface, we assume the
|
|
|
|
* first contains the audio controls. We might need a more specific
|
|
|
|
* check here in the future.
|
|
|
|
*/
|
|
|
|
if (!chip->ctrl_intf)
|
|
|
|
chip->ctrl_intf = alts;
|
2010-05-31 20:51:31 +08:00
|
|
|
|
2011-05-25 15:08:59 +08:00
|
|
|
chip->txfr_quirk = 0;
|
|
|
|
err = 1; /* continue */
|
|
|
|
if (quirk && quirk->ifnum != QUIRK_NO_INTERFACE) {
|
|
|
|
/* need some special handlings */
|
2014-10-31 18:00:23 +08:00
|
|
|
err = snd_usb_create_quirk(chip, intf, &usb_audio_driver, quirk);
|
|
|
|
if (err < 0)
|
2011-05-25 15:08:59 +08:00
|
|
|
goto __error;
|
|
|
|
}
|
|
|
|
|
2010-03-05 02:46:13 +08:00
|
|
|
if (err > 0) {
|
|
|
|
/* create normal USB audio interfaces */
|
2014-10-31 18:00:23 +08:00
|
|
|
err = snd_usb_create_streams(chip, ifnum);
|
|
|
|
if (err < 0)
|
|
|
|
goto __error;
|
|
|
|
err = snd_usb_create_mixer(chip, ifnum, ignore_ctl_error);
|
|
|
|
if (err < 0)
|
2010-03-05 02:46:13 +08:00
|
|
|
goto __error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we are allowed to call snd_card_register() many times */
|
2014-10-31 18:00:23 +08:00
|
|
|
err = snd_card_register(chip->card);
|
|
|
|
if (err < 0)
|
2010-03-05 02:46:13 +08:00
|
|
|
goto __error;
|
|
|
|
|
|
|
|
usb_chip[chip->index] = chip;
|
|
|
|
chip->num_interfaces++;
|
2014-10-31 18:00:23 +08:00
|
|
|
usb_set_intfdata(intf, chip);
|
2015-08-26 16:20:59 +08:00
|
|
|
atomic_dec(&chip->active);
|
2010-03-05 02:46:13 +08:00
|
|
|
mutex_unlock(®ister_mutex);
|
2014-10-31 18:00:23 +08:00
|
|
|
return 0;
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
__error:
|
2011-09-26 21:43:59 +08:00
|
|
|
if (chip) {
|
|
|
|
if (!chip->num_interfaces)
|
|
|
|
snd_card_free(chip->card);
|
2015-08-26 16:20:59 +08:00
|
|
|
atomic_dec(&chip->active);
|
2011-09-26 21:43:59 +08:00
|
|
|
}
|
2010-03-05 02:46:13 +08:00
|
|
|
mutex_unlock(®ister_mutex);
|
2014-10-31 18:00:23 +08:00
|
|
|
return err;
|
2010-03-05 02:46:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we need to take care of counter, since disconnection can be called also
|
|
|
|
* many times as well as usb_audio_probe().
|
|
|
|
*/
|
2014-10-31 18:00:23 +08:00
|
|
|
static void usb_audio_disconnect(struct usb_interface *intf)
|
2010-03-05 02:46:13 +08:00
|
|
|
{
|
2014-10-31 18:00:23 +08:00
|
|
|
struct snd_usb_audio *chip = usb_get_intfdata(intf);
|
2010-03-05 02:46:13 +08:00
|
|
|
struct snd_card *card;
|
2014-06-25 20:24:47 +08:00
|
|
|
struct list_head *p;
|
2010-03-05 02:46:13 +08:00
|
|
|
|
2011-07-06 23:20:13 +08:00
|
|
|
if (chip == (void *)-1L)
|
2010-03-05 02:46:13 +08:00
|
|
|
return;
|
|
|
|
|
|
|
|
card = chip->card;
|
2012-11-13 18:22:48 +08:00
|
|
|
|
|
|
|
mutex_lock(®ister_mutex);
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
if (atomic_inc_return(&chip->shutdown) == 1) {
|
2014-10-31 18:24:32 +08:00
|
|
|
struct snd_usb_stream *as;
|
2014-06-25 20:24:47 +08:00
|
|
|
struct snd_usb_endpoint *ep;
|
2014-10-31 18:24:32 +08:00
|
|
|
struct usb_mixer_interface *mixer;
|
2014-06-25 20:24:47 +08:00
|
|
|
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
/* wait until all pending tasks done;
|
|
|
|
* they are protected by snd_usb_lock_shutdown()
|
|
|
|
*/
|
|
|
|
wait_event(chip->shutdown_wait,
|
|
|
|
!atomic_read(&chip->usage_count));
|
2010-03-05 02:46:13 +08:00
|
|
|
snd_card_disconnect(card);
|
|
|
|
/* release the pcm resources */
|
2014-10-31 18:24:32 +08:00
|
|
|
list_for_each_entry(as, &chip->pcm_list, list) {
|
|
|
|
snd_usb_stream_disconnect(as);
|
2010-03-05 02:46:13 +08:00
|
|
|
}
|
2012-04-12 19:51:12 +08:00
|
|
|
/* release the endpoint resources */
|
2014-06-25 20:24:47 +08:00
|
|
|
list_for_each_entry(ep, &chip->ep_list, list) {
|
|
|
|
snd_usb_endpoint_release(ep);
|
2012-04-12 19:51:12 +08:00
|
|
|
}
|
2010-03-05 02:46:13 +08:00
|
|
|
/* release the midi resources */
|
|
|
|
list_for_each(p, &chip->midi_list) {
|
|
|
|
snd_usbmidi_disconnect(p);
|
|
|
|
}
|
|
|
|
/* release mixer resources */
|
2014-10-31 18:24:32 +08:00
|
|
|
list_for_each_entry(mixer, &chip->mixer_list, list) {
|
|
|
|
snd_usb_mixer_disconnect(mixer);
|
2010-03-05 02:46:13 +08:00
|
|
|
}
|
2014-11-05 22:08:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
chip->num_interfaces--;
|
|
|
|
if (chip->num_interfaces <= 0) {
|
2010-03-05 02:46:13 +08:00
|
|
|
usb_chip[chip->index] = NULL;
|
|
|
|
mutex_unlock(®ister_mutex);
|
|
|
|
snd_card_free_when_closed(card);
|
|
|
|
} else {
|
|
|
|
mutex_unlock(®ister_mutex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
/* lock the shutdown (disconnect) task and autoresume */
|
|
|
|
int snd_usb_lock_shutdown(struct snd_usb_audio *chip)
|
2011-03-11 21:51:12 +08:00
|
|
|
{
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
int err;
|
2011-03-11 21:51:12 +08:00
|
|
|
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
atomic_inc(&chip->usage_count);
|
|
|
|
if (atomic_read(&chip->shutdown)) {
|
|
|
|
err = -EIO;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
err = snd_usb_autoresume(chip);
|
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
return 0;
|
2011-03-11 21:51:12 +08:00
|
|
|
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
error:
|
|
|
|
if (atomic_dec_and_test(&chip->usage_count))
|
|
|
|
wake_up(&chip->shutdown_wait);
|
2011-03-11 21:51:12 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
/* autosuspend and unlock the shutdown */
|
|
|
|
void snd_usb_unlock_shutdown(struct snd_usb_audio *chip)
|
|
|
|
{
|
|
|
|
snd_usb_autosuspend(chip);
|
|
|
|
if (atomic_dec_and_test(&chip->usage_count))
|
|
|
|
wake_up(&chip->shutdown_wait);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
|
|
|
|
int snd_usb_autoresume(struct snd_usb_audio *chip)
|
|
|
|
{
|
|
|
|
if (atomic_read(&chip->shutdown))
|
|
|
|
return -EIO;
|
|
|
|
if (atomic_inc_return(&chip->active) == 1)
|
|
|
|
return usb_autopm_get_interface(chip->pm_intf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-03-11 21:51:12 +08:00
|
|
|
void snd_usb_autosuspend(struct snd_usb_audio *chip)
|
|
|
|
{
|
2016-01-12 21:03:33 +08:00
|
|
|
if (atomic_read(&chip->shutdown))
|
|
|
|
return;
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
if (atomic_dec_and_test(&chip->active))
|
2011-03-11 21:51:12 +08:00
|
|
|
usb_autopm_put_interface(chip->pm_intf);
|
|
|
|
}
|
|
|
|
|
2010-03-05 02:46:13 +08:00
|
|
|
static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
|
|
|
|
{
|
|
|
|
struct snd_usb_audio *chip = usb_get_intfdata(intf);
|
|
|
|
struct snd_usb_stream *as;
|
2011-03-11 20:19:43 +08:00
|
|
|
struct usb_mixer_interface *mixer;
|
2014-08-06 00:44:50 +08:00
|
|
|
struct list_head *p;
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
if (chip == (void *)-1L)
|
|
|
|
return 0;
|
|
|
|
|
2015-08-26 16:23:26 +08:00
|
|
|
chip->autosuspended = !!PMSG_IS_AUTO(message);
|
|
|
|
if (!chip->autosuspended)
|
2011-03-11 21:51:12 +08:00
|
|
|
snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
|
2015-08-26 16:23:26 +08:00
|
|
|
if (!chip->num_suspended_intf++) {
|
|
|
|
list_for_each_entry(as, &chip->pcm_list, list) {
|
|
|
|
snd_pcm_suspend_all(as->pcm);
|
|
|
|
as->substream[0].need_setup_ep =
|
|
|
|
as->substream[1].need_setup_ep = true;
|
2013-01-29 19:56:30 +08:00
|
|
|
}
|
2015-08-26 16:23:26 +08:00
|
|
|
list_for_each(p, &chip->midi_list)
|
|
|
|
snd_usbmidi_suspend(p);
|
2014-05-03 00:14:42 +08:00
|
|
|
list_for_each_entry(mixer, &chip->mixer_list, list)
|
|
|
|
snd_usb_mixer_suspend(mixer);
|
2015-08-26 16:23:26 +08:00
|
|
|
}
|
2011-03-11 21:51:12 +08:00
|
|
|
|
2010-03-05 02:46:13 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-01-20 23:51:16 +08:00
|
|
|
static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume)
|
2010-03-05 02:46:13 +08:00
|
|
|
{
|
|
|
|
struct snd_usb_audio *chip = usb_get_intfdata(intf);
|
2011-03-11 20:19:43 +08:00
|
|
|
struct usb_mixer_interface *mixer;
|
2014-08-06 00:44:50 +08:00
|
|
|
struct list_head *p;
|
2011-03-11 21:51:12 +08:00
|
|
|
int err = 0;
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
if (chip == (void *)-1L)
|
|
|
|
return 0;
|
|
|
|
if (--chip->num_suspended_intf)
|
|
|
|
return 0;
|
2014-05-03 00:17:06 +08:00
|
|
|
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
atomic_inc(&chip->active); /* avoid autopm */
|
2010-03-05 02:46:13 +08:00
|
|
|
/*
|
|
|
|
* ALSA leaves material resumption to user space
|
2011-03-11 20:19:43 +08:00
|
|
|
* we just notify and restart the mixers
|
2010-03-05 02:46:13 +08:00
|
|
|
*/
|
2011-03-11 21:51:12 +08:00
|
|
|
list_for_each_entry(mixer, &chip->mixer_list, list) {
|
2014-01-20 23:51:16 +08:00
|
|
|
err = snd_usb_mixer_resume(mixer, reset_resume);
|
2011-03-11 21:51:12 +08:00
|
|
|
if (err < 0)
|
|
|
|
goto err_out;
|
|
|
|
}
|
2010-03-05 02:46:13 +08:00
|
|
|
|
2014-08-06 00:44:50 +08:00
|
|
|
list_for_each(p, &chip->midi_list) {
|
|
|
|
snd_usbmidi_resume(p);
|
|
|
|
}
|
|
|
|
|
2011-03-11 21:51:12 +08:00
|
|
|
if (!chip->autosuspended)
|
|
|
|
snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
|
|
|
|
chip->autosuspended = 0;
|
2010-03-05 02:46:13 +08:00
|
|
|
|
2011-03-11 21:51:12 +08:00
|
|
|
err_out:
|
ALSA: usb-audio: Avoid nested autoresume calls
After the recent fix of runtime PM for USB-audio driver, we got a
lockdep warning like:
=============================================
[ INFO: possible recursive locking detected ]
4.2.0-rc8+ #61 Not tainted
---------------------------------------------
pulseaudio/980 is trying to acquire lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
but task is already holding lock:
(&chip->shutdown_rwsem){.+.+.+}, at: [<ffffffffa0355dac>] snd_usb_autoresume+0x1d/0x52 [snd_usb_audio]
This comes from snd_usb_autoresume() invoking down_read() and it's
used in a nested way. Although it's basically safe, per se (as these
are read locks), it's better to reduce such spurious warnings.
The read lock is needed to guarantee the execution of "shutdown"
(cleanup at disconnection) task after all concurrent tasks are
finished. This can be implemented in another better way.
Also, the current check of chip->in_pm isn't good enough for
protecting the racy execution of multiple auto-resumes.
This patch rewrites the logic of snd_usb_autoresume() & co; namely,
- The recursive call of autopm is avoided by the new refcount,
chip->active. The chip->in_pm flag is removed accordingly.
- Instead of rwsem, another refcount, chip->usage_count, is introduced
for tracking the period to delay the shutdown procedure. At
the last clear of this refcount, wake_up() to the shutdown waiter is
called.
- The shutdown flag is replaced with shutdown atomic count; this is
for reducing the lock.
- Two new helpers are introduced to simplify the management of these
refcounts; snd_usb_lock_shutdown() increases the usage_count, checks
the shutdown state, and does autoresume. snd_usb_unlock_shutdown()
does the opposite. Most of mixer and other codes just need this,
and simply returns an error if it receives an error from lock.
Fixes: 9003ebb13f61 ('ALSA: usb-audio: Fix runtime PM unbalance')
Reported-and-tested-by: Alexnader Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-08-25 22:09:00 +08:00
|
|
|
atomic_dec(&chip->active); /* allow autopm after this point */
|
2011-03-11 21:51:12 +08:00
|
|
|
return err;
|
2010-03-05 02:46:13 +08:00
|
|
|
}
|
2014-01-20 23:51:16 +08:00
|
|
|
|
|
|
|
static int usb_audio_resume(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
return __usb_audio_resume(intf, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usb_audio_reset_resume(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
return __usb_audio_resume(intf, true);
|
|
|
|
}
|
2010-03-22 23:55:35 +08:00
|
|
|
#else
|
|
|
|
#define usb_audio_suspend NULL
|
|
|
|
#define usb_audio_resume NULL
|
2014-01-20 23:51:16 +08:00
|
|
|
#define usb_audio_reset_resume NULL
|
2010-03-05 02:46:13 +08:00
|
|
|
#endif /* CONFIG_PM */
|
|
|
|
|
|
|
|
static struct usb_device_id usb_audio_ids [] = {
|
|
|
|
#include "quirks-table.h"
|
|
|
|
{ .match_flags = (USB_DEVICE_ID_MATCH_INT_CLASS | USB_DEVICE_ID_MATCH_INT_SUBCLASS),
|
|
|
|
.bInterfaceClass = USB_CLASS_AUDIO,
|
|
|
|
.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL },
|
|
|
|
{ } /* Terminating entry */
|
|
|
|
};
|
2013-04-04 05:18:50 +08:00
|
|
|
MODULE_DEVICE_TABLE(usb, usb_audio_ids);
|
2010-03-05 02:46:13 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* entry point for linux usb interface
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct usb_driver usb_audio_driver = {
|
|
|
|
.name = "snd-usb-audio",
|
|
|
|
.probe = usb_audio_probe,
|
|
|
|
.disconnect = usb_audio_disconnect,
|
|
|
|
.suspend = usb_audio_suspend,
|
|
|
|
.resume = usb_audio_resume,
|
2014-01-20 23:51:16 +08:00
|
|
|
.reset_resume = usb_audio_reset_resume,
|
2010-03-05 02:46:13 +08:00
|
|
|
.id_table = usb_audio_ids,
|
2011-03-11 21:51:12 +08:00
|
|
|
.supports_autosuspend = 1,
|
2010-03-05 02:46:13 +08:00
|
|
|
};
|
|
|
|
|
2013-10-09 19:52:32 +08:00
|
|
|
module_usb_driver(usb_audio_driver);
|