diff mbox

audio/intel-hda: support FIFORDY

Message ID 1398775727-27610-2-git-send-email-s.vorobiov@samsung.com
State New
Headers show

Commit Message

Stanislav Vorobiov April 29, 2014, 12:48 p.m. UTC
linux kernel 3.12 has changed intel-hda
driver to always check for FIFORDY, this
causes long hangs in guest since QEMU
always has this bit set to 0. We now simply set
it to 1 always, since we're synchronous anyway
and always ready to receive the stream

Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
---
 hw/audio/intel-hda.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Gerd Hoffmann April 30, 2014, 10:22 a.m. UTC | #1
On Di, 2014-04-29 at 16:48 +0400, Stanislav Vorobiov wrote:
> linux kernel 3.12 has changed intel-hda
> driver to always check for FIFORDY, this
> causes long hangs in guest since QEMU
> always has this bit set to 0. We now simply set
> it to 1 always, since we're synchronous anyway
> and always ready to receive the stream

Added to audio patch queue.

thanks,
  Gerd
diff mbox

Patch

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index d41f82c..9e075c0 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -574,7 +574,7 @@  static void intel_hda_set_st_ctl(IntelHDAState *d, const IntelHDAReg *reg, uint3
     if (st->ctl & 0x01) {
         /* reset */
         dprint(d, 1, "st #%d: reset\n", reg->stream);
-        st->ctl = 0;
+        st->ctl = SD_STS_FIFO_READY << 24;
     }
     if ((st->ctl & 0x02) != (old & 0x02)) {
         uint32_t stnr = (st->ctl >> 20) & 0x0f;
@@ -829,6 +829,7 @@  static const struct IntelHDAReg regtab[] = {
         .wclear   = 0x1c000000,                                       \
         .offset   = offsetof(IntelHDAState, st[_i].ctl),              \
         .whandler = intel_hda_set_st_ctl,                             \
+        .reset    = SD_STS_FIFO_READY << 24                           \
     },                                                                \
     [ ST_REG(_i, ICH6_REG_SD_LPIB) ] = {                              \
         .stream   = _i,                                               \