- 28 Jan, 2015 29 commits
-
-
Takashi Iwai authored
The current code deals with the stream start / stop solely via line6_pcm_acquire() and line6_pcm_release(). This was (supposedly) intended to avoid the races, but it doesn't work as expected. The concurrent acquire and release calls can be performed without proper protections, thus this might result in memory corruption. Furthermore, we can't take a mutex to protect the whole function because it can be called from the PCM trigger callback that is an atomic context. Also spinlock isn't appropriate because the function allocates with kmalloc with GFP_KERNEL. That is, these function just lead to singular problems. This is an attempt to reduce the existing races. First off, separate both the stream buffer management and the stream URB management. The former is protected via a newly introduced state_mutex while the latter is protected via each line6_pcm_stream lock. Secondly, the stream state are now managed in opened and running bit flags of each line6_pcm_stream. Not only this a bit clearer than previous combined bit flags, this also gives a better abstraction. These rewrites allows us to make common hw_params and hw_free callbacks for both playback and capture directions. For the monitor and impulse operations, still line6_pcm_acquire() and line6_pcm_release() are used. They call internally the corresponding functions for both playback and capture streams with proper lock or mutex. Unlike the previous versions, these function don't take the bit masks but the only single type value. Also they are supposed to be applied only as duplex operations. Tested-by:
Chris Rorvick <chris@rorvick.com> Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
Takashi Iwai authored
Clearing prev_fsize in line6_pcm_acquire() is pretty racy. This can be called at any time while the stream is being played. Rather better to clear prev_fbuf and prev_fsize at the proper place like the stream stop for capture, and just after copying the monitor / impulse data inside the spinlock. Tested-by:
-
Takashi Iwai authored
The impulse and monitor handling in submit_audio_out_urb() isn't protected thus this can be racy with the capture stream handling. This patch extends the range to protect via each stream's spinlock (now the whole submit_audio_*_urb() are covered), and take the capture stream lock additionally for the impulse and monitor handling part. Tested-by:
-
Takashi Iwai authored
Move the check of multi configurations before snd_card_new() as a short path, and reduce superfluous pointer references. Tested-by:
-
Takashi Iwai authored
Instead of allocating the private data individually in each driver's probe at first, let snd_card_new() allocate the data that is called in line6_probe(). This simplifies the primary probe functions. Tested-by:
-
Takashi Iwai authored
The interface argument is used just for retrieving the assigned device, which can be already found in line6->ifcdev. Drop them from the callbacks. Also, pass the usb id to private_init so that the driver can deal with it there. This is a preliminary work for the further cleanup to move the whole allocation into driver.c. Tested-by:
-
Takashi Iwai authored
A minor optimization; while pausing, the driver just copies the zero that doesn't need any volume changes. Tested-by:
-
Takashi Iwai authored
Tested-by:
-
Takashi Iwai authored
The PCM stream buffer allocation and free are identical for both playback and capture streams. Provide single helper functions. These are used only in pcm.c, thus they can be even static. Tested-by:
-
Takashi Iwai authored
This is the last remaining snd_printk() usage in this driver. Tested-by:
-
Takashi Iwai authored
The codes to unlink and sync URBs are identical for both playback and capture streams. Consolidate to single helper functions. Tested-by:
-
Takashi Iwai authored
Introduce a new line6_pcm_stream structure and group individual fields of snd_line6_pcm struct to playback and capture groups. This patch itself just does rename and nothing else. More meaningful cleanups based on these fields shuffling will follow. Tested-by:
-
Takashi Iwai authored
If the problem still really remains, we should fix it instead of papering over it like this... Tested-by:
-
Takashi Iwai authored
Using a decremental loop without particular reasons worsens the readability a lot. Use incremental loops instead. Tested-by:
-
Takashi Iwai authored
The trigger callback is already spinlocked, so we need no more lock here (even for the linked substreams). Let's drop it. Tested-by:
-
Takashi Iwai authored
line6_pcm_acquire() tries to restore the newly obtained resources at the error path. But some flags aren't recorded and released properly when the corresponding buffer is already present. These bits have to be cleared in the error recovery, too. Also, "flags_final" can be initialized to zero since we pass only the subset of "channels" bits. Tested-by:
-
Takashi Iwai authored
Fixed a few places using bits OR wrongly for condition checks. Tested-by:
-
Takashi Iwai authored
Tested-by:
-
Takashi Iwai authored
The midi_transmit_lock is used always inside the send_urb_lock, thus it doesn't play any role. Let's kill it. Also, rename "send_urb_lock" as a more simple name "lock" since this is the only lock for midi. Tested-by:
-
Takashi Iwai authored
The function isn't used any longer after rewriting from sysfs to leds class in toneport.c. Tested-by:
-
Takashi Iwai authored
Fix memory leak at probe error path by rearranging the call order in line6_destruct() so that the common destructor is always called. Also this simplifies the error path to a single goto label. Tested-by:
-
Takashi Iwai authored
Split some codes in the lengthy line6_probe(). Tested-by:
-
Takashi Iwai authored
Instead of non-standard sysfs, reimplement the LED controls on TonePort as LED class devices. Tested-by:
-
Takashi Iwai authored
Tested-by:
-
Takashi Iwai authored
Currently disconnect callback is used as a driver's destructor, and this has to be called not only at the disconnection time but also at the error paths during probe. Tested-by:
-
Takashi Iwai authored
... so that timer_del_sync() in the destructor can be called safely at any time. Also move the mod_timer() call in toneport_setup(), which is a bit clearer place. Tested-by:
-
Takashi Iwai authored
The interface and driver objects are always set when callbacks are called. Drop such superfluous NULL checks in init and disconnect calls of each driver. Tested-by:
-
Takashi Iwai authored
It's utterly unsafe to proceed further the disconnect procedure if the assigned usbdev is inconsistent with the expected object. Better to put a WARN_ON() for more cautions and abort immediately. Tested-by:
-
Takashi Iwai authored
... in line6_disconnect() as well. Tested-by:
-
- 20 Jan, 2015 11 commits
-
-
Chris Rorvick authored
The driver version string was removed in an ealier commit for being useless. These are equally useless. Signed-off-by:
-
Chris Rorvick authored
The correct spelling includes the space. Fix this in strings and comments that refer to the manufacturer. Signed-off-by:
-
Chris Rorvick authored
Signed-off-by:
-
Takashi Iwai authored
Both functions are used nowhere. Tested-by:
-
Takashi Iwai authored
It's used only locally. Tested-by:
-
Takashi Iwai authored
Call line6_pcm_disconnect() at disconnect to make sure that all URBs are cleared. Also reduce the superfluous snd_pcm_stop() calls from the function (and remove the unused function) since the streams are guaranteed to be stopped at this point via snd_card_disconnect(). Tested-by:
-
Takashi Iwai authored
Calling line6_pcm_disconnect() at suspend callback is superfluous and rather confusing. Let's get rid of it. Tested-by:
-
Takashi Iwai authored
Such a macro doesn't improve readability. Tested-by:
-
Takashi Iwai authored
Such a debug is needed in the core code, not in each lowlevel driver. Tested-by:
-
Takashi Iwai authored
This is rather useless for a driver that has been already merged into the official tree. Tested-by:
-
Takashi Iwai authored
This is a fairly big rewrite regarding the card resource management in line6 drivers: - The card creation is moved into line6_probe(). This adds the global destructor to private_free, so that each driver doesn't have to call it any longer. - The USB disconnect callback handles the card release, thus each driver needs to concentrate on only its own resources. No need to snd_card_*() call in the destructor. - Fix the potential stall in disconnection by removing snd_card_free(). It's replaced with snd_card_free_when_closed() for asynchronous release. - The only remaining operation for the card in each driver is the call of snd_card_register(). All the rest are dealt in the common module by itself. - These ended up with removal of audio.[ch] as a result of a reduction of one layer. Each driver just needs to call line6_probe(). Tested-by:
-
