From: David Henningsson <david.henningsson@canonical.com> To: Takashi Iwai <tiwai@suse.de> Cc: Thierry Reding <thierry.reding@avionic-design.de>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait() Date: Thu, 09 Aug 2012 15:54:04 +0200 [thread overview] Message-ID: <5023C0FC.2030207@canonical.com> (raw) In-Reply-To: <s5h1ujg2nm7.wl%tiwai@suse.de> On 08/09/2012 03:36 PM, Takashi Iwai wrote: > +/* callback from request_firmware_nowait() */ > +static void azx_firmware_cb(const struct firmware *fw, void *context) > +{ > + struct snd_card *card = context; > + struct azx *chip = card->private_data; > + struct pci_dev *pci = chip->pci; > + > + if (!fw) { > + snd_printk(KERN_ERR SFX "Cannot load firmware, aborting\n"); > + goto error; > + } Another thing, aren't you missing a chip->fw = fw; here? > + > + if (!chip->disabled) { > + /* continue probing */ > + if (azx_probe_continue(chip)) > + goto error; > + } > + return; /* OK */ > + > + error: > + snd_card_free(card); > + pci_set_drvdata(pci, NULL); > +} > + > static int __devinit azx_probe(struct pci_dev *pci, > const struct pci_device_id *pci_id) > { > static int dev; > struct snd_card *card; > struct azx *chip; > + bool probe_deferred; > int err; > > if (dev >= SNDRV_CARDS) > @@ -3182,18 +3211,22 @@ static int __devinit azx_probe(struct pci_dev *pci, > if (err < 0) > goto out_free; > card->private_data = chip; Right, this patch has the race removed, as the variable is no longer set in azx_firmware_cb. To be picky, it's slightly confusing that probe_deferred is also used for signalling a disabled chip. Maybe "probe_now" (inverted) would have been even better, like this: > + probe_deferred = chip->disabled; probe_now = !chip->disabled; > > #ifdef CONFIG_SND_HDA_PATCH_LOADER > if (patch[dev] && *patch[dev]) { (maybe we should not ask for firmware for a disabled chip either) > snd_printk(KERN_ERR SFX "Applying patch firmware '%s'\n", > patch[dev]); > - err = request_firmware(&chip->fw, patch[dev], &pci->dev); > + err = request_firmware_nowait(THIS_MODULE, true, patch[dev], > + &pci->dev, GFP_KERNEL, card, > + azx_firmware_cb); > if (err < 0) > goto out_free; > + probe_deferred = true; probe_now = false; > } > #endif /* CONFIG_SND_HDA_PATCH_LOADER */ > > - if (!chip->disabled) { > + if (!probe_deferred) { if (probe_now) { > err = azx_probe_continue(chip); > if (err < 0) > goto out_free; > -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic
WARNING: multiple messages have this Message-ID (diff)
From: David Henningsson <david.henningsson@canonical.com> To: Takashi Iwai <tiwai@suse.de> Cc: alsa-devel@alsa-project.org, Thierry Reding <thierry.reding@avionic-design.de>, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait() Date: Thu, 09 Aug 2012 15:54:04 +0200 [thread overview] Message-ID: <5023C0FC.2030207@canonical.com> (raw) In-Reply-To: <s5h1ujg2nm7.wl%tiwai@suse.de> On 08/09/2012 03:36 PM, Takashi Iwai wrote: > +/* callback from request_firmware_nowait() */ > +static void azx_firmware_cb(const struct firmware *fw, void *context) > +{ > + struct snd_card *card = context; > + struct azx *chip = card->private_data; > + struct pci_dev *pci = chip->pci; > + > + if (!fw) { > + snd_printk(KERN_ERR SFX "Cannot load firmware, aborting\n"); > + goto error; > + } Another thing, aren't you missing a chip->fw = fw; here? > + > + if (!chip->disabled) { > + /* continue probing */ > + if (azx_probe_continue(chip)) > + goto error; > + } > + return; /* OK */ > + > + error: > + snd_card_free(card); > + pci_set_drvdata(pci, NULL); > +} > + > static int __devinit azx_probe(struct pci_dev *pci, > const struct pci_device_id *pci_id) > { > static int dev; > struct snd_card *card; > struct azx *chip; > + bool probe_deferred; > int err; > > if (dev >= SNDRV_CARDS) > @@ -3182,18 +3211,22 @@ static int __devinit azx_probe(struct pci_dev *pci, > if (err < 0) > goto out_free; > card->private_data = chip; Right, this patch has the race removed, as the variable is no longer set in azx_firmware_cb. To be picky, it's slightly confusing that probe_deferred is also used for signalling a disabled chip. Maybe "probe_now" (inverted) would have been even better, like this: > + probe_deferred = chip->disabled; probe_now = !chip->disabled; > > #ifdef CONFIG_SND_HDA_PATCH_LOADER > if (patch[dev] && *patch[dev]) { (maybe we should not ask for firmware for a disabled chip either) > snd_printk(KERN_ERR SFX "Applying patch firmware '%s'\n", > patch[dev]); > - err = request_firmware(&chip->fw, patch[dev], &pci->dev); > + err = request_firmware_nowait(THIS_MODULE, true, patch[dev], > + &pci->dev, GFP_KERNEL, card, > + azx_firmware_cb); > if (err < 0) > goto out_free; > + probe_deferred = true; probe_now = false; > } > #endif /* CONFIG_SND_HDA_PATCH_LOADER */ > > - if (!chip->disabled) { > + if (!probe_deferred) { if (probe_now) { > err = azx_probe_continue(chip); > if (err < 0) > goto out_free; > -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic
next prev parent reply other threads:[~2012-08-09 13:54 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-09 6:45 [PATCH] ALSA: hda - Defer probe when loading patch firmware Thierry Reding 2012-08-09 6:45 ` 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 [this message] 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=5023C0FC.2030207@canonical.com \ --to=david.henningsson@canonical.com \ --cc=alsa-devel@alsa-project.org \ --cc=linux-kernel@vger.kernel.org \ --cc=thierry.reding@avionic-design.de \ --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.