ALSA: emu10k1: EMU1010 dock code cleanup
cover ALSA: emu10k1: EMU1010 dock code cleanup
Hi,
this is a short series of patches to clean up the EMU1010 dock handling code. The primary goal is to replace kthread usage with work, but it resulted in a couple of more useful cleanups / fixes.
Takashi
===
Takashi Iwai (3):
ALSA: emu10k1: Fix emu1010 dock attach check
ALSA: emu10k1: Simplify firmware loader code
ALSA: emu10k1: Use workqueue instead of kthread for emu1010 fw polling
include/sound/emu10k1.h | 3 +- sound/pci/emu10k1/emu10k1.c | 9 ++ sound/pci/emu10k1/emu10k1_main.c | 228 ++++++++++++++++----------------------- 3 files changed, 104 insertions(+), 136 deletions(-)
Signature · 1 line
2.10.2
PATCH 1/3 ALSA: emu10k1: Fix emu1010 dock attach check
The emu1010_firmware_thread() checks the previous dock status, but a wrong register is recorded as the last status when the dock is plugged in. Usually this isn't a big issue since this value gets overwritten by the next loop after one second. But when a dock is unplugged immediately after plugging, it means essentially missing undock handling.
This patch addresses it by remembering the correct register value.
--- sound/pci/emu10k1/emu10k1_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/pci/emu10k1/emu10k1_main.c +6 -6
@@ -762,19 +762,19 @@ static int emu1010_firmware_thread(void *data) }snd_emu1010_fpga_write (emu,EMU_HANA_FPGA_CONFIG ,0 ); -snd_emu1010_fpga_read (emu,EMU_HANA_IRQ_STATUS , ®); +snd_emu1010_fpga_read (emu,EMU_HANA_IRQ_STATUS , &tmp);dev_info (emu->card->dev,"emu1010: EMU_HANA+DOCK_IRQ_STATUS = 0x%x\n" , - reg); + tmp);/* ID, should read & 0x7f = 0x55 when FPGA programmed. */ -snd_emu1010_fpga_read (emu,EMU_HANA_ID , ®); +snd_emu1010_fpga_read (emu,EMU_HANA_ID , &tmp);dev_info (emu->card->dev, -"emu1010: EMU_HANA+DOCK_ID = 0x%x\n" , reg); -if ((reg &0x1f ) !=0x15 ) { +"emu1010: EMU_HANA+DOCK_ID = 0x%x\n" , tmp); +if ((tmp &0x1f ) !=0x15 ) {/* FPGA failed to be programmed */ dev_info (emu->card->dev,"emu1010: Loading Audio Dock Firmware file failed, reg = 0x%x\n" , - reg); + tmp);continue ; } dev_info(emu->card->dev,
Signature · 1 line
2.10.2
PATCH 2/3 ALSA: emu10k1: Simplify firmware loader code
In reply to Takashi IwaiThe EMU1010 support in emu10k1 driver has two request_firmware() calls, one for the main board and one for the dock. Both call patterns are fairly similar, and we can simplify it by introducing a helper function and a table instead of the open switch/case.
--- sound/pci/emu10k1/emu10k1_main.c | 102 +++++++++++++++------------------------ 1 file changed, 40 insertions(+), 62 deletions(-)
sound/pci/emu10k1/emu10k1_main.c +40 -62
@@ -662,7 +662,7 @@ static int snd_emu10k1_cardbus_init(struct snd_emu10k1 *emu)return 0 ; } -static int snd_emu1010_load_firmware (struct snd_emu10k1 *emu, +static int snd_emu1010_load_firmware_entry (struct snd_emu10k1 *emu,const struct firmware *fw_entry) {int n, i;
@@ -708,6 +708,40 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu,return 0 ; } +/* firmware file names, per model, init-fw and dock-fw (optional) */ +static const char *const firmware_names[5 ][2 ] = { + [EMU_MODEL_EMU1010 ] = { +HANA_FILENAME ,DOCK_FILENAME + }, + [EMU_MODEL_EMU1010B ] = { +EMU1010B_FILENAME ,MICRO_DOCK_FILENAME + }, + [EMU_MODEL_EMU1616 ] = { +EMU1010_NOTEBOOK_FILENAME ,MICRO_DOCK_FILENAME + }, + [EMU_MODEL_EMU0404 ] = { +EMU0404_FILENAME ,NULL + }, +}; + +static int snd_emu1010_load_firmware (struct snd_emu10k1 *emu,int dock, +const struct firmware **fw) +{ +const char *filename; +int err; + +if (!*fw) { + filename = firmware_names[emu->card_capabilities->emu_model][dock]; +if (!filename) +return 0 ; + err =request_firmware (fw, filename, &emu->pci->dev); +if (err) +return err; + } + +return snd_emu1010_load_firmware_entry (emu, *fw); +} +static int emu1010_firmware_thread (void *data) {struct snd_emu10k1 *emu = data;
@@ -732,34 +766,9 @@ static int emu1010_firmware_thread(void *data)dev_info (emu->card->dev,"emu1010: Loading Audio Dock Firmware\n" );snd_emu1010_fpga_write (emu,EMU_HANA_FPGA_CONFIG ,EMU_HANA_FPGA_CONFIG_AUDIODOCK ); - -if (!emu->dock_fw) { -const char *filename =NULL ; -switch (emu->card_capabilities->emu_model) { -case EMU_MODEL_EMU1010 : - filename =DOCK_FILENAME ; -break ; -case EMU_MODEL_EMU1010B : - filename =MICRO_DOCK_FILENAME ; -break ; -case EMU_MODEL_EMU1616 : - filename =MICRO_DOCK_FILENAME ; -break ; - } -if (filename) { - err =request_firmware (&emu->dock_fw, - filename, - &emu->pci->dev); -if (err) -continue ; - } - } - -if (emu->dock_fw) { - err =snd_emu1010_load_firmware (emu, emu->dock_fw); -if (err) -continue ; - } + err =snd_emu1010_load_firmware (emu,1 , &emu->dock_fw); +if (err <0 ) +continue ;snd_emu1010_fpga_write (emu,EMU_HANA_FPGA_CONFIG ,0 );snd_emu1010_fpga_read (emu,EMU_HANA_IRQ_STATUS , &tmp);
@@ -881,39 +890,8 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) }dev_info (emu->card->dev,"emu1010: EMU_HANA_ID = 0x%x\n" , reg); -if (!emu->firmware) { -const char *filename; -switch (emu->card_capabilities->emu_model) { -case EMU_MODEL_EMU1010 : - filename =HANA_FILENAME ; -break ; -case EMU_MODEL_EMU1010B : - filename =EMU1010B_FILENAME ; -break ; -case EMU_MODEL_EMU1616 : - filename =EMU1010_NOTEBOOK_FILENAME ; -break ; -case EMU_MODEL_EMU0404 : - filename =EMU0404_FILENAME ; -break ; -default : -return -ENODEV ; - } - - err =request_firmware (&emu->firmware, filename, &emu->pci->dev); -if (err !=0 ) { -dev_info (emu->card->dev, -"emu1010: firmware: %s not found. Err = %d\n" , - filename, err); -return err; - } -dev_info (emu->card->dev, -"emu1010: firmware file = %s, size = 0x%zx\n" , - filename, emu->firmware->size); - } - - err =snd_emu1010_load_firmware (emu, emu->firmware); -if (err !=0 ) { + err =snd_emu1010_load_firmware (emu,0 , &emu->firmware); +if (err <0 ) {dev_info (emu->card->dev,"emu1010: Loading Firmware failed\n" );return err; }
Signature · 1 line
2.10.2
PATCH 3/3 ALSA: emu10k1: Use workqueue instead of kthread for emu1010 fw polling
In reply to Takashi IwaiThis patch is a cleanup of EMU1010 dock probing code in emu10k1 driver to use work instead of kthread in a loop. The work is lighter and easier to control than kthread, in general.
Instead of a loop with the explicit sleep, we do simply delayed-schedule the work. At suspend/resume callbacks, the work is canceled and restarted, respectively.
--- include/sound/emu10k1.h | 3 +- sound/pci/emu10k1/emu10k1.c | 9 +++ sound/pci/emu10k1/emu10k1_main.c | 132 +++++++++++++++++---------------------- 3 files changed, 67 insertions(+), 77 deletions(-)
include/sound/emu10k1.h +2 -1
@@ -1688,7 +1688,8 @@ struct snd_emu1010 {unsigned int internal_clock;/* 44100 or 48000 */ unsigned int optical_in;/* 0:SPDIF, 1:ADAT */ unsigned int optical_out;/* 0:SPDIF, 1:ADAT */ -struct task_struct *firmware_thread; +struct delayed_work firmware_work; +u32 last_reg; };struct snd_emu10k1 {
sound/pci/emu10k1/emu10k1.c +9 -0
@@ -194,6 +194,9 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci,if ((err =snd_card_register (card)) <0 ) goto error; +if (emu->card_capabilities->emu_model) +schedule_delayed_work (&emu->emu1010.firmware_work,0 ); +pci_set_drvdata (pci, card); dev++;return 0 ;
@@ -219,6 +222,8 @@ static int snd_emu10k1_suspend(struct device *dev) emu->suspend =1 ; +cancel_delayed_work_sync (&emu->emu1010.firmware_work); +snd_pcm_suspend_all (emu->pcm);snd_pcm_suspend_all (emu->pcm_mic);snd_pcm_suspend_all (emu->pcm_efx);
@@ -252,6 +257,10 @@ static int snd_emu10k1_resume(struct device *dev) emu->suspend =0 ;snd_power_change_state (card,SNDRV_CTL_POWER_D0 ); + +if (emu->card_capabilities->emu_model) +schedule_delayed_work (&emu->emu1010.firmware_work,0 ); +return 0 ; }
sound/pci/emu10k1/emu10k1_main.c +56 -76
172 lines not on this page · raw message
Signature · 1 line
2.10.2