drivers: pva: Update HW SEQ config and ADB size

- Update HW SEQ configuration for next generation of PVA.
- Add additional HW SEQ validation checks required for next
  generation of PVA.
- Update ADB size for T264

Jira PVAAS-12709

Change-Id: I8dd362f2f517bc20899d51a4bb95b8077f4c636b
Signed-off-by: abhinayaa <abhinayaa@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2891026
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2999160
Reviewed-by: Amruta Sai Anusha Bhamidipati <abhamidipati@nvidia.com>
Reviewed-by: Omar Nemri <onemri@nvidia.com>
Tested-by: Omar Nemri <onemri@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>

drivers/video/tegra/host/pva/fw_include/fw_config.h

@@ -113,4 +113,13 @@
 #define PVA_NUM_DYNAMIC_ADB_BUFFS_T23X (PVA_NUM_DMA_ADB_BUFFS_T23X - \
 					PVA_NUM_RESERVED_ADB_BUFFERS_T23X)
 /** @} */
+
+#ifdef CONFIG_TEGRA_T26X_GRHOST_PVA
+#include <fw_config_t264.h>
+#else
+#define PVA_NUM_DMA_ADB_BUFFS_T26X		PVA_NUM_DMA_ADB_BUFFS_T23X
+#define PVA_NUM_RESERVED_ADB_BUFFERS_T26X	PVA_NUM_RESERVED_ADB_BUFFERS_T23X
+#define PVA_NUM_DYNAMIC_ADB_BUFFS_T26X		PVA_NUM_DYNAMIC_ADB_BUFFS_T23X
+#endif
+
 #endif

drivers/video/tegra/host/pva/pva_dma.c

@@ -16,6 +16,13 @@
 #include "fw_config.h"
 #include "pva_hwseq.h"
 
+#ifdef CONFIG_TEGRA_T26X_GRHOST_PVA
+#include <pva_hwseq_t264.h>
+#else
+#define PVA_HWSEQ_RAM_SIZE_T26X		PVA_HWSEQ_RAM_SIZE_T23X
+#define PVA_HWSEQ_RAM_ID_MASK_T26X	PVA_HWSEQ_RAM_ID_MASK_T23X
+#endif
+
 #define BL_GOB_WIDTH_LOG2       6U
 #define BL_GOB_WIDTH_LOG2_ALIGNMASK     (0xFFFFFFFFU >> (32U - BL_GOB_WIDTH_LOG2))
 #define BL_GOB_HEIGHT_LOG2      3U
@@ -1792,6 +1799,14 @@ verify_hwseq_blob(struct pva_submit_task *task,
 	uintptr_t tmp_addr;
 	u32 num_desc_entries;
 	u32 num_descriptors;
+#ifdef CONFIG_TEGRA_T26X_GRHOST_PVA
+	bool validation_done = false;
+
+	if (task->pva->version >= PVA_HW_GEN3) {
+		end = nvpva_get_hwseq_end_idx_t26x(user_ch) * 4U;
+		start = nvpva_get_hwseq_start_idx_t26x(user_ch) * 4U;
+	}
+#endif
 
 	nvpva_dbg_fn(task->pva, "");
 
@@ -1820,16 +1835,25 @@ verify_hwseq_blob(struct pva_submit_task *task,
 		goto out;
 	}
 
-	if ((!is_desc_mode(blob->f_header.fid))
+	if ((is_desc_mode(blob->f_header.fid))
-	  && !is_frame_mode(blob->f_header.fid)) {
+	  && task->hwseq_config.hwseqTrigMode == NVPVA_HWSEQTM_DMATRIG) {
-		pr_err("invalid addressing mode");
+		pr_err("dma master not allowed");
 		err = -EINVAL;
 		goto out;
 	}
 
-	if ((is_desc_mode(blob->f_header.fid))
+#ifdef CONFIG_TEGRA_T26X_GRHOST_PVA
-	  && task->hwseq_config.hwseqTrigMode == NVPVA_HWSEQTM_DMATRIG) {
+	if (!hwseq_blob_validate_t26x(blob, task, user_ch, &validation_done)) {
-		pr_err("dma master not allowed");
+		pr_err("Invalid HW SEQ blob for T26x");
+		err = -EINVAL;
+	}
+
+	if (validation_done)
+		goto out;
+#endif
+	if ((!is_desc_mode(blob->f_header.fid))
+	  && !is_frame_mode(blob->f_header.fid)) {
+		pr_err("invalid addressing mode");
 		err = -EINVAL;
 		goto out;
 	}
@@ -2007,8 +2031,10 @@ nvpva_task_dma_channel_mapping(struct pva_submit_task *task,
 
 	if (hwgen == PVA_HW_GEN1)
 		adb_limit = PVA_NUM_DYNAMIC_ADB_BUFFS_T19X;
-	else
+	else if (hwgen == PVA_HW_GEN2)
 		adb_limit = PVA_NUM_DYNAMIC_ADB_BUFFS_T23X;
+	else
+		adb_limit = PVA_NUM_DYNAMIC_ADB_BUFFS_T26X;
 
 	if ((user_ch->adbSize + user_ch->adbOffset) > adb_limit) {
 		pr_err("ERR: Invalid ADB Buff size or offset");
@@ -2064,10 +2090,10 @@ nvpva_task_dma_channel_mapping(struct pva_submit_task *task,
 	ch->cntl1 |= ((user_ch->chRepFactor & 0x7U) << 8U);
 
 	/* DMA_CHANNEL_HWSEQCNTL_CHHWSEQSTART */
-	ch->hwseqcntl = ((user_ch->hwseqStart & 0xFFU) << 0U);
+	ch->hwseqcntl = ((user_ch->hwseqStart & 0xFF) << 0U);
 
 	/* DMA_CHANNEL_HWSEQCNTL_CHHWSEQEND */
-	ch->hwseqcntl |= ((user_ch->hwseqEnd & 0xFFU) << 12U);
+	ch->hwseqcntl |= ((user_ch->hwseqEnd & 0xFF) << 12U);
 
 	/* DMA_CHANNEL_HWSEQCNTL_CHHWSEQTD */
 	ch->hwseqcntl |= ((user_ch->hwseqTriggerDone & 0x3U) << 24U);
@@ -2081,6 +2107,11 @@ nvpva_task_dma_channel_mapping(struct pva_submit_task *task,
 	/* DMA_CHANNEL_HWSEQCNTL_CHHWSEQEN */
 	ch->hwseqcntl |= ((user_ch->hwseqEnable & 0x1U) << 31U);
 
+#ifdef CONFIG_TEGRA_T26X_GRHOST_PVA
+	if (hwgen >= PVA_HW_GEN3)
+		nvpva_task_dma_channel_mapping_t26x(ch, user_ch);
+#endif
+
 	if ((user_ch->hwseqEnable & 0x1U) && hwseq_in_use)
 		err = verify_hwseq_blob(task,
 					user_ch,
@@ -2112,6 +2143,9 @@ int pva_task_write_dma_info(struct pva_submit_task *task,
 	u8 did;
 	u8 prev_did;
 	u8 bl_xfers_in_use = 0;
+	u32 hwseq_ram_size = (hwgen == PVA_HW_GEN2)
+				? PVA_HWSEQ_RAM_SIZE_T23X
+				: PVA_HWSEQ_RAM_SIZE_T26X;
 
 	nvpva_dbg_fn(task->pva, "");
 
@@ -2138,8 +2172,9 @@ int pva_task_write_dma_info(struct pva_submit_task *task,
 		 * acceptable range, i.e. up to 1KB, as per HW Sequencer RAM
 		 * size from T23x DMA IAS doc.
 		 */
+
 		if ((task->hwseq_config.hwseqBuf.size == 0U) ||
-		    (task->hwseq_config.hwseqBuf.size > 1024U)) {
+		    (task->hwseq_config.hwseqBuf.size > hwseq_ram_size)) {
 			err = -EINVAL;
 			goto out;
 		}

drivers/video/tegra/host/pva/pva_hwseq.h

@@ -10,6 +10,9 @@
 #include <linux/mutex.h>
 #include <linux/semaphore.h>
 
+#define PVA_HWSEQ_RAM_SIZE_T23X	1024U
+#define PVA_HWSEQ_RAM_ID_MASK_T23X 0xFFU
+
 #define PVA_HWSEQ_FRAME_ADDR	0xC0DE
 #define PVA_HWSEQ_DESC_ADDR	0xDEAD
 #define PVA_HWSEQ_COL_ROW_LIMIT 1

include/uapi/linux/nvpva_ioctl.h

@@ -11,6 +11,10 @@
 #include <linux/ioctl.h>
 #include <linux/types.h>
 
+#ifdef NVPVA_CONFIG_T264
+#include <nvpva_ioctl_t264.h>
+#endif
+
 #define NVPVA_DEVICE_NODE "/dev/nvhost-ctrl-pva"
 /**
  * Maximum length of the name of a symbol in a VPU ELF
@@ -391,6 +395,7 @@ struct nvpva_dma_descriptor {
  *
  * An update in user structure would need corresponding change here
  */
+#ifndef NVPVA_CONFIG_T264
 struct nvpva_dma_channel {
 	uint8_t descIndex;
 	uint8_t blockHeight;
@@ -410,6 +415,9 @@ struct nvpva_dma_channel {
 	uint8_t hwseqTxSelect;
 	uint8_t hwseqTriggerDone;
 };
+#else
+#define nvpva_dma_channel nvpva_dma_channel_ex
+#endif
 
 /**
  *