Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait()

2012-08-09 Thread Takashi Iwai 
At Thu, 09 Aug 2012 15:54:04 +0200,
David Henningsson wrote:
> 
> 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?

Ah, yes.


> > +
> > +   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:

Yeah, this looks slightly more straightforward.

I'm going to send a revised version shortly.


thanks,

Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait()

2012-08-09 Thread Thierry Reding 
On Thu, Aug 09, 2012 at 03:54:04PM +0200, David Henningsson wrote:
> 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?

Adding that line here fixes the problem for me.

Thierry


pgpdcXwePkhgd.pgp
Description: PGP signature

Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait()

2012-08-09 Thread David Henningsson 

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(>fw, patch[dev], >dev);
+   err = request_firmware_nowait(THIS_MODULE, true, patch[dev],
+ >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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait()

2012-08-09 Thread Takashi Iwai 
For processing the firmware handling properly for built-in kernels,
implement an asynchronous f/w loading with request_firmware_nowait().
This means that the codec probing is deferred when the patch option is
specified.

Signed-off-by: Takashi Iwai 
---
v1->v2: drop superfluous chip->probe_deferred field

 sound/pci/hda/hda_codec.c |  2 +-
 sound/pci/hda/hda_intel.c | 41 +
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 88a9c20..408babc 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4184,7 +4184,7 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
  *
  * This function returns 0 if successful, or a negative error code.
  */
-int __devinit snd_hda_build_pcms(struct hda_bus *bus)
+int snd_hda_build_pcms(struct hda_bus *bus)
 {
struct hda_codec *codec;
 
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b25d539..717acb4 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -564,13 +564,17 @@ enum {
  * VGA-switcher support
  */
 #ifdef SUPPORT_VGA_SWITCHEROO
+#define use_vga_switcheroo(chip)   ((chip)->use_vga_switcheroo)
+#else
+#define use_vga_switcheroo(chip)   0
+#endif
+
+#if defined(SUPPORT_VGA_SWITCHEROO) || defined(CONFIG_SND_HDA_PATCH_LOADER)
 #define DELAYED_INIT_MARK
 #define DELAYED_INITDATA_MARK
-#define use_vga_switcheroo(chip)   ((chip)->use_vga_switcheroo)
 #else
 #define DELAYED_INIT_MARK  __devinit
 #define DELAYED_INITDATA_MARK  __devinitdata
-#define use_vga_switcheroo(chip)   0
 #endif
 
 static char *driver_short_names[] DELAYED_INITDATA_MARK = {
@@ -3155,12 +3159,37 @@ static void power_down_all_codecs(struct azx *chip)
 #endif
 }
 
+/* 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;
+   }
+
+   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;
+   probe_deferred = chip->disabled;
 
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
if (patch[dev] && *patch[dev]) {
snd_printk(KERN_ERR SFX "Applying patch firmware '%s'\n",
   patch[dev]);
-   err = request_firmware(>fw, patch[dev], >dev);
+   err = request_firmware_nowait(THIS_MODULE, true, patch[dev],
+ >dev, GFP_KERNEL, card,
+ azx_firmware_cb);
if (err < 0)
goto out_free;
+   probe_deferred = true;
}
 #endif /* CONFIG_SND_HDA_PATCH_LOADER */
 
-   if (!chip->disabled) {
+   if (!probe_deferred) {
err = azx_probe_continue(chip);
if (err < 0)
goto out_free;
-- 
1.7.11.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait()

2012-08-09 Thread Takashi Iwai 
For processing the firmware handling properly for built-in kernels,
implement an asynchronous f/w loading with request_firmware_nowait().
This means that the codec probing is deferred when the patch option is
specified.

Signed-off-by: Takashi Iwai ti...@suse.de
---
v1-v2: drop superfluous chip-probe_deferred field

 sound/pci/hda/hda_codec.c |  2 +-
 sound/pci/hda/hda_intel.c | 41 +
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 88a9c20..408babc 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4184,7 +4184,7 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
  *
  * This function returns 0 if successful, or a negative error code.
  */
-int __devinit snd_hda_build_pcms(struct hda_bus *bus)
+int snd_hda_build_pcms(struct hda_bus *bus)
 {
struct hda_codec *codec;
 
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b25d539..717acb4 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -564,13 +564,17 @@ enum {
  * VGA-switcher support
  */
 #ifdef SUPPORT_VGA_SWITCHEROO
+#define use_vga_switcheroo(chip)   ((chip)-use_vga_switcheroo)
+#else
+#define use_vga_switcheroo(chip)   0
+#endif
+
+#if defined(SUPPORT_VGA_SWITCHEROO) || defined(CONFIG_SND_HDA_PATCH_LOADER)
 #define DELAYED_INIT_MARK
 #define DELAYED_INITDATA_MARK
-#define use_vga_switcheroo(chip)   ((chip)-use_vga_switcheroo)
 #else
 #define DELAYED_INIT_MARK  __devinit
 #define DELAYED_INITDATA_MARK  __devinitdata
-#define use_vga_switcheroo(chip)   0
 #endif
 
 static char *driver_short_names[] DELAYED_INITDATA_MARK = {
@@ -3155,12 +3159,37 @@ static void power_down_all_codecs(struct azx *chip)
 #endif
 }
 
+/* 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;
+   }
+
+   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;
+   probe_deferred = chip-disabled;
 
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
if (patch[dev]  *patch[dev]) {
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;
}
 #endif /* CONFIG_SND_HDA_PATCH_LOADER */
 
-   if (!chip-disabled) {
+   if (!probe_deferred) {
err = azx_probe_continue(chip);
if (err  0)
goto out_free;
-- 
1.7.11.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait()

2012-08-09 Thread David Henningsson 

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
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait()

2012-08-09 Thread Thierry Reding 
On Thu, Aug 09, 2012 at 03:54:04PM +0200, David Henningsson wrote:
 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?

Adding that line here fixes the problem for me.

Thierry


pgpdcXwePkhgd.pgp
Description: PGP signature

Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait()

2012-08-09 Thread Takashi Iwai 
At Thu, 09 Aug 2012 15:54:04 +0200,
David Henningsson wrote:
 
 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?

Ah, yes.


  +
  +   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:

Yeah, this looks slightly more straightforward.

I'm going to send a revised version shortly.


thanks,

Takashi
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/