audio/intel-hda: support FIFORDY 15/20115/1
authorStanislav Vorobiov <s.vorobiov@samsung.com>
Fri, 25 Apr 2014 08:39:33 +0000 (12:39 +0400)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 28 Apr 2014 07:08:33 +0000 (00:08 -0700)
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

Change-Id: I5bb3f36094e6c8b23a0338f31ff949d863c378ec
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
(cherry picked from commit 62c37a816010779308706bf69bfd897aedbdbf6d)

hw/audio/intel-hda.c

index d41f82c..9e075c0 100644 (file)
@@ -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,                                               \