Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 311e70a4 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hdsp - Fix auto-updating of firmware 



Fixed the auto-updating of firmware if the breakout box was switched
off/on.  The firmware binary itself was already cached but it wasn't
loaded properly.  Also, request_firmware() is issued if the box was
with firmware at module loading time but later it's erased.
The auto-update is triggered at each PCM action (open, prepare, etc)
and at opening proc files.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent ea543f1e

sound/pci/rme9652/hdsp.c

+35 −13
Original line number Diff line number Diff line
@@ -726,23 +726,37 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp) 
}





static int hdsp_check_for_firmware (struct hdsp *hdsp, int show_err)

#ifdef HDSP_FW_LOADER

static int __devinit hdsp_request_fw_loader(struct hdsp *hdsp);

#endif



static int hdsp_check_for_firmware (struct hdsp *hdsp, int load_on_demand)

{

	if (hdsp->io_type == H9652 || hdsp->io_type == H9632) return 0;

	if (hdsp->io_type == H9652 || hdsp->io_type == H9632)

		return 0;

	if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {

		snd_printk(KERN_ERR "Hammerfall-DSP: firmware not present.\n");

		hdsp->state &= ~HDSP_FirmwareLoaded;

		if (! show_err)

		if (! load_on_demand)

			return -EIO;

		snd_printk(KERN_ERR "Hammerfall-DSP: firmware not present.\n");

		/* try to load firmware */

		if (hdsp->state & HDSP_FirmwareCached) {

			if (snd_hdsp_load_firmware_from_cache(hdsp) != 0)

				snd_printk(KERN_ERR "Hammerfall-DSP: Firmware loading from cache failed, please upload manually.\n");

		} else {

			snd_printk(KERN_ERR "Hammerfall-DSP: No firmware loaded nor cached, please upload firmware.\n");

		if (! (hdsp->state & HDSP_FirmwareCached)) {

#ifdef HDSP_FW_LOADER

			if (! hdsp_request_fw_loader(hdsp))

				return 0;

#endif

			snd_printk(KERN_ERR

				   "Hammerfall-DSP: No firmware loaded nor "

				   "cached, please upload firmware.\n");

			return -EIO;

		}

		if (snd_hdsp_load_firmware_from_cache(hdsp) != 0) {

			snd_printk(KERN_ERR

				   "Hammerfall-DSP: Firmware loading from "

				   "cache failed, please upload manually.\n");

			return -EIO;

		}

	}

	return 0;

}
@@ -3181,10 +3195,18 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) 
				return;

			}

		} else {

			snd_iprintf(buffer, "No firmware loaded nor cached, please upload firmware.\n");

			int err = -EINVAL;

#ifdef HDSP_FW_LOADER

			err = hdsp_request_fw_loader(hdsp);

#endif

			if (err < 0) {

				snd_iprintf(buffer,

					    "No firmware loaded nor cached, "

					    "please upload firmware.\n");

				return;

			}

		}

	}

	

	status = hdsp_read(hdsp, HDSP_statusRegister);

	status2 = hdsp_read(hdsp, HDSP_status2Register);
@@ -3851,7 +3873,7 @@ static int snd_hdsp_trigger(struct snd_pcm_substream *substream, int cmd) 
	if (hdsp_check_for_iobox (hdsp))

		return -EIO;



	if (hdsp_check_for_firmware(hdsp, 1))

	if (hdsp_check_for_firmware(hdsp, 0)) /* no auto-loading in trigger */

		return -EIO;



	spin_lock(&hdsp->lock);