From: Thierry Reding <thierry.reding@avionic-design.de> To: Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz> Cc: David Henningsson <david.henningsson@canonical.com>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ALSA: hda - Defer probe when loading patch firmware Date: Thu, 9 Aug 2012 08:45:23 +0200 [thread overview] Message-ID: <1344494723-6827-1-git-send-email-thierry.reding@avionic-design.de> (raw) Recent changes to the firmware loading helpers cause drivers to stall when firmware is loaded during the module_init() call. The snd-hda-intel module requests firmware if the patch= parameter is used to load a patch file. This patch works around the problem by deferring the probe in such cases, which will cause the module to load successfully and the driver binding to the device outside the module_init() call. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> --- sound/pci/hda/hda_intel.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c8aced1..296616e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -69,6 +69,7 @@ static int probe_only[SNDRV_CARDS]; static bool single_cmd; static int enable_msi = -1; #ifdef CONFIG_SND_HDA_PATCH_LOADER +static bool deferred[SNDRV_CARDS]; static char *patch[SNDRV_CARDS]; #endif #ifdef CONFIG_SND_HDA_INPUT_BEEP @@ -3156,6 +3157,16 @@ static int __devinit azx_probe(struct pci_dev *pci, if (dev >= SNDRV_CARDS) return -ENODEV; + +#ifdef CONFIG_SND_HDA_PATCH_LOADER + if (patch[dev] && *patch[dev] && !deferred[dev]) { + snd_printk(KERN_ERR SFX "deferring probe for patch %s\n", + patch[dev]); + deferred[dev] = true; + return -EPROBE_DEFER; + } +#endif + if (!enable[dev]) { dev++; return -ENOENT; -- 1.7.11.4
WARNING: multiple messages have this Message-ID (diff)
From: Thierry Reding <thierry.reding@avionic-design.de> To: Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz> Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, David Henningsson <david.henningsson@canonical.com> Subject: [PATCH] ALSA: hda - Defer probe when loading patch firmware Date: Thu, 9 Aug 2012 08:45:23 +0200 [thread overview] Message-ID: <1344494723-6827-1-git-send-email-thierry.reding@avionic-design.de> (raw) Recent changes to the firmware loading helpers cause drivers to stall when firmware is loaded during the module_init() call. The snd-hda-intel module requests firmware if the patch= parameter is used to load a patch file. This patch works around the problem by deferring the probe in such cases, which will cause the module to load successfully and the driver binding to the device outside the module_init() call. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> --- sound/pci/hda/hda_intel.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c8aced1..296616e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -69,6 +69,7 @@ static int probe_only[SNDRV_CARDS]; static bool single_cmd; static int enable_msi = -1; #ifdef CONFIG_SND_HDA_PATCH_LOADER +static bool deferred[SNDRV_CARDS]; static char *patch[SNDRV_CARDS]; #endif #ifdef CONFIG_SND_HDA_INPUT_BEEP @@ -3156,6 +3157,16 @@ static int __devinit azx_probe(struct pci_dev *pci, if (dev >= SNDRV_CARDS) return -ENODEV; + +#ifdef CONFIG_SND_HDA_PATCH_LOADER + if (patch[dev] && *patch[dev] && !deferred[dev]) { + snd_printk(KERN_ERR SFX "deferring probe for patch %s\n", + patch[dev]); + deferred[dev] = true; + return -EPROBE_DEFER; + } +#endif + if (!enable[dev]) { dev++; return -ENOENT; -- 1.7.11.4
next reply other threads:[~2012-08-09 6:45 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-09 6:45 Thierry Reding [this message] 2012-08-09 6:45 ` [PATCH] ALSA: hda - Defer probe when loading patch firmware Thierry Reding 2012-08-09 6:57 ` Takashi Iwai 2012-08-09 6:57 ` Takashi Iwai 2012-08-09 7:08 ` Thierry Reding 2012-08-09 7:08 ` Thierry Reding 2012-08-09 7:31 ` Takashi Iwai 2012-08-09 7:31 ` Takashi Iwai 2012-08-09 7:36 ` Thierry Reding 2012-08-09 7:36 ` Thierry Reding 2012-08-09 7:42 ` Takashi Iwai 2012-08-09 7:42 ` Takashi Iwai 2012-08-09 7:50 ` Takashi Iwai 2012-08-09 7:50 ` Takashi Iwai 2012-08-09 7:57 ` Thierry Reding 2012-08-09 7:57 ` Thierry Reding 2012-08-09 8:07 ` Thierry Reding 2012-08-09 8:07 ` Thierry Reding 2012-08-09 8:21 ` Takashi Iwai 2012-08-09 8:21 ` Takashi Iwai 2012-08-09 9:19 ` Takashi Iwai 2012-08-09 9:19 ` Takashi Iwai 2012-08-09 10:34 ` Thierry Reding 2012-08-09 10:34 ` Thierry Reding 2012-08-09 12:32 ` Takashi Iwai 2012-08-09 12:32 ` Takashi Iwai 2012-08-09 12:49 ` Thierry Reding 2012-08-09 12:49 ` Thierry Reding 2012-08-09 13:06 ` Takashi Iwai 2012-08-09 13:06 ` Takashi Iwai 2012-08-09 13:09 ` [PATCH 0/2] HD-audio firmware loading fixes Takashi Iwai 2012-08-09 13:10 ` [PATCH 1/2] ALSA: hda - Load firmware in hda_intel.c Takashi Iwai 2012-08-09 14:26 ` Thierry Reding 2012-08-09 14:26 ` Thierry Reding 2012-08-09 13:11 ` [PATCH 2/2] ALSA: hda - Deferred probing with request_firmware_nowait() Takashi Iwai 2012-08-09 13:26 ` David Henningsson 2012-08-09 13:32 ` Takashi Iwai 2012-08-09 13:32 ` Takashi Iwai 2012-08-09 13:36 ` [PATCH 2/2 v2] " Takashi Iwai 2012-08-09 13:36 ` Takashi Iwai 2012-08-09 13:54 ` David Henningsson 2012-08-09 13:54 ` David Henningsson 2012-08-09 14:04 ` Thierry Reding 2012-08-09 14:04 ` Thierry Reding 2012-08-09 14:04 ` Takashi Iwai 2012-08-09 14:04 ` Takashi Iwai 2012-08-09 14:10 ` [PATCH 2/2 v3] " Takashi Iwai 2012-08-09 14:10 ` Takashi Iwai 2012-08-09 14:19 ` David Henningsson 2012-08-09 14:19 ` David Henningsson 2012-08-09 14:25 ` Thierry Reding 2012-08-09 14:25 ` Thierry Reding 2012-08-09 14:34 ` Takashi Iwai 2012-08-09 14:34 ` Takashi Iwai 2012-08-09 14:38 ` Thierry Reding 2012-08-09 14:38 ` Thierry Reding
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1344494723-6827-1-git-send-email-thierry.reding@avionic-design.de \ --to=thierry.reding@avionic-design.de \ --cc=alsa-devel@alsa-project.org \ --cc=david.henningsson@canonical.com \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.