ALSA: hda - Check validity of CORB/RIRB WP reads

When the HD-audio controller is disabled (e.g. via vga switcheroo) but
the driver is still accessing it, it spews floods of "spurious
response" kernel messages.  It's because CORB/RIRB WP reads 0xff, and
the driver tries to fill up until this number.

This patch changes the CORB/RIRB WP reads to word instead of byte, and
add the check of the read value.  If it's 0xffff, the controller is
supposed to be disabled, so the further action will be skipped.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index d00dea0eb7f9530134d62ba54aeb51fee6624ed3..eb88c528e120f5dee71146c3df25f1290e202b98 100644 (file)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -799,7 +799,12 @@ static int azx_corb_send_cmd(struct hda_bus *bus, u32 val)
        spin_lock_irq(&chip->reg_lock);
 
        /* add command to corb */
-       wp = azx_readb(chip, CORBWP);
+       wp = azx_readw(chip, CORBWP);
+       if (wp == 0xffff) {
+               /* something wrong, controller likely turned to D3 */
+               spin_unlock_irq(&chip->reg_lock);
+               return -1;
+       }
        wp++;
        wp %= ICH6_MAX_CORB_ENTRIES;
 
@@ -821,7 +826,12 @@ static void azx_update_rirb(struct azx *chip)
        unsigned int addr;
        u32 res, res_ex;
 
-       wp = azx_readb(chip, RIRBWP);
+       wp = azx_readw(chip, RIRBWP);
+       if (wp == 0xffff) {
+               /* something wrong, controller likely turned to D3 */
+               return;
+       }
+
        if (wp == chip->rirb.wp)
                return;
        chip->rirb.wp = wp;