Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fcd3920 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Reset CORB/RIRB at retrying the verb communication 



When a codec communication error occurs, the CORB/RIRB counters should
be reset first before re-issuing the verb.  Simply call azx_free_cmd_io()
and azx_init_cmd_io() to achieve that.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fa797966

sound/pci/hda/hda_intel.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -522,6 +522,7 @@ static void azx_init_cmd_io(struct azx *chip) 
	/* RIRB set up */

	/* RIRB set up */

	chip->rirb.addr = chip->rb.addr + 2048;

	chip->rirb.addr = chip->rb.addr + 2048;

	chip->rirb.buf = (u32 *)(chip->rb.area + 2048);

	chip->rirb.buf = (u32 *)(chip->rb.area + 2048);

	chip->rirb.wp = chip->rirb.rp = chip->rirb.cmds = 0;

	azx_writel(chip, RIRBLBASE, (u32)chip->rirb.addr);

	azx_writel(chip, RIRBLBASE, (u32)chip->rirb.addr);

	azx_writel(chip, RIRBUBASE, upper_32_bits(chip->rirb.addr));

	azx_writel(chip, RIRBUBASE, upper_32_bits(chip->rirb.addr));
@@ -533,7 +534,6 @@ static void azx_init_cmd_io(struct azx *chip) 
	azx_writew(chip, RINTCNT, 1);

	azx_writew(chip, RINTCNT, 1);

	/* enable rirb dma and response irq */

	/* enable rirb dma and response irq */

	azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN | ICH6_RBCTL_IRQ_EN);

	azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN | ICH6_RBCTL_IRQ_EN);

	chip->rirb.rp = chip->rirb.cmds = 0;

}

}





static void azx_free_cmd_io(struct azx *chip)

static void azx_free_cmd_io(struct azx *chip)
@@ -654,9 +654,11 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus) 




	snd_printk(KERN_ERR SFX "azx_get_response timeout (ERROR): "

	snd_printk(KERN_ERR SFX "azx_get_response timeout (ERROR): "

		   "last cmd=0x%08x\n", chip->last_cmd);

		   "last cmd=0x%08x\n", chip->last_cmd);

	/* re-initialize CORB/RIRB */

	spin_lock_irq(&chip->reg_lock);

	spin_lock_irq(&chip->reg_lock);

	chip->rirb.cmds = 0; /* reset the index */

	bus->rirb_error = 1;

	bus->rirb_error = 1;

	azx_free_cmd_io(chip);

	azx_init_cmd_io(chip);

	spin_unlock_irq(&chip->reg_lock);

	spin_unlock_irq(&chip->reg_lock);

	return -1;

	return -1;

}

}