CHROMIUM: ALSA: hda/ca0132 - Change retry timeout method.

Originally we do 50 retries in chipio_send() and dspio_send().
Now it is changed to sleep for 1ms after each try, and timeout after 1 second.
Similar change is applied to wait for DMA done.

BUG=chrome-os-partner:12327
TEST=play youtube, suspend/resume 10 times.

Signed-off-by: Chih-Chung Chang <chihchung@chromium.org>
Change-Id: I59e9350a48721a8e426bfba1da2f2aad7ee907a0
Reviewed-on: https://gerrit.chromium.org/gerrit/32128

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 05e6197..04e502b 100644 (file)
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -791,7 +791,7 @@ static int chipio_send(struct hda_codec *codec,
                       u32 data)
 {
        unsigned int res;
-       int retry = 50;
+       unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 
        /* send bits of data specified by reg */
        do {
@@ -799,7 +799,8 @@ static int chipio_send(struct hda_codec *codec,
                                         reg, data);
                if (res == VENDOR_STATUS_CHIPIO_OK)
                        return 0;
-       } while (--retry);
+               msleep(1);
+       } while (time_before(jiffies, timeout));
 
        CTASSERT(0);
        return -1;
@@ -1013,16 +1014,17 @@ static int dspio_send(struct hda_codec *codec, unsigned int reg,
                      unsigned int data)
 {
        unsigned int res;
-       int retry = 50;
+       unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 
        /* send bits of data specified by reg to dsp */
        do {
                res = snd_hda_codec_read(codec, WIDGET_DSP_CTRL, 0, reg, data);
                if ((res >= 0) && (res != VENDOR_STATUS_DSPIO_BUSY))
                        return res;
-       } while (--retry);
+               msleep(1);
+       } while (time_before(jiffies, timeout));
 
-       CTASSERT(retry);
+       CTASSERT(0);
        return -1;
 }
 
@@ -2148,7 +2150,8 @@ static int dspxfr_one_seg(struct hda_codec *codec,
        u32 chip_addx_remainder;
        unsigned int run_size_words;
        const struct dsp_image_seg *hci_write = NULL;
-       int retry;
+       unsigned long timeout;
+       bool dma_active;
 
        CTASSERT(fls != NULL);
        if (fls == NULL)
@@ -2265,11 +2268,16 @@ static int dspxfr_one_seg(struct hda_codec *codec,
                                status = dspxfr_hci_write(codec, hci_write);
                                hci_write = NULL;
                        }
-                       retry = 5000;
-                       while (dsp_is_dma_active(codec, dma_chan)) {
-                               if (--retry <= 0)
+
+                       timeout = jiffies + msecs_to_jiffies(2000);
+                       do {
+                               dma_active = dsp_is_dma_active(codec, dma_chan);
+                               if (!dma_active)
                                        break;
-                       }
+                               msleep(1);
+                       } while (time_before(jiffies, timeout));
+                       if (dma_active)
+                               break;
                        CA0132_DSP_LOG("+++++ DMA complete");
                        dma_set_state(dma_engine, DMA_STATE_STOP);
                        status = dma_reset(dma_engine);