leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: oxfw: cease from delayed card registration

Browse Source 
The delayed registration of sound card instance brings less benefit than
complication of kobject management. This commit ceases from it.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210607081250.13397-4-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2021-06-07 17:12:44 +09:00 committed by Takashi Iwai
parent d42dca6b46
commit b566e972f5
2 changed files with 48 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
sound/firewire/oxfw/oxfw.c
View File

@ -60,7 +60,7 @@ static bool detect_loud_models(struct fw_unit *unit)
return match_string(models, ARRAY_SIZE(models), model) >= 0; return match_string(models, ARRAY_SIZE(models), model) >= 0;
} }
static int name_card(struct snd_oxfw *oxfw) static int name_card(struct snd_oxfw *oxfw, const struct ieee1394_device_id *entry)
{ {
struct fw_device *fw_dev = fw_parent_device(oxfw->unit); struct fw_device *fw_dev = fw_parent_device(oxfw->unit);
const struct compat_info *info; const struct compat_info *info;
@ -92,9 +92,8 @@ static int name_card(struct snd_oxfw *oxfw)
oxfw->quirks |= SND_OXFW_QUIRK_JUMBO_PAYLOAD; oxfw->quirks |= SND_OXFW_QUIRK_JUMBO_PAYLOAD;
/* to apply card definitions */ /* to apply card definitions */
if (oxfw->entry->vendor_id == VENDOR_GRIFFIN || if (entry->vendor_id == VENDOR_GRIFFIN || entry->vendor_id == VENDOR_LACIE) {
oxfw->entry->vendor_id == VENDOR_LACIE) { info = (const struct compat_info *)entry->driver_data;
info = (const struct compat_info *)oxfw->entry->driver_data;
d = info->driver_name; d = info->driver_name;
v = info->vendor_name; v = info->vendor_name;
m = info->model_name; m = info->model_name;
@ -123,9 +122,12 @@ static void oxfw_card_free(struct snd_card *card)
if (oxfw->has_output || oxfw->has_input) if (oxfw->has_output || oxfw->has_input)
snd_oxfw_stream_destroy_duplex(oxfw); snd_oxfw_stream_destroy_duplex(oxfw);
mutex_destroy(&oxfw->mutex);
fw_unit_put(oxfw->unit);
} }
static int detect_quirks(struct snd_oxfw *oxfw) static int detect_quirks(struct snd_oxfw *oxfw, const struct ieee1394_device_id *entry)
{ {
struct fw_device *fw_dev = fw_parent_device(oxfw->unit); struct fw_device *fw_dev = fw_parent_device(oxfw->unit);
struct fw_csr_iterator it; struct fw_csr_iterator it;
@ -136,17 +138,18 @@ static int detect_quirks(struct snd_oxfw *oxfw)
* Add ALSA control elements for two models to keep compatibility to * Add ALSA control elements for two models to keep compatibility to
* old firewire-speaker module. * old firewire-speaker module.
*/ */
if (oxfw->entry->vendor_id == VENDOR_GRIFFIN) if (entry->vendor_id == VENDOR_GRIFFIN)
return snd_oxfw_add_spkr(oxfw, false); return snd_oxfw_add_spkr(oxfw, false);
if (oxfw->entry->vendor_id == VENDOR_LACIE) if (entry->vendor_id == VENDOR_LACIE)
return snd_oxfw_add_spkr(oxfw, true); return snd_oxfw_add_spkr(oxfw, true);
/* /*
* Stanton models supports asynchronous transactions for unique MIDI * Stanton models supports asynchronous transactions for unique MIDI
* messages. * messages.
*/ */
if (oxfw->entry->vendor_id == OUI_STANTON) { if (entry->vendor_id == OUI_STANTON) {
if (oxfw->entry->model_id == MODEL_SCS1M) oxfw->quirks |= SND_OXFW_QUIRK_SCS_TRANSACTION;
if (entry->model_id == MODEL_SCS1M)
oxfw->quirks |= SND_OXFW_QUIRK_BLOCKING_TRANSMISSION; oxfw->quirks |= SND_OXFW_QUIRK_BLOCKING_TRANSMISSION;
// No physical MIDI ports. // No physical MIDI ports.
@ -156,14 +159,14 @@ static int detect_quirks(struct snd_oxfw *oxfw)
return snd_oxfw_scs1x_add(oxfw); return snd_oxfw_scs1x_add(oxfw);
} }
if (oxfw->entry->vendor_id == OUI_APOGEE && oxfw->entry->model_id == MODEL_DUET_FW) if (entry->vendor_id == OUI_APOGEE && entry->model_id == MODEL_DUET_FW)
oxfw->quirks |= SND_OXFW_QUIRK_BLOCKING_TRANSMISSION; oxfw->quirks |= SND_OXFW_QUIRK_BLOCKING_TRANSMISSION;
/* /*
* TASCAM FireOne has physical control and requires a pair of additional * TASCAM FireOne has physical control and requires a pair of additional
* MIDI ports. * MIDI ports.
*/ */
if (oxfw->entry->vendor_id == VENDOR_TASCAM) { if (entry->vendor_id == VENDOR_TASCAM) {
oxfw->midi_input_ports++; oxfw->midi_input_ports++;
oxfw->midi_output_ports++; oxfw->midi_output_ports++;
return 0; return 0;
@ -189,22 +192,30 @@ static int detect_quirks(struct snd_oxfw *oxfw)
return 0; return 0;
} }
static void do_registration(struct work_struct *work) static int oxfw_probe(struct fw_unit *unit, const struct ieee1394_device_id *entry)
{ {
struct snd_oxfw *oxfw = container_of(work, struct snd_oxfw, dwork.work); struct snd_card *card;
struct snd_oxfw *oxfw;
int err; int err;
if (oxfw->registered) if (entry->vendor_id == VENDOR_LOUD && entry->model_id == 0 && !detect_loud_models(unit))
return; return -ENODEV;
err = snd_card_new(&oxfw->unit->device, -1, NULL, THIS_MODULE, 0, err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE, sizeof(*oxfw), &card);
&oxfw->card);
if (err < 0) if (err < 0)
return; return err;
oxfw->card->private_free = oxfw_card_free; card->private_free = oxfw_card_free;
oxfw->card->private_data = oxfw;
err = name_card(oxfw); oxfw = card->private_data;
oxfw->unit = fw_unit_get(unit);
dev_set_drvdata(&unit->device, oxfw);
oxfw->card = card;
mutex_init(&oxfw->mutex);
spin_lock_init(&oxfw->lock);
init_waitqueue_head(&oxfw->hwdep_wait);
err = name_card(oxfw, entry);
if (err < 0) if (err < 0)
goto error; goto error;
@ -212,7 +223,7 @@ static void do_registration(struct work_struct *work)
if (err < 0) if (err < 0)
goto error; goto error;
err = detect_quirks(oxfw); err = detect_quirks(oxfw, entry);
if (err < 0) if (err < 0)
goto error; goto error;
@ -236,85 +247,38 @@ static void do_registration(struct work_struct *work)
goto error; goto error;
} }
err = snd_card_register(oxfw->card); err = snd_card_register(card);
if (err < 0) if (err < 0)
goto error; goto error;
oxfw->registered = true;
return;
error:
snd_card_free(oxfw->card);
dev_info(&oxfw->unit->device,
"Sound card registration failed: %d\n", err);
}
static int oxfw_probe(struct fw_unit *unit,
const struct ieee1394_device_id *entry)
{
struct snd_oxfw *oxfw;
if (entry->vendor_id == VENDOR_LOUD && entry->model_id == 0 && !detect_loud_models(unit))
return -ENODEV;
/* Allocate this independent of sound card instance. */
oxfw = devm_kzalloc(&unit->device, sizeof(struct snd_oxfw), GFP_KERNEL);
if (!oxfw)
return -ENOMEM;
oxfw->unit = fw_unit_get(unit);
dev_set_drvdata(&unit->device, oxfw);
oxfw->entry = entry;
mutex_init(&oxfw->mutex);
spin_lock_init(&oxfw->lock);
init_waitqueue_head(&oxfw->hwdep_wait);
/* Allocate and register this sound card later. */
INIT_DEFERRABLE_WORK(&oxfw->dwork, do_registration);
snd_fw_schedule_registration(unit, &oxfw->dwork);
return 0; return 0;
error:
snd_card_free(card);
return err;
} }
static void oxfw_bus_reset(struct fw_unit *unit) static void oxfw_bus_reset(struct fw_unit *unit)
{ {
struct snd_oxfw *oxfw = dev_get_drvdata(&unit->device); struct snd_oxfw *oxfw = dev_get_drvdata(&unit->device);
if (!oxfw->registered)
snd_fw_schedule_registration(unit, &oxfw->dwork);
fcp_bus_reset(oxfw->unit); fcp_bus_reset(oxfw->unit);
if (oxfw->registered) { if (oxfw->has_output || oxfw->has_input) {
if (oxfw->has_output || oxfw->has_input) { mutex_lock(&oxfw->mutex);
mutex_lock(&oxfw->mutex); snd_oxfw_stream_update_duplex(oxfw);
snd_oxfw_stream_update_duplex(oxfw); mutex_unlock(&oxfw->mutex);
mutex_unlock(&oxfw->mutex);
}
if (oxfw->entry->vendor_id == OUI_STANTON)
snd_oxfw_scs1x_update(oxfw);
} }
if (oxfw->quirks & SND_OXFW_QUIRK_SCS_TRANSACTION)
snd_oxfw_scs1x_update(oxfw);
} }
static void oxfw_remove(struct fw_unit *unit) static void oxfw_remove(struct fw_unit *unit)
{ {
struct snd_oxfw *oxfw = dev_get_drvdata(&unit->device); struct snd_oxfw *oxfw = dev_get_drvdata(&unit->device);
/* // Block till all of ALSA character devices are released.
* Confirm to stop the work for registration before the sound card is snd_card_free(oxfw->card);
* going to be released. The work is not scheduled again because bus
* reset handler is not called anymore.
*/
cancel_delayed_work_sync(&oxfw->dwork);
if (oxfw->registered) {
// Block till all of ALSA character devices are released.
snd_card_free(oxfw->card);
}
mutex_destroy(&oxfw->mutex);
fw_unit_put(oxfw->unit);
} }
static const struct compat_info griffin_firewave = { static const struct compat_info griffin_firewave = {

6
sound/firewire/oxfw/oxfw.h
View File

@ -40,6 +40,8 @@ enum snd_oxfw_quirk {
SND_OXFW_QUIRK_WRONG_DBS = 0x02, SND_OXFW_QUIRK_WRONG_DBS = 0x02,
// Blocking transmission mode is used. // Blocking transmission mode is used.
SND_OXFW_QUIRK_BLOCKING_TRANSMISSION = 0x04, SND_OXFW_QUIRK_BLOCKING_TRANSMISSION = 0x04,
// Stanton SCS1.d and SCS1.m support unique transaction.
SND_OXFW_QUIRK_SCS_TRANSACTION = 0x08,
}; };
/* This is an arbitrary number for convinience. */ /* This is an arbitrary number for convinience. */
@ -50,9 +52,6 @@ struct snd_oxfw {
struct mutex mutex; struct mutex mutex;
spinlock_t lock; spinlock_t lock;
bool registered;
struct delayed_work dwork;
// The combination of snd_oxfw_quirk enumeration-constants. // The combination of snd_oxfw_quirk enumeration-constants.
unsigned int quirks; unsigned int quirks;
bool has_output; bool has_output;
@ -73,7 +72,6 @@ struct snd_oxfw {
bool dev_lock_changed; bool dev_lock_changed;
wait_queue_head_t hwdep_wait; wait_queue_head_t hwdep_wait;
const struct ieee1394_device_id *entry;
void *spec; void *spec;
struct amdtp_domain domain; struct amdtp_domain domain;