forked from Minki/linux
df4fedeaa6
If g_audio fails to open the sound control device, it crashes at removal: Insertion: [ 4143.836536] g_audio gadget: unable to open sound control device file: /dev/snd/controlC0 [ 4143.836543] g_audio gadget: we need at least one control device [ 4143.836551] g_audio gadget: Linux USB Audio Gadget, version: Dec 18, 2008 [ 4143.836558] g_audio gadget: g_audio ready Removal: [ 4146.802643] BUG: unable to handle kernel paging request at 00023018 [ 4146.802655] IP: [<c10af9f5>] filp_close+0xa/0x5b [ 4146.802674] *pdpt = 0000000015426001 *pde = 0000000000000000 [ 4146.802684] Oops: 0000 [#1] PREEMPT SMP [ 4146.802692] last sysfs file: /sys/power/state [ 4146.802701] Modules linked in: g_audio(-) ioh_udc fuse asix usbnet [last unloaded: g_audio] [ 4146.802719] [ 4146.802728] Pid: 1394, comm: rmmod Not tainted 2.6.33.5-26.1-ivi #1 To be filled by O.E.M./To be filled by O.E.M. [ 4146.802738] EIP: 0060:[<c10af9f5>] EFLAGS: 00010206 CPU: 0 [ 4146.802746] EIP is at filp_close+0xa/0x5b [ 4146.802753] EAX: 00023000 EBX: 00023000 ECX: 00000046 EDX: df842680 [ 4146.802760] ESI: e071cd4c EDI: df842680 EBP: ddbbbef0 ESP: ddbbbee4 [ 4146.802768] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 4146.802776] Process rmmod (pid: 1394, ti=ddbba000 task=dd95a4f0 task.ti=ddbba000) [ 4146.802782] Stack: [ 4146.802787] d540c280 e071cd4c df2bc000 ddbbbefc e071b82c df11e440 ddbbbf04 e071c622 [ 4146.802804] <0> ddbbbf28 e071c47f 00000008 e071cd74 df11e464 df2bc01c df2bc000 e071ce68 [ 4146.802822] <0> 00000880 ddbbbf38 e07fd1b8 e071cef0 00000000 ddbbbf40 e071b9f4 ddbbbf48 [ 4146.802842] Call Trace: [ 4146.802857] [<e071b82c>] ? gaudio_cleanup+0x87/0xe0 [g_audio] [ 4146.802869] [<e071c622>] ? audio_unbind+0x8/0xc [g_audio] [ 4146.802881] [<e071c47f>] ? composite_unbind+0x8d/0xcb [g_audio] [ 4146.802895] [<e07fd1b8>] ? usb_gadget_unregister_driver+0x7b/0xc0 [ioh_udc] [ 4146.802908] [<e071b9f4>] ? usb_composite_unregister+0x15/0x17 [g_audio] [ 4146.802920] [<e071c633>] ? cleanup+0xd/0xf [g_audio] [ 4146.802932] [<c105a938>] ? sys_delete_module+0x185/0x1dd [ 4146.802944] [<c101c3ea>] ? do_page_fault+0x248/0x276 [ 4146.802956] [<c10027d0>] ? sysenter_do_call+0x12/0x26 [ 4146.802962] Code: 12 5f 3a 00 8b 43 04 8b 40 0c 0f b3 30 3b 73 44 73 03 89 73 44 89 f8 e8 f1 61 3a 00 5b 5e 5f 5d c3 55 89 e5 57 89 d7 56 53 89 c3 <8b> 40 18 85 c0 75 0f 68 32 15 5e c1 31 f6 e8 52 39 3a 00 5a eb [ 4146.803058] EIP: [<c10af9f5>] filp_close+0xa/0x5b SS:ESP 0068:ddbbbee4 [ 4146.803071] CR2: 0000000000023018 [ 4146.803112] ---[ end trace 0989a7e023da0434 ]--- This patch makes sure not to assign the_card if gaudio_open_snd_dev fails, since the parent function will deallocate the card. Also make sure all filp's in gaudio_open_snd_dev is assigned NULL upon error and gaudio_close_snd_dev only cleanups when the filp's are non-NULL. Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com> Cc: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
328 lines
7.6 KiB
C
328 lines
7.6 KiB
C
/*
|
|
* u_audio.c -- ALSA audio utilities for Gadget stack
|
|
*
|
|
* Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
|
|
* Copyright (C) 2008 Analog Devices, Inc
|
|
*
|
|
* Enter bugs at http://blackfin.uclinux.org/
|
|
*
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/device.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/random.h>
|
|
#include <linux/syscalls.h>
|
|
|
|
#include "u_audio.h"
|
|
|
|
/*
|
|
* This component encapsulates the ALSA devices for USB audio gadget
|
|
*/
|
|
|
|
#define FILE_PCM_PLAYBACK "/dev/snd/pcmC0D0p"
|
|
#define FILE_PCM_CAPTURE "/dev/snd/pcmC0D0c"
|
|
#define FILE_CONTROL "/dev/snd/controlC0"
|
|
|
|
static char *fn_play = FILE_PCM_PLAYBACK;
|
|
module_param(fn_play, charp, S_IRUGO);
|
|
MODULE_PARM_DESC(fn_play, "Playback PCM device file name");
|
|
|
|
static char *fn_cap = FILE_PCM_CAPTURE;
|
|
module_param(fn_cap, charp, S_IRUGO);
|
|
MODULE_PARM_DESC(fn_cap, "Capture PCM device file name");
|
|
|
|
static char *fn_cntl = FILE_CONTROL;
|
|
module_param(fn_cntl, charp, S_IRUGO);
|
|
MODULE_PARM_DESC(fn_cntl, "Control device file name");
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/**
|
|
* Some ALSA internal helper functions
|
|
*/
|
|
static int snd_interval_refine_set(struct snd_interval *i, unsigned int val)
|
|
{
|
|
struct snd_interval t;
|
|
t.empty = 0;
|
|
t.min = t.max = val;
|
|
t.openmin = t.openmax = 0;
|
|
t.integer = 1;
|
|
return snd_interval_refine(i, &t);
|
|
}
|
|
|
|
static int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params,
|
|
snd_pcm_hw_param_t var, unsigned int val,
|
|
int dir)
|
|
{
|
|
int changed;
|
|
if (hw_is_mask(var)) {
|
|
struct snd_mask *m = hw_param_mask(params, var);
|
|
if (val == 0 && dir < 0) {
|
|
changed = -EINVAL;
|
|
snd_mask_none(m);
|
|
} else {
|
|
if (dir > 0)
|
|
val++;
|
|
else if (dir < 0)
|
|
val--;
|
|
changed = snd_mask_refine_set(
|
|
hw_param_mask(params, var), val);
|
|
}
|
|
} else if (hw_is_interval(var)) {
|
|
struct snd_interval *i = hw_param_interval(params, var);
|
|
if (val == 0 && dir < 0) {
|
|
changed = -EINVAL;
|
|
snd_interval_none(i);
|
|
} else if (dir == 0)
|
|
changed = snd_interval_refine_set(i, val);
|
|
else {
|
|
struct snd_interval t;
|
|
t.openmin = 1;
|
|
t.openmax = 1;
|
|
t.empty = 0;
|
|
t.integer = 0;
|
|
if (dir < 0) {
|
|
t.min = val - 1;
|
|
t.max = val;
|
|
} else {
|
|
t.min = val;
|
|
t.max = val+1;
|
|
}
|
|
changed = snd_interval_refine(i, &t);
|
|
}
|
|
} else
|
|
return -EINVAL;
|
|
if (changed) {
|
|
params->cmask |= 1 << var;
|
|
params->rmask |= 1 << var;
|
|
}
|
|
return changed;
|
|
}
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/**
|
|
* Set default hardware params
|
|
*/
|
|
static int playback_default_hw_params(struct gaudio_snd_dev *snd)
|
|
{
|
|
struct snd_pcm_substream *substream = snd->substream;
|
|
struct snd_pcm_hw_params *params;
|
|
snd_pcm_sframes_t result;
|
|
|
|
/*
|
|
* SNDRV_PCM_ACCESS_RW_INTERLEAVED,
|
|
* SNDRV_PCM_FORMAT_S16_LE
|
|
* CHANNELS: 2
|
|
* RATE: 48000
|
|
*/
|
|
snd->access = SNDRV_PCM_ACCESS_RW_INTERLEAVED;
|
|
snd->format = SNDRV_PCM_FORMAT_S16_LE;
|
|
snd->channels = 2;
|
|
snd->rate = 48000;
|
|
|
|
params = kzalloc(sizeof(*params), GFP_KERNEL);
|
|
if (!params)
|
|
return -ENOMEM;
|
|
|
|
_snd_pcm_hw_params_any(params);
|
|
_snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_ACCESS,
|
|
snd->access, 0);
|
|
_snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_FORMAT,
|
|
snd->format, 0);
|
|
_snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_CHANNELS,
|
|
snd->channels, 0);
|
|
_snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_RATE,
|
|
snd->rate, 0);
|
|
|
|
snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);
|
|
snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, params);
|
|
|
|
result = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_PREPARE, NULL);
|
|
if (result < 0) {
|
|
ERROR(snd->card,
|
|
"Preparing sound card failed: %d\n", (int)result);
|
|
kfree(params);
|
|
return result;
|
|
}
|
|
|
|
/* Store the hardware parameters */
|
|
snd->access = params_access(params);
|
|
snd->format = params_format(params);
|
|
snd->channels = params_channels(params);
|
|
snd->rate = params_rate(params);
|
|
|
|
kfree(params);
|
|
|
|
INFO(snd->card,
|
|
"Hardware params: access %x, format %x, channels %d, rate %d\n",
|
|
snd->access, snd->format, snd->channels, snd->rate);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Playback audio buffer data by ALSA PCM device
|
|
*/
|
|
static size_t u_audio_playback(struct gaudio *card, void *buf, size_t count)
|
|
{
|
|
struct gaudio_snd_dev *snd = &card->playback;
|
|
struct snd_pcm_substream *substream = snd->substream;
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
mm_segment_t old_fs;
|
|
ssize_t result;
|
|
snd_pcm_sframes_t frames;
|
|
|
|
try_again:
|
|
if (runtime->status->state == SNDRV_PCM_STATE_XRUN ||
|
|
runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
|
|
result = snd_pcm_kernel_ioctl(substream,
|
|
SNDRV_PCM_IOCTL_PREPARE, NULL);
|
|
if (result < 0) {
|
|
ERROR(card, "Preparing sound card failed: %d\n",
|
|
(int)result);
|
|
return result;
|
|
}
|
|
}
|
|
|
|
frames = bytes_to_frames(runtime, count);
|
|
old_fs = get_fs();
|
|
set_fs(KERNEL_DS);
|
|
result = snd_pcm_lib_write(snd->substream, buf, frames);
|
|
if (result != frames) {
|
|
ERROR(card, "Playback error: %d\n", (int)result);
|
|
set_fs(old_fs);
|
|
goto try_again;
|
|
}
|
|
set_fs(old_fs);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int u_audio_get_playback_channels(struct gaudio *card)
|
|
{
|
|
return card->playback.channels;
|
|
}
|
|
|
|
static int u_audio_get_playback_rate(struct gaudio *card)
|
|
{
|
|
return card->playback.rate;
|
|
}
|
|
|
|
/**
|
|
* Open ALSA PCM and control device files
|
|
* Initial the PCM or control device
|
|
*/
|
|
static int gaudio_open_snd_dev(struct gaudio *card)
|
|
{
|
|
struct snd_pcm_file *pcm_file;
|
|
struct gaudio_snd_dev *snd;
|
|
|
|
if (!card)
|
|
return -ENODEV;
|
|
|
|
/* Open control device */
|
|
snd = &card->control;
|
|
snd->filp = filp_open(fn_cntl, O_RDWR, 0);
|
|
if (IS_ERR(snd->filp)) {
|
|
int ret = PTR_ERR(snd->filp);
|
|
ERROR(card, "unable to open sound control device file: %s\n",
|
|
fn_cntl);
|
|
snd->filp = NULL;
|
|
return ret;
|
|
}
|
|
snd->card = card;
|
|
|
|
/* Open PCM playback device and setup substream */
|
|
snd = &card->playback;
|
|
snd->filp = filp_open(fn_play, O_WRONLY, 0);
|
|
if (IS_ERR(snd->filp)) {
|
|
ERROR(card, "No such PCM playback device: %s\n", fn_play);
|
|
snd->filp = NULL;
|
|
}
|
|
pcm_file = snd->filp->private_data;
|
|
snd->substream = pcm_file->substream;
|
|
snd->card = card;
|
|
playback_default_hw_params(snd);
|
|
|
|
/* Open PCM capture device and setup substream */
|
|
snd = &card->capture;
|
|
snd->filp = filp_open(fn_cap, O_RDONLY, 0);
|
|
if (IS_ERR(snd->filp)) {
|
|
ERROR(card, "No such PCM capture device: %s\n", fn_cap);
|
|
snd->substream = NULL;
|
|
snd->card = NULL;
|
|
snd->filp = NULL;
|
|
} else {
|
|
pcm_file = snd->filp->private_data;
|
|
snd->substream = pcm_file->substream;
|
|
snd->card = card;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Close ALSA PCM and control device files
|
|
*/
|
|
static int gaudio_close_snd_dev(struct gaudio *gau)
|
|
{
|
|
struct gaudio_snd_dev *snd;
|
|
|
|
/* Close control device */
|
|
snd = &gau->control;
|
|
if (snd->filp)
|
|
filp_close(snd->filp, current->files);
|
|
|
|
/* Close PCM playback device and setup substream */
|
|
snd = &gau->playback;
|
|
if (snd->filp)
|
|
filp_close(snd->filp, current->files);
|
|
|
|
/* Close PCM capture device and setup substream */
|
|
snd = &gau->capture;
|
|
if (snd->filp)
|
|
filp_close(snd->filp, current->files);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct gaudio *the_card;
|
|
/**
|
|
* gaudio_setup - setup ALSA interface and preparing for USB transfer
|
|
*
|
|
* This sets up PCM, mixer or MIDI ALSA devices fore USB gadget using.
|
|
*
|
|
* Returns negative errno, or zero on success
|
|
*/
|
|
int __init gaudio_setup(struct gaudio *card)
|
|
{
|
|
int ret;
|
|
|
|
ret = gaudio_open_snd_dev(card);
|
|
if (ret)
|
|
ERROR(card, "we need at least one control device\n");
|
|
else if (!the_card)
|
|
the_card = card;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
/**
|
|
* gaudio_cleanup - remove ALSA device interface
|
|
*
|
|
* This is called to free all resources allocated by @gaudio_setup().
|
|
*/
|
|
void gaudio_cleanup(void)
|
|
{
|
|
if (the_card) {
|
|
gaudio_close_snd_dev(the_card);
|
|
the_card = NULL;
|
|
}
|
|
}
|
|
|