tegra-virt-alt: atomic wait for ivc receive

Change updates ack based wait for start/stop playback and capture
ivc messages. Since trigger is called in atomic context updated
ivc receive for using atomic wait.

Bug 2127348
Bug 2109369

Change-Id: I418ddaa9fed4c3f75ee007311023e4e29655e694
Signed-off-by: Dipesh Gandhi <dipeshg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1729593
(cherry picked from commit 63250eab2abafc7d892356fca94d9ba53851a06e)
Reviewed-on: https://git-master.nvidia.com/r/1726738
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Uday Gupta <udayg@nvidia.com>
Reviewed-by: Nitin Pai <npai@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 41 insertions, 20 deletions

diff --git a/sound/soc/tegra-virt-alt/tegra210_virt_alt_admaif.c b/sound/soc/tegra-virt-alt/tegra210_virt_alt_admaif.c
index 9fac2bd97..258ec78f6 100644
--- a/sound/soc/tegra-virt-alt/tegra210_virt_alt_admaif.c
+++ b/sound/soc/tegra-virt-alt/tegra210_virt_alt_admaif.c
@@ -132,10 +132,14 @@ static void tegra210_admaif_start_playback(struct snd_soc_dai *dai)
         memset(&msg, 0, sizeof(struct nvaudio_ivc_msg));
         msg.cmd = NVAUDIO_START_PLAYBACK;
         msg.params.dmaif_info.id = data->admaif_id;
-        err = nvaudio_ivc_send(data->hivc_client,
-                                &msg,
-                                sizeof(struct nvaudio_ivc_msg));
-        if (err < 0)
+        msg.ack_required = true;
+        err = nvaudio_ivc_send_retry(data->hivc_client,
+                        &msg, sizeof(struct nvaudio_ivc_msg));
+
+        if (err >= 0) {
+                nvaudio_ivc_receive(data->hivc_client,
+                        &msg, sizeof(struct nvaudio_ivc_msg));
+        } else if (err < 0)
                 pr_err("%s: error on ivc_send\n", __func__);
 }
 
@@ -150,10 +154,15 @@ static void tegra210_admaif_stop_playback(struct snd_soc_dai *dai)
         memset(&msg, 0, sizeof(struct nvaudio_ivc_msg));
         msg.cmd = NVAUDIO_STOP_PLAYBACK;
         msg.params.dmaif_info.id = data->admaif_id;
-        err = nvaudio_ivc_send(data->hivc_client,
-                                &msg,
-                                sizeof(struct nvaudio_ivc_msg));
-        if (err < 0)
+
+        msg.ack_required = true;
+        err = nvaudio_ivc_send_retry(data->hivc_client,
+                        &msg, sizeof(struct nvaudio_ivc_msg));
+
+        if (err >= 0) {
+                nvaudio_ivc_receive(data->hivc_client,
+                        &msg, sizeof(struct nvaudio_ivc_msg));
+        } else if (err < 0)
                 pr_err("%s: error on ivc_send\n", __func__);
 }
 
@@ -168,10 +177,15 @@ static void tegra210_admaif_start_capture(struct snd_soc_dai *dai)
         memset(&msg, 0, sizeof(struct nvaudio_ivc_msg));
         msg.cmd = NVAUDIO_START_CAPTURE;
         msg.params.dmaif_info.id = data->admaif_id;
-        err = nvaudio_ivc_send(data->hivc_client,
-                                &msg,
-                                sizeof(struct nvaudio_ivc_msg));
-        if (err < 0)
+
+        msg.ack_required = true;
+        err = nvaudio_ivc_send_retry(data->hivc_client,
+                        &msg, sizeof(struct nvaudio_ivc_msg));
+
+        if (err >= 0) {
+                nvaudio_ivc_receive(data->hivc_client,
+                        &msg, sizeof(struct nvaudio_ivc_msg));
+        } else if (err < 0)
                 pr_err("%s: error on ivc_send\n", __func__);
 }
 
@@ -186,10 +200,15 @@ static void tegra210_admaif_stop_capture(struct snd_soc_dai *dai)
         memset(&msg, 0, sizeof(struct nvaudio_ivc_msg));
         msg.cmd = NVAUDIO_STOP_CAPTURE;
         msg.params.dmaif_info.id = data->admaif_id;
-        err = nvaudio_ivc_send(data->hivc_client,
-                                &msg,
-                                sizeof(struct nvaudio_ivc_msg));
-        if (err < 0)
+
+        msg.ack_required = true;
+        err = nvaudio_ivc_send_retry(data->hivc_client,
+                        &msg, sizeof(struct nvaudio_ivc_msg));
+
+        if (err >= 0) {
+                nvaudio_ivc_receive(data->hivc_client,
+                        &msg, sizeof(struct nvaudio_ivc_msg));
+        } else if (err < 0)
                 pr_err("%s: error on ivc_send\n", __func__);
 }
 
diff --git a/sound/soc/tegra-virt-alt/tegra_virt_alt_ivc.c b/sound/soc/tegra-virt-alt/tegra_virt_alt_ivc.c
index 30370845d..67c72ced9 100644
--- a/sound/soc/tegra-virt-alt/tegra_virt_alt_ivc.c
+++ b/sound/soc/tegra-virt-alt/tegra_virt_alt_ivc.c
@@ -1,7 +1,7 @@
 /*
  * IVC based librabry for AUDIO server
  *
- * Copyright (c) 2015-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -24,6 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/hardirq.h>
 #include <linux/interrupt.h>
+#include <linux/iopoll.h>
 
 #include "tegra_virt_alt_ivc.h"
 #include "tegra_virt_alt_ivc_common.h"
@@ -115,13 +116,14 @@ int nvaudio_ivc_receive(struct nvaudio_ivc_ctxt *ictxt,
                         struct nvaudio_ivc_msg *rx_msg, int size)
 {
         unsigned long flags;
+        unsigned int status;
         int err = 0;
         u32 len = 0;
 
         while (!tegra_hv_ivc_can_read(ictxt->ivck)) {
-                wait_event_timeout(ictxt->wait,
-                                        ictxt->rx_state == RX_AVAIL,
-                                        msecs_to_jiffies(ictxt->timeout));
+                readx_poll_timeout_atomic(readl, &(ictxt->rx_state),
+                        status, (status == RX_AVAIL),
+                        10, 10000);
         }
 
         if (tegra_hv_ivc_channel_notified(ictxt->ivck)) {