video: tegra: host: Rework eventlib events

This change updates eventlib events to follow the requested format:

- An event is generated as part of submission
- Rather than using "START" in the event identifier, the code uses
  "BEGIN"

Bug 1996639

Change-Id: I5afc31332b0121a2287eda07f77d86304a0ba6ac
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1610037
GVS: Gerrit_Virtual_Submit
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>

4 files changed, 77 insertions, 10 deletions

diff --git a/drivers/video/tegra/host/bus_client.c b/drivers/video/tegra/host/bus_client.c
index d9f94bde9..1312f63ce 100644
--- a/drivers/video/tegra/host/bus_client.c
+++ b/drivers/video/tegra/host/bus_client.c
@@ -1825,14 +1825,14 @@ void nvhost_eventlib_log_task(struct platform_device *pdev,
         /*
          * Write task start event
          */
-        event.task_start.syncpt_id = syncpt_id;
-        event.task_start.syncpt_thresh = syncpt_thresh;
-        event.task_start.class_id = pdata->class;
+        event.task_begin.syncpt_id = syncpt_id;
+        event.task_begin.syncpt_thresh = syncpt_thresh;
+        event.task_begin.class_id = pdata->class;
 
         keventlib_write(pdata->eventlib_id,
                         &event,
                         sizeof(event),
-                        NVHOST_TASK_START,
+                        NVHOST_TASK_BEGIN,
                         timestamp_start);
 
         /*
@@ -1848,6 +1848,32 @@ void nvhost_eventlib_log_task(struct platform_device *pdev,
                         NVHOST_TASK_END,
                         timestamp_end);
 }
+
+void nvhost_eventlib_log_submit(struct platform_device *pdev,
+                                u32 syncpt_id,
+                                u32 syncpt_thresh)
+{
+        struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
+        union nvhost_event_union event;
+
+        if (!pdata->eventlib_id)
+                return;
+
+        /*
+         * Write task start event
+         */
+        event.task_submit.syncpt_id = syncpt_id;
+        event.task_submit.syncpt_thresh = syncpt_thresh;
+        event.task_submit.class_id = pdata->class;
+        event.task_submit.pid = current->tgid;
+        event.task_submit.tid = current->pid;
+
+        keventlib_write(pdata->eventlib_id,
+                        &event,
+                        sizeof(event),
+                        NVHOST_TASK_SUBMIT,
+                        0);
+}
 #else
 void nvhost_eventlib_log_task(struct platform_device *pdev,
                               u32 syncpt_id,
@@ -1856,5 +1882,12 @@ void nvhost_eventlib_log_task(struct platform_device *pdev,
                               u64 timestamp_end)
 {
 }
+
+void nvhost_eventlib_log_submit(struct platform_device *pdev,
+                                u32 syncpt_id,
+                                u32 syncpt_thresh)
+{
+}
 #endif
+EXPORT_SYMBOL(nvhost_eventlib_log_submit);
 EXPORT_SYMBOL(nvhost_eventlib_log_task);
diff --git a/drivers/video/tegra/host/pva/pva_queue.c b/drivers/video/tegra/host/pva/pva_queue.c
index 32a57721c..a9b713659 100644
--- a/drivers/video/tegra/host/pva/pva_queue.c
+++ b/drivers/video/tegra/host/pva/pva_queue.c
@@ -1182,6 +1182,8 @@ static int pva_task_submit(struct pva_submit_task *task)
         list_add_tail(&task->node, &queue->tasklist);
         mutex_unlock(&queue->list_lock);
 
+        nvhost_eventlib_log_submit(task->pva->pdev, queue->syncpt_id, thresh);
+
         nvhost_dbg_info("Postfence id=%u, value=%u",
                         queue->syncpt_id, thresh);
 
diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h
index 1496aa13a..63bc56fca 100644
--- a/include/linux/nvhost.h
+++ b/include/linux/nvhost.h
@@ -648,6 +648,12 @@ static inline void nvhost_eventlib_log_task(struct platform_device *pdev,
                                             u64 timestamp_end)
 {
 }
+
+static inline void nvhost_eventlib_log_submit(struct platform_device *pdev,
+                                              u32 syncpt_id,
+                                              u32 syncpt_thresh)
+{
+}
 #else
 
 #ifdef CONFIG_DEBUG_FS
@@ -756,6 +762,10 @@ void nvhost_eventlib_log_task(struct platform_device *pdev,
                               u64 timestamp_start,
                               u64 timestamp_end);
 
+void nvhost_eventlib_log_submit(struct platform_device *pdev,
+                                u32 syncpt_id,
+                                u32 syncpt_thresh);
+
 /* public host1x interrupt management APIs */
 int nvhost_intr_register_notifier(struct platform_device *pdev,
                                   u32 id, u32 thresh,
diff --git a/include/uapi/linux/nvhost_events.h b/include/uapi/linux/nvhost_events.h
index 1935f6edd..4655537f1 100644
--- a/include/uapi/linux/nvhost_events.h
+++ b/include/uapi/linux/nvhost_events.h
@@ -25,8 +25,26 @@ enum {
 
 #define NVHOST_EVENT_PROVIDER_NAME "nvhost"
 
+/* Marks that the task is submitted to hardware */
+struct nvhost_task_submit {
+        /* Engine class ID */
+        u32 class_id;
+
+        /* Syncpoint ID */
+        u32 syncpt_id;
+
+        /* Threshold for task completion */
+        u32 syncpt_thresh;
+
+        /* PID */
+        u32 pid;
+
+        /* TID */
+        u32 tid;
+} __packed;
+
 /* Marks that the task is moving to execution */
-struct nvhost_task_start {
+struct nvhost_task_begin {
         /* Engine class ID */
         u32 class_id;
 
@@ -50,18 +68,22 @@ struct nvhost_task_end {
 } __packed;
 
 enum {
-        /* struct nvhost_task_start */
-        NVHOST_TASK_START = 0,
+        /* struct nvhost_task_submit */
+        NVHOST_TASK_SUBMIT = 0,
+
+        /* struct nvhost_task_begin */
+        NVHOST_TASK_BEGIN = 1,
 
         /* struct nvhost_task_end */
-        NVHOST_TASK_END = 1,
+        NVHOST_TASK_END = 2,
 
-        NVHOST_NUM_EVENT_TYPES = 2
+        NVHOST_NUM_EVENT_TYPES = 3
 };
 
 union nvhost_event_union {
-        struct nvhost_task_start task_start;
+        struct nvhost_task_begin task_begin;
         struct nvhost_task_end task_end;
+        struct nvhost_task_submit task_submit;
 };
 
 enum {