From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964814Ab2HINyE (ORCPT ); Thu, 9 Aug 2012 09:54:04 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:38482 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932262Ab2HINyB (ORCPT ); Thu, 9 Aug 2012 09:54:01 -0400 Message-ID: <5023C0FC.2030207@canonical.com> Date: Thu, 09 Aug 2012 15:54:04 +0200 From: David Henningsson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: Takashi Iwai CC: Thierry Reding , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait() References: <1344494723-6827-1-git-send-email-thierry.reding@avionic-design.de> <20120809070813.GA6979@avionic-0098.mockup.avionic-design.de> <20120809073642.GA24695@avionic-0098.mockup.avionic-design.de> <20120809080713.GC24808@avionic-0098.mockup.avionic-design.de> <20120809103430.GA1560@avionic-0098.mockup.avionic-design.de> <5023BAA0.1080304@canonical.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Henningsson Subject: Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait() Date: Thu, 09 Aug 2012 15:54:04 +0200 Message-ID: <5023C0FC.2030207@canonical.com> References: <1344494723-6827-1-git-send-email-thierry.reding@avionic-design.de> <20120809070813.GA6979@avionic-0098.mockup.avionic-design.de> <20120809073642.GA24695@avionic-0098.mockup.avionic-design.de> <20120809080713.GC24808@avionic-0098.mockup.avionic-design.de> <20120809103430.GA1560@avionic-0098.mockup.avionic-design.de> <5023BAA0.1080304@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by alsa0.perex.cz (Postfix) with ESMTP id DE6AC26633E for ; Thu, 9 Aug 2012 15:24:14 +0200 (CEST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Takashi Iwai Cc: alsa-devel@alsa-project.org, Thierry Reding , linux-kernel@vger.kernel.org List-Id: alsa-devel@alsa-project.org 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