tegra: camera: rtcpu: update firmware api headers

tag b5e08441a70fd2d09ae93942363d63295fce18de

rtcpu@634a51f
    aeec1f0 capture: implement VI channel error actions
    c1607e4 rtcpu: misc MISRA fixes
    3914405 isp5: Add error recovery and notification support
    b3af7ae rtcpu: Add task number and priority to task stats
    63f5e50 t194: Remove deprecated downscaler params
    d81a4a3 rce: improve boot protocol message validation

Bug 2047639
Bug 2109186
Jira CAMASIL-212
Jira CAMC-599
Jira CP-1445

Change-Id: I45e0bfaa151f0d53bacb4ab305873a11c7c06a3a
Signed-off-by: svccamerajenkins <svccamerajenkins@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1769913
GVS: Gerrit_Virtual_Submit
Tested-by: Mika Liljeberg <mliljeberg@nvidia.com>
Reviewed-by: Mika Liljeberg <mliljeberg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 111 insertions, 34 deletions

diff --git a/include/soc/tegra/camrtc-capture.h b/include/soc/tegra/camrtc-capture.h
index 44a237303..117da55e1 100644
--- a/include/soc/tegra/camrtc-capture.h
+++ b/include/soc/tegra/camrtc-capture.h
@@ -150,6 +150,13 @@ typedef struct syncpoint_info {
  * <dt>ISPB:    <dd>Channel outputs to ISPB
  * <dt>ISP_DIRECT: <dd>Channel outputs directly to selected ISP (ISO mode)
  * <dt>ISPSW:   <dd>Channel outputs to software ISP (reserved)
+ * <dt>ENABLE_ERROR_ACTIONS_MASKS:  <dd>Channel handles errors according to
+ *     error_mask_correctable and error_mask_uncorrectable.
+ *     This flag take precedence over RESET_ON_ERROR.
+ * <dt>RESET_ON_ERROR:  <dd>Channel treats all errors as uncorrectable
+ *      and requires reset for recovery. This flag is ignored if
+ *      ENABLE_ERROR_ACTIONS_MASKS is set.
+ *
  * </dl>
  *
  * @param vi_channel_mask  A bit mask indicating which VI channels to
@@ -174,6 +181,7 @@ struct capture_channel_config {
 #define CAPTURE_CHANNEL_FLAG_RESET_ON_ERROR     U32_C(0x0800)
 #define CAPTURE_CHANNEL_FLAG_LINETIMER          U32_C(0x1000)
 #define CAPTURE_CHANNEL_FLAG_SLVSEC             U32_C(0x2000)
+#define CAPTURE_CHANNEL_FLAG_ENABLE_ERROR_ACTIONS_MASKS U32_C(0x4000)
 
         uint32_t channel_id;    /* rtcpu internal - set to zero */
         uint64_t vi_channel_mask;
@@ -198,6 +206,35 @@ struct capture_channel_config {
         struct syncpoint_info progress_sp;
         struct syncpoint_info embdata_sp;
         struct syncpoint_info linetimer_sp;
+
+        /**
+         * Errors defined in error_mask_uncorrectable are reported and stop channel.
+         * User reset is required for channel recovery.
+         */
+        uint32_t error_mask_uncorrectable;
+        /**
+         * Errors defined in error_mask_correctable are reported, but
+         * don't stop the channel.
+         */
+        uint32_t error_mask_correctable;
+#define CAPTURE_CHANNEL_ERROR_ERROR_EMBED_INCOMPLETE    (U32_C(1) << 21)
+#define CAPTURE_CHANNEL_ERROR_INCOMPLETE                (U32_C(1) << 20)
+#define CAPTURE_CHANNEL_ERROR_STALE_FRAME               (U32_C(1) << 19)
+#define CAPTURE_CHANNEL_ERROR_COLLISION                 (U32_C(1) << 18)
+#define CAPTURE_CHANNEL_ERROR_FORCE_FE                  (U32_C(1) << 17)
+#define CAPTURE_CHANNEL_ERROR_LOAD_FRAMED               (U32_C(1) << 16)
+#define CAPTURE_CHANNEL_ERROR_DTYPE_MISMATCH            (U32_C(1) << 15)
+#define CAPTURE_CHANNEL_ERROR_EMBED_INFRINGE            (U32_C(1) << 14)
+#define CAPTURE_CHANNEL_ERROR_EMBED_LONG_LINE           (U32_C(1) << 13)
+#define CAPTURE_CHANNEL_ERROR_EMBED_SPURIOUS            (U32_C(1) << 12)
+#define CAPTURE_CHANNEL_ERROR_EMBED_RUNAWAY             (U32_C(1) << 11)
+#define CAPTURE_CHANNEL_ERROR_EMBED_MISSING_LE          (U32_C(1) << 10)
+#define CAPTURE_CHANNEL_ERROR_PIXEL_SHORT_LINE          (U32_C(1) << 9)
+#define CAPTURE_CHANNEL_ERROR_PIXEL_LONG_LINE           (U32_C(1) << 8)
+#define CAPTURE_CHANNEL_ERROR_PIXEL_SPURIOUS            (U32_C(1) << 7)
+#define CAPTURE_CHANNEL_ERROR_PIXEL_RUNAWAY             (U32_C(1) << 6)
+#define CAPTURE_CHANNEL_ERROR_PIXEL_MISSING_LE          (U32_C(1) << 5)
+
 } __CAPTURE_IVC_ALIGN;
 
 struct vi_channel_config {
@@ -340,11 +377,14 @@ struct capture_status {
 #define CAPTURE_STATUS_NOTIFIER_BACKEND_DOWN    U32_C(13)
 #define CAPTURE_STATUS_FALCON_ERROR             U32_C(14)
 #define CAPTURE_STATUS_CHANSEL_NOMATCH          U32_C(15)
+#define CAPTURE_STATUS_ABORTED                  U32_C(16)
 
         uint64_t sof_timestamp;
         uint64_t eof_timestamp;
         uint32_t err_data;
-        uint32_t __pad;
+
+#define CAPTURE_STATUS_FLAG_CHANNEL_IN_ERROR U32_C(1)
+        uint32_t flags;
 } __CAPTURE_IVC_ALIGN;
 
 #define VI_AFM_NUM_ROI                  8
@@ -853,6 +893,19 @@ struct nvcsi_tpg_rate_config {
  *
  * @param channel_flags channel specific flags
  *
+ * @param error_mask_correctable: Bitmask of the errors that are treated as correctable.
+ *                                In case of correctable errors syncpoints of active capture are
+ *                                advanced (in falcon) and error is reported and capture
+ *                                continues.
+ *
+ * @param error_mask_uncorrectable: Bitmask of the errors that are treated as uncorrectable.
+ *                                In case of uncorrectable errors, syncpoints of active capture are
+ *                                advanced (in falcon) and isp channel is ABORTed by ISP
+ *                                tasklist driver which halts the captures on the channel with
+ *                                immediate effect, and then error is reported. Client needs
+ *                                to RESET the channel explicitly in reaction to the
+ *                                uncorrectable errors reported.
+ *
  */
 struct capture_channel_isp_config {
         uint8_t channel_id;
@@ -873,6 +926,17 @@ struct capture_channel_isp_config {
         struct syncpoint_info progress_sp;
         struct syncpoint_info stats_progress_sp;
 
+        /** Error action attributes */
+        uint32_t error_mask_correctable;
+        uint32_t error_mask_uncorrectable;
+
+#define CAPTURE_ISP_CHANNEL_ERROR_DMA_PBUF_ERR          (U32_C(1) << 0)
+#define CAPTURE_ISP_CHANNEL_ERROR_DMA_SBUF_ERR          (U32_C(1) << 1)
+#define CAPTURE_ISP_CHANNEL_ERROR_DMA_SEQ_ERR           (U32_C(1) << 2)
+#define CAPTURE_ISP_CHANNEL_ERROR_FRAMEID_ERR           (U32_C(1) << 3)
+#define CAPTURE_ISP_CHANNEL_ERROR_TIMEOUT               (U32_C(1) << 4)
+#define CAPTURE_ISP_CHANNEL_ERROR_ALL                   U32_C(0x001F)
+
 #define HAVE_ISP_GOS_TABLES
         /*
          * GoS tables can only be programmed when there are no
@@ -889,13 +953,13 @@ struct capture_isp_status {
         uint8_t chan_id;
         uint8_t __pad;
         uint16_t frame_id;
-        uint32_t status;
+        uint32_t status;        /** SUCCESS OR ERROR */
+        uint32_t error_mask;    /** ZERO in case of SUCCESS. Error bitmask in case of ERROR */
+        uint32_t __pad2;
 
 #define CAPTURE_ISP_STATUS_UNKNOWN              U32_C(0)
 #define CAPTURE_ISP_STATUS_SUCCESS              U32_C(1)
-// TODO : Further breakdown errors to sub-types, as per http://nvbugs/200336192/11
 #define CAPTURE_ISP_STATUS_ERROR                U32_C(2)
-/** Add error codes and data if any */
 } __CAPTURE_IVC_ALIGN;
 
 
@@ -903,14 +967,14 @@ struct capture_isp_program_status {
         uint8_t chan_id;
         uint8_t settings_id;
         uint16_t __pad_id;
-        uint32_t status;
+        uint32_t status;        /** SUCCESS OR ERROR */
+        uint32_t error_mask;    /** ZERO in case of SUCCESS/STALE. Error bitmask in case of ERROR */
+        uint32_t __pad2;
 
 #define CAPTURE_ISP_PROGRAM_STATUS_UNKNOWN      U32_C(0)
 #define CAPTURE_ISP_PROGRAM_STATUS_SUCCESS      U32_C(1)
-// TODO : Further breakdown errors to sub-types, as per http://nvbugs/200336192/11
 #define CAPTURE_ISP_PROGRAM_STATUS_ERROR        U32_C(2)
 #define CAPTURE_ISP_PROGRAM_STATUS_STALE        U32_C(3)
-/** Add error codes and data if any */
 } __CAPTURE_IVC_ALIGN;
 
 /**
@@ -964,7 +1028,7 @@ struct isp_program_descriptor {
 #define CAPTURE_ACTIVATE_FLAG_COUPLED           U32_C(0x4) /* 1 << 2 */
 
         /** Pad to aligned size */
-        uint32_t __pad[7];
+        uint32_t __pad[5];
 } __CAPTURE_DESCRIPTOR_ALIGN;
 
 /**
@@ -1091,7 +1155,7 @@ struct isp_capture_descriptor {
 #define CAPTURE_ISP_FLAG_ERROR_REPORT_ENABLE    (U32_C(1) << 1)
 
         /** 1 MR port, max 3 input surfaces */
-#define ISP_MAX_INPUT_SURFACES 3
+#define ISP_MAX_INPUT_SURFACES (3U)
 
         /** input surfaces */
         struct image_surface input_mr_surfaces[ISP_MAX_INPUT_SURFACES];
@@ -1099,8 +1163,8 @@ struct isp_capture_descriptor {
         /**
          * 3 MW ports, max 2 surfaces (multiplanar) per port.
          */
-#define ISP_MAX_OUTPUTS 3U
-#define ISP_MAX_OUTPUT_SURFACES 2U
+#define ISP_MAX_OUTPUTS (3U)
+#define ISP_MAX_OUTPUT_SURFACES (2U)
 
         /** output surfaces */
         struct {
@@ -1184,7 +1248,7 @@ struct isp_capture_descriptor {
         };
 
         /* TBD: Decide exact max count */
-#define ISP_MAX_PREFENCES ISP_MAX_OUTPUTS + ISP_MAX_INPUT_SURFACES
+#define ISP_MAX_PREFENCES (ISP_MAX_OUTPUTS + ISP_MAX_INPUT_SURFACES)
 
         uint32_t num_prefences;
         uint32_t __pad_prefences;
@@ -1198,7 +1262,7 @@ struct isp_capture_descriptor {
         struct capture_isp_status status;
 
         /** Pad to aligned size */
-        uint32_t __pad[6];
+        uint32_t __pad[4];
 } __CAPTURE_DESCRIPTOR_ALIGN;
 
 /**
@@ -1347,18 +1411,9 @@ struct isp5_program
         * This is needed by ISP Falcon firmware to program
         * tile starting state correctly.
         */
-        union {
-                uint32_t ds0_pixel_incr_h;
-                struct isp5_downscaler_configbuf ds0 CAMRTC_DEPRECATED;
-        };
-        union {
-                uint32_t ds1_pixel_incr_h;
-                struct isp5_downscaler_configbuf ds1 CAMRTC_DEPRECATED;
-        };
-        union {
-                uint32_t ds2_pixel_incr_h;
-                struct isp5_downscaler_configbuf ds2 CAMRTC_DEPRECATED;
-        };
+        uint32_t ds0_pixel_incr_h;
+        uint32_t ds1_pixel_incr_h;
+        uint32_t ds2_pixel_incr_h;
 
         /**
          *  Overfetch needed by this ISP program.
@@ -1401,7 +1456,7 @@ struct isp5_program
                 uint8_t alignment;
                 uint8_t __pad1[2];
         } overfetch;
-        uint32_t _pad1[10];
+        uint32_t _pad1[3];
 
         /**
          * Push buffer containing ISP settings related to this program.
diff --git a/include/soc/tegra/camrtc-channels.h b/include/soc/tegra/camrtc-channels.h
index 034be8866..6bb368bf3 100644
--- a/include/soc/tegra/camrtc-channels.h
+++ b/include/soc/tegra/camrtc-channels.h
@@ -23,11 +23,10 @@
         ((uint64_t)(s4) << 32U) | ((uint64_t)(s5) << 40U) | \
         ((uint64_t)(s6) << 48U) | ((uint64_t)(s7) << 56U))
 
-#define CAMRTC_TAG_IVC_SETUP CAMRTC_TAG64('I','V','C', '-', 'S','E','T','U')
-
-#define CAMRTC_TAG_NV_TRACE CAMRTC_TAG64('N','V',' ','T','R','A','C','E')
-
-#define CAMRTC_TAG_NV_COVERAGE CAMRTC_TAG64('N','V',' ','C','O','V','E','R')
+#define CAMRTC_TAG_IVC_SETUP    CAMRTC_TAG64('I', 'V', 'C', '-', 'S', 'E', 'T', 'U')
+#define CAMRTC_TAG_NV_TRACE     CAMRTC_TAG64('N', 'V', ' ', 'T', 'R', 'A', 'C', 'E')
+#define CAMRTC_TAG_NV_CAM_TRACE CAMRTC_TAG64('N', 'V', ' ', 'C', 'A', 'M', 'T', 'R')
+#define CAMRTC_TAG_NV_COVERAGE  CAMRTC_TAG64('N', 'V', ' ', 'C', 'O', 'V', 'E', 'R')
 
 struct camrtc_tlv {
         uint64_t tag;
diff --git a/include/soc/tegra/camrtc-dbg-messages.h b/include/soc/tegra/camrtc-dbg-messages.h
index 26c362be3..ded80128a 100644
--- a/include/soc/tegra/camrtc-dbg-messages.h
+++ b/include/soc/tegra/camrtc-dbg-messages.h
@@ -239,12 +239,24 @@ struct camrtc_dbg_run_mem_test_data {
         char data[CAMRTC_DBG_MAX_MEM_TEST_DATA];
 } __packed;
 
+/* This structure is used get information on system tasks.
+ * Fields:
+ *   n_task: number of reported tasks
+ *   total_count: total runtime
+ *   task: array of reported tasks
+ *     id: task name
+ *     count: runtime allocated to task
+ *     number: unique task number
+ *     priority: priority of task when this structure was populated
+ */
 struct camrtc_dbg_task_stat {
         uint32_t n_task;
         uint32_t total_count;
         struct {
                 uint32_t id[2];
                 uint32_t count;
+                uint32_t number;
+                uint32_t priority;
         } task[CAMRTC_DBG_TASK_STAT_MAX];
 } __packed;
 
diff --git a/include/soc/tegra/camrtc-trace.h b/include/soc/tegra/camrtc-trace.h
index 115c46a52..6994ea353 100644
--- a/include/soc/tegra/camrtc-trace.h
+++ b/include/soc/tegra/camrtc-trace.h
@@ -12,6 +12,7 @@
 #define INCLUDE_CAMRTC_TRACE_H
 
 #include "camrtc-common.h"
+#include "camrtc-channels.h"
 
 #pragma GCC diagnostic error "-Wpadded"
 
@@ -68,9 +69,18 @@
 #define CAMRTC_TRACE_SIGNATURE_1        U32_C(0x5420564e)
 #define CAMRTC_TRACE_SIGNATURE_2        U32_C(0x45434152)
 
+#define CAMRTC_TRACE_ALIGN              __aligned(U32_C(64))
+
 struct camrtc_trace_memory_header {
         /* layout: offset 0 */
-        uint32_t signature[2];
+        union {
+                /*
+                 * Temporary union to provide source compatiblity
+                 * during the transition to new header format.
+                 */
+                struct camrtc_tlv tlv;
+                uint32_t signature[4] __attribute__((deprecated));
+        };
         uint32_t revision;
         uint32_t reserved1;
         uint32_t exception_offset;
@@ -81,13 +91,14 @@ struct camrtc_trace_memory_header {
         uint32_t event_size;
         uint32_t event_entries;
         uint32_t reserved3;
-        uint32_t reserved4[0xd0 / 4];
+        uint32_t reserved4[0xc8 / 4];
 
         /* pointer: offset 0x100 */
         uint32_t exception_next_idx;
         uint32_t event_next_idx;
         uint32_t reserved_ptrs[0x38 / 4];
-};
+} CAMRTC_TRACE_ALIGN;
+
 
 /*
  * Exception entry