video: tegra: host: Recover engine on abort

Currently PVA cannot be recovered if there is a critical error (i.e.
abort from the engine). This change modifies code to reset the PVA
and abort existing work if:

* PVA issues abort ISR
* Communication through mailbox interface times out
* Communication through CCQ interface times out

JIRA PVA-51

Change-Id: I448d231737a122fe5bf6787e5fa1794c2a7b1a33
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/1502343
GVS: Gerrit_Virtual_Submit
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>

13 files changed, 299 insertions, 33 deletions

diff --git a/drivers/video/tegra/host/nvhost_queue.c b/drivers/video/tegra/host/nvhost_queue.c
index c9ba3cf02..03cf795eb 100644
--- a/drivers/video/tegra/host/nvhost_queue.c
+++ b/drivers/video/tegra/host/nvhost_queue.c
@@ -227,6 +227,16 @@ void nvhost_queue_deinit(struct nvhost_queue_pool *pool)
         pool = NULL;
 }
 
+void nvhost_queue_abort_all(struct nvhost_queue_pool *pool)
+{
+        u32 id;
+
+        mutex_lock(&pool->queue_lock);
+        for_each_set_bit(id, &pool->alloc_table, pool->max_queue_cnt)
+                nvhost_queue_abort(&pool->queues[id]);
+        mutex_unlock(&pool->queue_lock);
+}
+
 static void nvhost_queue_release(struct kref *ref)
 {
         struct nvhost_queue *queue = container_of(ref, struct nvhost_queue,
diff --git a/drivers/video/tegra/host/nvhost_queue.h b/drivers/video/tegra/host/nvhost_queue.h
index 510508d54..73b167ab9 100644
--- a/drivers/video/tegra/host/nvhost_queue.h
+++ b/drivers/video/tegra/host/nvhost_queue.h
@@ -185,6 +185,13 @@ struct nvhost_queue *nvhost_queue_alloc(struct nvhost_queue_pool *pool,
                                         bool use_channel);
 
 /**
+ * @brief               Abort all active queues
+ *
+ * @param pool          Pointer to a queue pool table
+ */
+void nvhost_queue_abort_all(struct nvhost_queue_pool *pool);
+
+/**
  * @brief       Abort tasks within a client queue
  *
  * This function aborts all tasks from the given clinet queue. If there is no
diff --git a/drivers/video/tegra/host/pva/Makefile b/drivers/video/tegra/host/pva/Makefile
index a1503925b..517da1196 100644
--- a/drivers/video/tegra/host/pva/Makefile
+++ b/drivers/video/tegra/host/pva/Makefile
@@ -12,6 +12,7 @@ nvhost-pva-objs  = \
                 pva_queue.o \
                 pva_debug.o \
                 pva_trace.o \
+                pva_abort.o \
                 pva_ccq.o
 
 obj-$(CONFIG_TEGRA_GRHOST_PVA) += nvhost-pva.o
diff --git a/drivers/video/tegra/host/pva/pva-interface.h b/drivers/video/tegra/host/pva/pva-interface.h
index 2157ae1e2..d272ce6dc 100644
--- a/drivers/video/tegra/host/pva/pva-interface.h
+++ b/drivers/video/tegra/host/pva/pva-interface.h
@@ -90,6 +90,7 @@
 #define PVA_AISR_LOGGING_OVERFLOW       PVA_BIT(25)
 #define PVA_AISR_PRINTF_OVERFLOW        PVA_BIT(24)
 #define PVA_AISR_CRASH_LOG              PVA_BIT(23)
+#define PVA_AISR_ABORT                  PVA_BIT(0)
 
 #define PVA_GET_ERROR_CODE(_s_)         PVA_EXTRACT(_s_, 15, 0, enum pva_errors)
 
diff --git a/drivers/video/tegra/host/pva/pva.c b/drivers/video/tegra/host/pva/pva.c
index 028de9fdd..ddc09ca89 100644
--- a/drivers/video/tegra/host/pva/pva.c
+++ b/drivers/video/tegra/host/pva/pva.c
@@ -86,7 +86,6 @@ static int pva_init_fw(struct platform_device *pdev)
         struct pva_dma_alloc_info *priv2_buffer;
         u32 *ucode_ptr;
         int err = 0, w;
-        int timeout;
         u64 ucode_useg_addr;
 
         nvhost_dbg_fn("");
@@ -172,16 +171,7 @@ static int pva_init_fw(struct platform_device *pdev)
         nvhost_dbg_fn("Waiting for PVA to be READY");
 
         /* Wait PVA to report itself as ready */
-        if (tegra_platform_is_silicon()) {
-                timeout = wait_event_timeout(pva->mailbox_waitqueue,
-                        pva->mailbox_status == PVA_MBOX_STATUS_DONE,
-                        msecs_to_jiffies(60000));
-                if (timeout <= 0)
-                        err = -ETIMEDOUT;
-
-        } else
-                wait_event(pva->mailbox_waitqueue,
-                        pva->mailbox_status == PVA_MBOX_STATUS_DONE);
+        err = pva_mailbox_wait_event(pva, 60000);
 
         pva->mailbox_status = PVA_MBOX_STATUS_INVALID;
 
@@ -422,6 +412,8 @@ int pva_finalize_poweron(struct platform_device *pdev)
                 }
         }
 
+        pva->booted = true;
+
         return err;
 
 err_poweron:
@@ -434,6 +426,8 @@ int pva_prepare_poweroff(struct platform_device *pdev)
         struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
         struct pva *pva = pdata->private_data;
 
+        pva->booted = false;
+
         disable_irq(pva->irq);
 
         pva_free_fw(pdev, pva);
@@ -477,6 +471,7 @@ static int pva_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, pdata);
         init_waitqueue_head(&pva->mailbox_waitqueue);
         mutex_init(&pva->mailbox_mutex);
+        mutex_init(&pva->ccq_mutex);
         pva->submit_mode = PVA_SUBMIT_MODE_MAILBOX;
 
         /* Map MMIO range to kernel space */
@@ -508,6 +503,8 @@ static int pva_probe(struct platform_device *pdev)
         if (err < 0)
                 goto err_isr_init;
 
+        pva_abort_init(pva);
+
         err = nvhost_syncpt_unit_interface_init(pdev);
         if (err)
                 goto err_mss_init;
diff --git a/drivers/video/tegra/host/pva/pva.h b/drivers/video/tegra/host/pva/pva.h
index e1bdba1b2..1103513f1 100644
--- a/drivers/video/tegra/host/pva/pva.h
+++ b/drivers/video/tegra/host/pva/pva.h
@@ -154,6 +154,8 @@ struct pva {
         enum pva_mailbox_status mailbox_status;
         struct mutex mailbox_mutex;
 
+        struct mutex ccq_mutex;
+
         struct pva_crashdump_debugfs_entry debugfs_entry_r5;
         struct pva_crashdump_debugfs_entry debugfs_entry_vpu0;
         struct pva_crashdump_debugfs_entry debugfs_entry_vpu1;
@@ -163,6 +165,9 @@ struct pva {
 
         struct pva_trace_log pva_trace;
         u32 submit_mode;
+
+        struct work_struct pva_abort_handler_work;
+        bool booted;
 };
 
 /**
@@ -215,6 +220,7 @@ int pva_prepare_poweroff(struct platform_device *pdev);
  *
  */
 int pva_register_isr(struct platform_device *dev);
+
 /**