DIRTY: camera-kernel: Import everything from Samsung

Change-Id: I3cc0f1ec75c5534ee0bfa9672211412c9cf10ce4

qcom/opensource/camera-kernel/Kbuild

@@ -6,8 +6,12 @@ $(info "KERNEL_ROOT is: $(KERNEL_ROOT)")
 endif
 
 # Include Architecture configurations
-ifeq ($(CONFIG_ARCH_CLIFFS), y)
-include $(CAMERA_KERNEL_ROOT)/config/cliffs.mk
+ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+include $(CAMERA_KERNEL_ROOT)/config/pineapple.mk
+endif
+
+ifeq ($(CONFIG_ARCH_KALAMA), y)
+include $(CAMERA_KERNEL_ROOT)/config/kalama.mk
 endif
 
 ifeq ($(CONFIG_ARCH_WAIPIO), y)
@@ -50,24 +54,6 @@ ifeq ($(CONFIG_ARCH_PARROT), y)
 include $(CAMERA_KERNEL_ROOT)/config/parrot.mk
 endif
 
-# For some targets which have binary compatible gki kernel with another one,
-# we cannot rely on CONFIG_ARCH_* symbol which is defined in Kernel defconfig
-ifeq ($(BOARD_PLATFORM), kalama)
-include $(CAMERA_KERNEL_ROOT)/config/kalama.mk
-endif
-
-ifeq ($(BOARD_PLATFORM), crow)
-include $(CAMERA_KERNEL_ROOT)/config/crow.mk
-endif
-
-ifeq ($(BOARD_PLATFORM), pineapple)
-include $(CAMERA_KERNEL_ROOT)/config/pineapple.mk
-endif
-
-ifeq ($(BOARD_PLATFORM), volcano)
-include $(CAMERA_KERNEL_ROOT)/config/volcano.mk
-endif
-
 ifneq ($(KBUILD_EXTRA_CONFIGS),)
 include $(KBUILD_EXTRA_CONFIGS)
 endif

qcom/opensource/camera-kernel/Kconfig

@@ -6,13 +6,6 @@ config SPECTRA_ISP
 	  This will enable camera ISP driver to handle IFE driver.
 	  Core camera driver to handle VFE HW.
 
-config SPECTRA_TFE
-	bool "enable camera tfe modele"
-        help
-	  This is enabling camera tfe module.
-	  tfe module files will be included to enable tfe based driver,
-	  files.
-
 config SPECTRA_ICP
 	bool "enable camera ICP module"
 	help
@@ -28,13 +21,7 @@ config SPECTRA_JPEG
 	  camera jpeg module will be functional.
 	  This module interact with jpeg HW for
 	  snapshot processing.
-config SPECTRA_CRE
-	bool "enable camera jpeg module"
-	help
-	  This is enabling camera CRE module.
-	  camera cre module will be functional.
-	  This module interact with cre HW for
-	  format conversion.
+
 config SPECTRA_SENSOR
 	bool "enable camera sensor module"
 	help
@@ -99,22 +86,6 @@ config DOMAIN_ID_SECURE_CAMERA
 		domain ID based security architecture.
 		VC based security can be achieved with this.
 
-config CSF_2_5_SECURE_CAMERA
-	bool "enable CSF2.5 feature flow"
-	help
-		This is to enable Call flow for CSF2.5
-		enabled platforms. this config differentiates
-		between csf2.0 and csf 2.5 compliant
-		scm calls.
-
-config DYNAMIC_FD_PORT_CONFIG
-	bool "enable dynamic FD port config feature"
-	help
-		This config enables dynamic FD port config
-		feature that allows the userspace to configure
-		the FD port to secure or non-secure based on
-		the FD solution in use in secure camera use cases.
-
 config SAMSUNG_OIS_MCU_STM32
 	bool "enable camera mcu stm32 module"
 	help

qcom/opensource/camera-kernel/config/pineapple.mk

@@ -4,27 +4,21 @@
 CONFIG_SPECTRA_ISP := y
 CONFIG_SPECTRA_ICP := y
 CONFIG_SPECTRA_JPEG := y
-CONFIG_SPECTRA_CRE := y
 CONFIG_SPECTRA_SENSOR := y
 CONFIG_SPECTRA_LLCC_STALING := y
 CONFIG_SPECTRA_USE_RPMH_DRV_API := y
 CONFIG_SPECTRA_USE_CLK_CRM_API := y
 CONFIG_DOMAIN_ID_SECURE_CAMERA := y
-CONFIG_DYNAMIC_FD_PORT_CONFIG := y
-CONFIG_CSF_2_5_SECURE_CAMERA := y
 
 # Flags to pass into C preprocessor
 ccflags-y += -DCONFIG_SPECTRA_ISP=1
 ccflags-y += -DCONFIG_SPECTRA_ICP=1
 ccflags-y += -DCONFIG_SPECTRA_JPEG=1
-ccflags-y += -DCONFIG_SPECTRA_CRE=1
 ccflags-y += -DCONFIG_SPECTRA_SENSOR=1
 ccflags-y += -DCONFIG_SPECTRA_LLCC_STALING=1
 ccflags-y += -DCONFIG_SPECTRA_USE_RPMH_DRV_API=1
 ccflags-y += -DCONFIG_SPECTRA_USE_CLK_CRM_API=1
 ccflags-y += -DCONFIG_DOMAIN_ID_SECURE_CAMERA=1
-ccflags-y += -DCONFIG_DYNAMIC_FD_PORT_CONFIG=1
-ccflags-y += -DCONFIG_CSF_2_5_SECURE_CAMERA=1
 
 ifeq (y, $(filter y, \
 	$(CONFIG_SEC_PLATFORM_MU1Q) \

qcom/opensource/camera-kernel/drivers/cam_cdm/cam_cdm_hw_core.c

@@ -2349,7 +2349,7 @@ static int cam_hw_cdm_component_bind(struct device *dev,
 				sizeof(work_q_name));
 		snprintf(work_q_name + len, sizeof(work_q_name) - len, "%d_%d", cdm_hw->soc_info.index, i);
 		cdm_core->bl_fifo[i].work_queue = alloc_workqueue(work_q_name,
-				WQ_UNBOUND | WQ_MEM_RECLAIM | WQ_SYSFS,
+				WQ_UNBOUND | WQ_MEM_RECLAIM | WQ_SYSFS | WQ_HIGHPRI,
 				CAM_CDM_INFLIGHT_WORKS);
 		if (!cdm_core->bl_fifo[i].work_queue) {
 			CAM_ERR(CAM_CDM,

qcom/opensource/camera-kernel/drivers/cam_cdm/cam_cdm_util.c

@@ -18,6 +18,7 @@
 
 #define CAM_CDM_SW_CMD_COUNT    2
 #define CAM_CMD_LENGTH_MASK     0xFFFF
+#define CAM_CDM_COMMAND_OFFSET  24
 #define CAM_CDM_REG_OFFSET_MASK 0x00FFFFFF
 
 #define CAM_CDM_DMI_DATA_HI_OFFSET   8
@@ -492,7 +493,7 @@ int cam_cdm_get_ioremap_from_base(uint32_t hw_base,
 static int cam_cdm_util_cmd_buf_validation(void __iomem *base_addr,
 	uint32_t base_array_size,
 	struct cam_soc_reg_map *base_table[CAM_SOC_MAX_BLOCK],
-	uint32_t cmd_buf_size, uint32_t *cmd_buf, void *buf,
+	uint32_t cmd_buf_size, uint32_t *buf,
 	resource_size_t *size,
 	enum cam_cdm_command cmd_type)
 {
@@ -520,8 +521,6 @@ static int cam_cdm_util_cmd_buf_validation(void __iomem *base_addr,
 	switch (cmd_type) {
 	case CAM_CDM_CMD_REG_RANDOM: {
 		struct cdm_regrandom_cmd *reg_random = (struct cdm_regrandom_cmd *)buf;
-		uint32_t *data, offset;
-
 		if ((!reg_random->count) || (((reg_random->count * (sizeof(uint32_t) * 2)) +
 			cam_cdm_get_cmd_header_size(CAM_CDM_CMD_REG_RANDOM)) >
 				cmd_buf_size)) {
@@ -529,23 +528,10 @@ static int cam_cdm_util_cmd_buf_validation(void __iomem *base_addr,
 				reg_random->count, cmd_buf_size);
 			ret = -EINVAL;
 		}
-
-		data = cmd_buf + cam_cdm_get_cmd_header_size(CAM_CDM_CMD_REG_RANDOM);
-
-		for (i = 0; i < reg_random->count; i++) {
-			offset = data[0];
-			if (offset > *size) {
-				CAM_ERR(CAM_CDM, "Offset out of mapped range! size:%llu offset:%u",
-					*size, offset);
-				return -EINVAL;
-			}
-			data += 2;
-		}
 		}
 		break;
 	case CAM_CDM_CMD_REG_CONT: {
 		struct cdm_regcontinuous_cmd *reg_cont = (struct cdm_regcontinuous_cmd *) buf;
-
 		if ((!reg_cont->count) || (((reg_cont->count * sizeof(uint32_t)) +
 			cam_cdm_get_cmd_header_size(CAM_CDM_CMD_REG_CONT)) >
 			cmd_buf_size)) {
@@ -553,66 +539,17 @@ static int cam_cdm_util_cmd_buf_validation(void __iomem *base_addr,
 				cmd_buf_size, reg_cont->count);
 			ret = -EINVAL;
 		}
-
-		if ((reg_cont->offset > *size) && ((reg_cont->offset +
-			(reg_cont->count * sizeof(uint32_t))) > *size)) {
-			CAM_ERR(CAM_CDM, "Offset out of mapped range! size: %lu, offset: %u",
-				*size, reg_cont->offset);
-			return -EINVAL;
-		}
 		}
 		break;
+	case CAM_CDM_CMD_DMI:
+	case CAM_CDM_CMD_SWD_DMI_32:
 	case CAM_CDM_CMD_SWD_DMI_64: {
 		struct cdm_dmi_cmd *swd_dmi = (struct cdm_dmi_cmd *) buf;
-
 		if (cmd_buf_size < (cam_cdm_required_size_dmi() + swd_dmi->length + 1)) {
 			CAM_ERR(CAM_CDM, "invalid CDM_SWD_DMI length %d",
 				swd_dmi->length + 1);
 			ret = -EINVAL;
 		}
-
-		if ((swd_dmi->DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET > *size) ||
-			(swd_dmi->DMIAddr + CAM_CDM_DMI_DATA_HI_OFFSET > *size)) {
-			CAM_ERR(CAM_CDM,
-				"Offset out of mapped range! size:%llu lo_offset:%u hi_offset:%u",
-				*size, swd_dmi->DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET,
-				swd_dmi->DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET);
-			return -EINVAL;
-		}
-		}
-		break;
-	case CAM_CDM_CMD_SWD_DMI_32: {
-		struct cdm_dmi_cmd *swd_dmi = (struct cdm_dmi_cmd *) buf;
-
-		if (cmd_buf_size < (cam_cdm_required_size_dmi() + swd_dmi->length + 1)) {
-			CAM_ERR(CAM_CDM, "invalid CDM_SWD_DMI length %d",
-				swd_dmi->length + 1);
-			ret = -EINVAL;
-		}
-
-		if (swd_dmi->DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET > *size) {
-			CAM_ERR(CAM_CDM,
-				"Offset out of mapped range! size:%llu lo_offset:%u",
-				*size, swd_dmi->DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET);
-			return -EINVAL;
-		}
-		}
-		break;
-	case CAM_CDM_CMD_DMI: {
-		struct cdm_dmi_cmd *swd_dmi = (struct cdm_dmi_cmd *) buf;
-
-		if (cmd_buf_size < (cam_cdm_required_size_dmi() + swd_dmi->length + 1)) {
-			CAM_ERR(CAM_CDM, "invalid CDM_SWD_DMI length %d",
-				swd_dmi->length + 1);
-			ret = -EINVAL;
-		}
-
-		if (swd_dmi->DMIAddr + CAM_CDM_DMI_DATA_OFFSET > *size) {
-			CAM_ERR(CAM_CDM,
-				"Offset out of mapped range! size:%llu offset:%u",
-				*size, swd_dmi->DMIAddr + CAM_CDM_DMI_DATA_OFFSET);
-			return -EINVAL;
-		}
 		}
 		break;
 	default:
@@ -635,19 +572,27 @@ static int cam_cdm_util_reg_cont_write(void __iomem *base_addr,
 	struct cdm_regcontinuous_cmd reg_cont;
 	resource_size_t size = 0;
 
-	memcpy(&reg_cont, cmd_buf, sizeof(struct cdm_regcontinuous_cmd));
 	rc = cam_cdm_util_cmd_buf_validation(base_addr, base_array_size, base_table,
-		cmd_buf_size, cmd_buf, (void *)&reg_cont,
-		&size, CAM_CDM_CMD_REG_CONT);
+		cmd_buf_size, cmd_buf, &size, CAM_CDM_CMD_REG_CONT);
 	if (rc) {
 		CAM_ERR(CAM_CDM, "Validation failed! rc=%d", rc);
 		return rc;
 	}
 
+	memcpy(&reg_cont, cmd_buf, sizeof(struct cdm_regcontinuous_cmd));
+
 	data = cmd_buf + cam_cdm_get_cmd_header_size(CAM_CDM_CMD_REG_CONT);
 
-	cam_io_memcpy(base_addr + reg_cont.offset, data,
-		reg_cont.count * sizeof(uint32_t));
+	if ((reg_cont.offset <= size) && ((reg_cont.offset +
+		(reg_cont.count * sizeof(uint32_t))) <= size)) {
+		cam_io_memcpy(base_addr + reg_cont.offset, data,
+			reg_cont.count * sizeof(uint32_t));
+	} else {
+		CAM_ERR(CAM_CDM, "Offset out of mapped range! size: %lu, offset: %u",
+			size, reg_cont.offset);
+		return -EINVAL;
+	}
+
 	*used_bytes = (reg_cont.count * sizeof(uint32_t)) +
 		(4 * cam_cdm_get_cmd_header_size(CAM_CDM_CMD_REG_CONT));
 
@@ -664,25 +609,30 @@ static int cam_cdm_util_reg_random_write(void __iomem *base_addr,
 	uint32_t *data, offset;
 	resource_size_t size = 0;
 
-	memcpy(&reg_random, cmd_buf, sizeof(struct cdm_regrandom_cmd));
-
 	rc = cam_cdm_util_cmd_buf_validation(base_addr, base_array_size, base_table,
-		cmd_buf_size, cmd_buf, (void *)&reg_random,
+		cmd_buf_size, cmd_buf,
 		&size, CAM_CDM_CMD_REG_RANDOM);
 	if (rc) {
 		CAM_ERR(CAM_CDM, "Validation failed! rc=%d", rc);
 		return rc;
 	}
 
+	memcpy(&reg_random, cmd_buf, sizeof(struct cdm_regrandom_cmd));
 	data = cmd_buf + cam_cdm_get_cmd_header_size(CAM_CDM_CMD_REG_RANDOM);
 
 	for (i = 0; i < reg_random.count; i++) {
 		offset = data[0];
-		CAM_DBG(CAM_CDM, "reg random: offset %pK, value 0x%x",
-			((void __iomem *)(base_addr + offset)),
-			data[1]);
-		cam_io_w(data[1], base_addr + offset);
-		data += 2;
+		if (offset <= size) {
+			CAM_DBG(CAM_CDM, "reg random: offset %pK, value 0x%x",
+				((void __iomem *)(base_addr + offset)),
+				data[1]);
+			cam_io_w(data[1], base_addr + offset);
+			data += 2;
+		} else {
+			CAM_ERR(CAM_CDM, "Offset out of mapped range! size: %llu, offset: %u",
+				size, offset);
+			return -EINVAL;
+		}
 	}
 
 	*used_bytes = ((reg_random.count * (sizeof(uint32_t) * 2)) +
@@ -701,32 +651,52 @@ static int cam_cdm_util_swd_dmi_write(uint32_t cdm_cmd_type,
 	uint32_t *data;
 	resource_size_t size = 0;
 
-	memcpy(&swd_dmi, cmd_buf, sizeof(struct cdm_dmi_cmd));
 	rc = cam_cdm_util_cmd_buf_validation(base_addr, base_array_size, base_table,
-		cmd_buf_size, cmd_buf, (void *)&swd_dmi,
+		cmd_buf_size, cmd_buf,
 		&size, cdm_cmd_type);
 	if (rc) {
 		CAM_ERR(CAM_CDM, "Validation failed! rc=%d", rc);
 		return rc;
 	}
 
+	memcpy(&swd_dmi, cmd_buf, sizeof(struct cdm_dmi_cmd));
 	data = cmd_buf + cam_cdm_required_size_dmi();
 
 	if (cdm_cmd_type == CAM_CDM_CMD_SWD_DMI_64) {
+		if ((swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET > size) ||
+			(swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_HI_OFFSET > size)) {
+			CAM_ERR(CAM_CDM,
+				"Offset out of mapped range! size:%llu lo_offset:%u hi_offset:%u",
+				size, swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET,
+				swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET);
+			return -EINVAL;
+		}
 		for (i = 0; i < (swd_dmi.length + 1)/8; i++) {
 			cam_io_w_mb(data[0], base_addr +
 				swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET);
 			cam_io_w_mb(data[1], base_addr +
-				swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_HI_OFFSET);
+					swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_HI_OFFSET);
 			data += 2;
 		}
 	} else if (cdm_cmd_type == CAM_CDM_CMD_DMI) {
+		if (swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_OFFSET > size) {
+			CAM_ERR(CAM_CDM,
+				"Offset out of mapped range! size:%llu offset:%u",
+				size, swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_OFFSET);
+			return -EINVAL;
+		}
 		for (i = 0; i < (swd_dmi.length + 1)/4; i++) {
 			cam_io_w_mb(data[0], base_addr +
 				swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_OFFSET);
 			data += 1;
 		}
 	} else {
+		if (swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET > size) {
+			CAM_ERR(CAM_CDM,
+				"Offset out of mapped range! size:%llu lo_offset:%u",
+				size, swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET);
+			return -EINVAL;
+		}
 		for (i = 0; i < (swd_dmi.length + 1)/4; i++) {
 			cam_io_w_mb(data[0], base_addr +
 				swd_dmi.DMIAddr + CAM_CDM_DMI_DATA_LO_OFFSET);
@@ -1011,88 +981,6 @@ static long cam_cdm_util_dump_perf_ctrl_cmd(uint32_t *cmd_buf_addr)
 	return ret;
 }
 
-bool cam_cdm_util_validate_cmd_buf(
-	uint32_t *cmd_buf_start, uint32_t *cmd_buf_end)
-{
-	uint32_t *buf_now = cmd_buf_start;
-	uint32_t *buf_end = cmd_buf_end;
-	uint32_t cmd = 0;
-	int i = 0;
-	struct cdm_regcontinuous_cmd *p_regcont_cmd = NULL;
-	struct cdm_regrandom_cmd *p_regrand_cmd = NULL;
-
-	if (!cmd_buf_start || !cmd_buf_end) {
-		CAM_ERR(CAM_CDM, "Invalid args");
-		return true;
-	}
-
-	do {
-		cmd = *buf_now;
-		cmd = cmd >> CAM_CDM_COMMAND_OFFSET;
-
-		switch (cmd) {
-		case CAM_CDM_CMD_DMI:
-		case CAM_CDM_CMD_DMI_32:
-		case CAM_CDM_CMD_DMI_64:
-			if (buf_now > buf_end)
-				return true;
-
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_DMI];
-			break;
-		case CAM_CDM_CMD_REG_CONT:
-			p_regcont_cmd = (struct cdm_regcontinuous_cmd *)buf_now;
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_REG_CONT];
-			for (i = 0; i < p_regcont_cmd->count; i++) {
-				if (buf_now > buf_end)
-					return true;
-
-				buf_now++;
-			}
-			break;
-		case CAM_CDM_CMD_REG_RANDOM:
-			p_regrand_cmd = (struct cdm_regrandom_cmd *)buf_now;
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_REG_RANDOM];
-			for (i = 0; i < p_regrand_cmd->count; i++) {
-				if (buf_now > buf_end)
-					return true;
-
-				buf_now += 2;
-			}
-			break;
-		case CAM_CDM_CMD_BUFF_INDIRECT:
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_BUFF_INDIRECT];
-			if (buf_now > buf_end)
-				return true;
-
-			break;
-		case CAM_CDM_CMD_GEN_IRQ:
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_GEN_IRQ];
-			break;
-		case CAM_CDM_CMD_WAIT_EVENT:
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_WAIT_EVENT];
-			break;
-		case CAM_CDM_CMD_CHANGE_BASE:
-			if (buf_now > buf_end)
-				return true;
-
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_CHANGE_BASE];
-			break;
-		case CAM_CDM_CMD_PERF_CTRL:
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_PERF_CTRL];
-			break;
-		case CAM_CDM_CMD_COMP_WAIT:
-			buf_now += CDMCmdHeaderSizes[CAM_CDM_CMD_COMP_WAIT];
-			break;
-		default:
-			CAM_ERR(CAM_CDM, "Invalid CMD: 0x%x buf 0x%x",
-				cmd, *buf_now);
-			return true;
-		}
-	} while (buf_now < cmd_buf_end);
-
-	return false;
-}
-
 void cam_cdm_util_dump_cmd_buf(
 	uint32_t *cmd_buf_start, uint32_t *cmd_buf_end)
 {
@@ -1151,7 +1039,7 @@ void cam_cdm_util_dump_cmd_buf(
 			buf_now++;
 			break;
 		}
-	} while (buf_now < cmd_buf_end);
+	} while (buf_now <= cmd_buf_end);
 }
 
 static uint32_t cam_cdm_util_dump_reg_cont_cmd_v2(
@@ -1322,6 +1210,6 @@ int cam_cdm_util_dump_cmd_bufs_v2(
 			buf_now++;
 			break;
 		}
-	} while (buf_now < dump_info->src_end);
+	} while (buf_now <= dump_info->src_end);
 	return rc;
 }

qcom/opensource/camera-kernel/drivers/cam_cdm/cam_cdm_util.h

@@ -9,7 +9,6 @@
 
 /* Max len for tag name for header while dumping cmd buffer*/
 #define CAM_CDM_CMD_TAG_MAX_LEN 128
-#define CAM_CDM_COMMAND_OFFSET  24
 
 #include <linux/types.h>
 
@@ -228,20 +227,6 @@ struct cam_cdm_cmd_dump_header {
 	uint32_t  word_size;
 };
 
-/**
- * cam_cdm_util_validate_cmd_buf()
- *
- * @brief:            Util function to validate cdm command buffers
- *
- * @cmd_buffer_start: Pointer to start of cmd buffer
- * @cmd_buffer_end:   Pointer to end of cmd buffer
- *
- * return true if invalid cmd found, otherwise false
- *
- */
-bool cam_cdm_util_validate_cmd_buf(
-	uint32_t *cmd_buffer_start, uint32_t *cmd_buffer_end);
-
 /**
  * cam_cdm_util_log_cmd_bufs()
  *

qcom/opensource/camera-kernel/drivers/cam_core/cam_context.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/slab.h>
@@ -355,31 +355,6 @@ int cam_context_dump_pf_info(void *data, void *args)
 	return rc;
 }
 
-int cam_context_handle_message(struct cam_context *ctx,
-	uint32_t msg_type, void *data)
-{
-	int rc = 0;
-
-	if (!ctx->state_machine) {
-		CAM_ERR(CAM_CORE, "Context is not ready");
-		return -EINVAL;
-	}
-
-	if ((ctx->state > CAM_CTX_AVAILABLE) &&
-		(ctx->state < CAM_CTX_STATE_MAX)) {
-		if (ctx->state_machine[ctx->state].msg_cb_ops) {
-			rc = ctx->state_machine[ctx->state].msg_cb_ops(
-				ctx, msg_type, data);
-		} else {
-			CAM_WARN(CAM_CORE,
-				"No message handler for ctx %d, state %d msg_type :%d",
-				ctx->dev_hdl, ctx->state, msg_type);
-		}
-	}
-
-	return rc;
-}
-
 int cam_context_handle_acquire_dev(struct cam_context *ctx,
 	struct cam_acquire_dev_cmd *cmd)
 {

qcom/opensource/camera-kernel/drivers/cam_core/cam_context.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_CONTEXT_H_
@@ -168,9 +168,7 @@ struct cam_ctx_crm_ops {
  *                         context info
  * @recovery_ops:          Function to be invoked to try hardware recovery
  * @mini_dump_ops:         Function for mini dump
- * @err_inject_ops:        Function for error injection
- * @msg_cb_ops:            Function to be called on any message from
- *                         other subdev notifications
+ * @evt_inject_ops:        Function for event injection
  *
  */
 struct cam_ctx_ops {
@@ -182,7 +180,6 @@ struct cam_ctx_ops {
 	cam_ctx_recovery_cb_func     recovery_ops;
 	cam_ctx_mini_dump_cb_func    mini_dump_ops;
 	cam_ctx_err_inject_cb_func   evt_inject_ops;
-	cam_ctx_message_cb_func      msg_cb_ops;
 };
 
 
@@ -276,38 +273,6 @@ struct cam_context {
 	struct timespec64              cdm_done_ts;
 };
 
-/**
- * struct cam_context_stream_dump - camera context stream information
- *
- * @hw_mgr_ctx_id:         Hw Mgr context id returned from hw mgr
- * @dev_id:                ID of device associated
- * @dev_hdl:               Device handle
- * @link_hdl:              Link handle
- * @sessoin_hdl:           Session handle
- * @refcount:              Context object refcount
- * @last_flush_req:        Last request to flush
- * @state:                 Current state for top level state machine
- */
-struct cam_context_stream_dump {
-	uint32_t                       hw_mgr_ctx_id;
-	uint32_t                       dev_id;
-	uint32_t                       dev_hdl;
-	uint32_t                       link_hdl;
-	uint32_t                       session_hdl;
-	uint32_t                       refcount;
-	uint32_t                       last_flush_req;
-	enum cam_context_state         state;
-};
-
-/**
- * struct cam_context_each_req_info - camera each request information
- *
- * @request_id:         request id
- */
-struct cam_context_each_req_info {
-	uint64_t              request_id;
-};
-
 /**
  * struct cam_context_dump_header -  Function for context dump header
  *
@@ -451,19 +416,6 @@ int cam_context_mini_dump_from_hw(struct cam_context *ctx,
 int cam_context_dump_pf_info(void *ctx,
 	void *pf_args);
 
-/**
- * cam_context_handle_message()
- *
- * @brief:        Handle message callback command
- *
- * @ctx:          Object pointer for cam_context
- * @msg_type:     message type sent from other subdev
- * @data:         data from other subdev
- *
- */
-int cam_context_handle_message(struct cam_context *ctx,
-	uint32_t msg_type, void *data);
-
 /**
  * cam_context_handle_acquire_dev()
  *

qcom/opensource/camera-kernel/drivers/cam_core/cam_context_utils.c

@@ -1487,40 +1487,6 @@ end:
 	return rc;
 }
 
-static int cam_context_dump_data_validaion(void *src, void *dest,
-		uint32_t base_len, uint32_t actual_len, uint32_t bytes_required)
-{
-	if (base_len + bytes_required >= actual_len) {
-		CAM_ERR(CAM_CTXT, "actual len %pK base len %pK",
-			actual_len, base_len);
-		return -ENOSPC;
-	}
-	memcpy(dest, src, bytes_required);
-	return 0;
-}
-
-static int cam_context_stream_dump_validation(struct cam_context *ctx,
-	uint64_t *addr, uint32_t local_len, uint32_t buf_len)
-{
-	struct cam_context_stream_dump   stream_dump;
-
-	stream_dump.hw_mgr_ctx_id =  ctx->hw_mgr_ctx_id;
-	stream_dump.dev_id =         ctx->dev_id;
-	stream_dump.dev_hdl =        ctx->dev_hdl;
-	stream_dump.link_hdl =       ctx->link_hdl;
-	stream_dump.session_hdl =    ctx->session_hdl;
-	stream_dump.refcount    =    refcount_read(&(ctx->refcount.refcount));
-	stream_dump.last_flush_req = ctx->last_flush_req;
-	stream_dump.state =          ctx->state;
-	if (cam_context_dump_data_validaion(&stream_dump, addr,
-		local_len, buf_len,
-		sizeof(struct cam_context_stream_dump))) {
-		CAM_WARN(CAM_CTXT, "failed to copy the stream info");
-		return -ENOSPC;
-	}
-	return 0;
-}
-
 static int cam_context_user_dump(struct cam_context *ctx,
 	struct cam_hw_dump_args *dump_args)
 {
@@ -1529,9 +1495,9 @@ static int cam_context_user_dump(struct cam_context *ctx,
 	struct cam_context_dump_header  *hdr;
 	uint8_t                         *dst;
 	uint64_t                        *addr, *start;
+	uint32_t                         min_len;
 	size_t                           buf_len, remain_len;
 	uintptr_t                        cpu_addr;
-	uint32_t                         local_len;
 
 	if (!ctx || !dump_args) {
 		CAM_ERR(CAM_CORE, "Invalid parameters %pK %pK",
@@ -1555,31 +1521,107 @@ static int cam_context_user_dump(struct cam_context *ctx,
 		return -ENOSPC;
 	}
 
-	/* Dump context info */
-	remain_len = buf_len - dump_args->offset;
-	if (remain_len < sizeof(struct cam_context_dump_header)) {
-		CAM_WARN(CAM_CTXT,
-			"No sufficient space in dump buffer for headers, remain buf size: %d, header size: %d",
-			remain_len, sizeof(struct cam_context_dump_header));
-		cam_mem_put_cpu_buf(dump_args->buf_handle);
-		return -ENOSPC;
+	spin_lock_bh(&ctx->lock);
+	if (!list_empty(&ctx->active_req_list)) {
+		req = list_first_entry(&ctx->active_req_list,
+			struct cam_ctx_request, list);
+	} else if (!list_empty(&ctx->wait_req_list)) {
+		req = list_first_entry(&ctx->wait_req_list,
+			struct cam_ctx_request, list);
+	} else if (!list_empty(&ctx->pending_req_list)) {
+		req = list_first_entry(&ctx->pending_req_list,
+			struct cam_ctx_request, list);
+	} else {
+		CAM_ERR(CAM_CTXT, "[%s][%d] no request to dump",
+			ctx->dev_name, ctx->ctx_id);
 	}
+	spin_unlock_bh(&ctx->lock);
+
+	/* Check for min len in case of available request to dump */
+	if (req != NULL) {
+		remain_len = buf_len - dump_args->offset;
+		min_len = sizeof(struct cam_context_dump_header) +
+			(CAM_CTXT_DUMP_NUM_WORDS + req->num_in_map_entries +
+			(req->num_out_map_entries * 2)) * sizeof(uint64_t);
 
+		if (remain_len < min_len) {
+			CAM_WARN(CAM_CTXT, "dump buffer exhaust remain %zu min %u",
+				remain_len, min_len);
+			cam_mem_put_cpu_buf(dump_args->buf_handle);
+			return -ENOSPC;
+		}
+	}
+
+	/* Dump context info */
 	dst = (uint8_t *)cpu_addr + dump_args->offset;
 	hdr = (struct cam_context_dump_header *)dst;
-	local_len =
-		(dump_args->offset + sizeof(struct cam_context_dump_header));
 	scnprintf(hdr->tag, CAM_CTXT_DUMP_TAG_MAX_LEN,
 		"%s_CTX_INFO:", ctx->dev_name);
 	hdr->word_size = sizeof(uint64_t);
 	addr = (uint64_t *)(dst + sizeof(struct cam_context_dump_header));
 	start = addr;
-	if (cam_context_stream_dump_validation(ctx, addr, local_len, buf_len)) {
-		CAM_WARN(CAM_CTXT, "%s_CTX_INFO failed to copy the stream info ", ctx->dev_name);
-		cam_mem_put_cpu_buf(dump_args->buf_handle);
-		return -ENOSPC;
+	*addr++ = ctx->hw_mgr_ctx_id;
+	*addr++ = ctx->dev_id;
+	*addr++ = ctx->dev_hdl;
+	*addr++ = ctx->link_hdl;
+	*addr++ = ctx->session_hdl;
+	*addr++ = refcount_read(&(ctx->refcount.refcount));
+	*addr++ = ctx->last_flush_req;
+	*addr++ = ctx->state;
+	hdr->size = hdr->word_size * (addr - start);
+	dump_args->offset += hdr->size +
+		sizeof(struct cam_context_dump_header);
+
+	/* Dump pending request IDs */
+	dst = (uint8_t *)cpu_addr + dump_args->offset;
+	hdr = (struct cam_context_dump_header *)dst;
+	scnprintf(hdr->tag, CAM_CTXT_DUMP_TAG_MAX_LEN,
+		"%s_OUT_FENCE_PENDING_REQUESTS:", ctx->dev_name);
+	hdr->word_size = sizeof(uint64_t);
+	addr = (uint64_t *)(dst + sizeof(struct cam_context_dump_header));
+	start = addr;
+	if (!list_empty(&ctx->pending_req_list)) {
+		list_for_each_entry_safe(req, req_temp, &ctx->pending_req_list, list) {
+			*addr++ = req->request_id;
+		}
 	}
-	addr = addr + sizeof(struct cam_context_stream_dump);
+
+	hdr->size = hdr->word_size * (addr - start);
+	dump_args->offset += hdr->size +
+		sizeof(struct cam_context_dump_header);
+
+	/* Dump wait request IDs */
+	dst = (uint8_t *)cpu_addr + dump_args->offset;
+	hdr = (struct cam_context_dump_header *)dst;
+	scnprintf(hdr->tag, CAM_CTXT_DUMP_TAG_MAX_LEN,
+		"%s_OUT_FENCE_APPLIED_REQUESTS:", ctx->dev_name);
+	hdr->word_size = sizeof(uint64_t);
+	addr = (uint64_t *)(dst + sizeof(struct cam_context_dump_header));
+	start = addr;
+	if (!list_empty(&ctx->wait_req_list)) {
+		list_for_each_entry_safe(req, req_temp, &ctx->wait_req_list, list) {
+			*addr++ = req->request_id;
+		}
+	}
+
+	hdr->size = hdr->word_size * (addr - start);
+	dump_args->offset += hdr->size +
+		sizeof(struct cam_context_dump_header);
+
+	/* Dump active request IDs */
+	dst = (uint8_t *)cpu_addr + dump_args->offset;
+	hdr = (struct cam_context_dump_header *)dst;
+	scnprintf(hdr->tag, CAM_CTXT_DUMP_TAG_MAX_LEN,
+		"%s_OUT_FENCE_ACTIVE_REQUESTS:", ctx->dev_name);
+	hdr->word_size = sizeof(uint64_t);
+	addr = (uint64_t *)(dst + sizeof(struct cam_context_dump_header));
+	start = addr;
+	if (!list_empty(&ctx->active_req_list)) {
+		list_for_each_entry_safe(req, req_temp, &ctx->active_req_list, list) {
+			*addr++ = req->request_id;
+		}
+	}
+
 	hdr->size = hdr->word_size * (addr - start);
 	dump_args->offset += hdr->size +
 		sizeof(struct cam_context_dump_header);
@@ -1588,19 +1630,8 @@ static int cam_context_user_dump(struct cam_context *ctx,
 	if (!list_empty(&ctx->wait_req_list)) {
 		list_for_each_entry_safe(req, req_temp, &ctx->wait_req_list, list) {
 			for (i = 0; i < req->num_out_map_entries; i++) {
-				remain_len = buf_len - dump_args->offset;
-				if (remain_len < sizeof(struct cam_context_dump_header)) {
-					CAM_WARN(CAM_CTXT,
-						"No sufficient space in dump buffer for headers, remain buf size: %d, header size: %d",
-						remain_len, sizeof(struct cam_context_dump_header));
-					cam_mem_put_cpu_buf(dump_args->buf_handle);
-					return -ENOSPC;
-				}
-
 				dst = (uint8_t *)cpu_addr + dump_args->offset;
 				hdr = (struct cam_context_dump_header *)dst;
-				local_len = dump_args->offset +
-					sizeof(struct cam_context_dump_header);
 				scnprintf(hdr->tag, CAM_CTXT_DUMP_TAG_MAX_LEN,
 					"%s_OUT_FENCE_REQUEST_APPLIED.%d.%d.%d:",
 					ctx->dev_name,
@@ -1610,14 +1641,7 @@ static int cam_context_user_dump(struct cam_context *ctx,
 				hdr->word_size = sizeof(uint64_t);
 				addr = (uint64_t *)(dst + sizeof(struct cam_context_dump_header));
 				start = addr;
-				if (cam_context_dump_data_validaion(&req->request_id, addr,
-					local_len, buf_len,
-					sizeof(struct cam_context_each_req_info))) {
-					CAM_WARN(CAM_CTXT, "%s_CTX_INFO waiting_req: failed to copy the request info",
-						ctx->dev_name);
-					goto cleanup;
-				}
-				addr = addr + sizeof(struct cam_context_each_req_info);
+				*addr++ = req->request_id;
 				hdr->size = hdr->word_size * (addr - start);
 				dump_args->offset += hdr->size +
 					sizeof(struct cam_context_dump_header);
@@ -1629,19 +1653,8 @@ static int cam_context_user_dump(struct cam_context *ctx,
 	if (!list_empty(&ctx->pending_req_list)) {
 		list_for_each_entry_safe(req, req_temp, &ctx->pending_req_list, list) {
 			for (i = 0; i < req->num_out_map_entries; i++) {
-				remain_len = buf_len - dump_args->offset;
-				if (remain_len < sizeof(struct cam_context_dump_header)) {
-					CAM_WARN(CAM_CTXT,
-						"No sufficient space in dump buffer for headers, remain buf size: %d, header size: %d",
-						remain_len, sizeof(struct cam_context_dump_header));
-					cam_mem_put_cpu_buf(dump_args->buf_handle);
-					return -ENOSPC;
-				}
-
 				dst = (uint8_t *)cpu_addr + dump_args->offset;
 				hdr = (struct cam_context_dump_header *)dst;
-				local_len = dump_args->offset +
-					sizeof(struct cam_context_dump_header);
 				scnprintf(hdr->tag, CAM_CTXT_DUMP_TAG_MAX_LEN,
 					"%s_OUT_FENCE_REQUEST_PENDING.%d.%d.%d:",
 					ctx->dev_name,
@@ -1651,14 +1664,7 @@ static int cam_context_user_dump(struct cam_context *ctx,
 				hdr->word_size = sizeof(uint64_t);
 				addr = (uint64_t *)(dst + sizeof(struct cam_context_dump_header));
 				start = addr;
-				if (cam_context_dump_data_validaion(&req->request_id, addr,
-					local_len, buf_len,
-					sizeof(struct cam_context_each_req_info))) {
-					CAM_WARN(CAM_CTXT, "%s_CTX_INFO pending_req: failed to copy the request info",
-						ctx->dev_name);
-					goto cleanup;
-				}
-				addr = addr + sizeof(struct cam_context_each_req_info);
+				*addr++ = req->request_id;
 				hdr->size = hdr->word_size * (addr - start);
 				dump_args->offset += hdr->size +
 					sizeof(struct cam_context_dump_header);
@@ -1670,19 +1676,8 @@ static int cam_context_user_dump(struct cam_context *ctx,
 	if (!list_empty(&ctx->active_req_list)) {
 		list_for_each_entry_safe(req, req_temp, &ctx->active_req_list, list) {
 			for (i = 0; i < req->num_out_map_entries; i++) {
-				remain_len = buf_len - dump_args->offset;
-				if (remain_len < sizeof(struct cam_context_dump_header)) {
-					CAM_WARN(CAM_CTXT,
-						"No sufficient space in dump buffer for headers, remain buf size: %d, header size: %d",
-						remain_len, sizeof(struct cam_context_dump_header));
-					cam_mem_put_cpu_buf(dump_args->buf_handle);
-					return -ENOSPC;
-				}
-
 				dst = (uint8_t *)cpu_addr + dump_args->offset;
 				hdr = (struct cam_context_dump_header *)dst;
-				local_len = dump_args->offset +
-					sizeof(struct cam_context_dump_header);
 				scnprintf(hdr->tag, CAM_CTXT_DUMP_TAG_MAX_LEN,
 					"%s_OUT_FENCE_REQUEST_ACTIVE.%d.%d.%d:",
 					ctx->dev_name,
@@ -1692,21 +1687,14 @@ static int cam_context_user_dump(struct cam_context *ctx,
 				hdr->word_size = sizeof(uint64_t);
 				addr = (uint64_t *)(dst + sizeof(struct cam_context_dump_header));
 				start = addr;
-				if (cam_context_dump_data_validaion(&req->request_id, addr,
-					local_len, buf_len,
-					sizeof(struct cam_context_each_req_info))) {
-					CAM_WARN(CAM_CTXT, "%s_CTX_INFO active_req: failed to copy the request info",
-						ctx->dev_name);
-					goto cleanup;
-				}
-				addr = addr + sizeof(struct cam_context_each_req_info);
+				*addr++ = req->request_id;
 				hdr->size = hdr->word_size * (addr - start);
 				dump_args->offset += hdr->size +
 					sizeof(struct cam_context_dump_header);
 			}
 		}
 	}
-cleanup:
+
 	cam_mem_put_cpu_buf(dump_args->buf_handle);
 	return 0;
 }

qcom/opensource/camera-kernel/drivers/cam_core/cam_hw_mgr_intf.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_HW_MGR_INTF_H_
@@ -80,10 +80,6 @@ typedef int (*cam_ctx_mini_dump_cb_func)(void *context,
 typedef int (*cam_ctx_err_inject_cb_func)(void *context,
 	void *args);
 
-/* message callback function type */
-typedef int (*cam_ctx_message_cb_func)(void *context,
-	uint32_t message_type, void *data);
-
 /**
  * struct cam_hw_update_entry - Entry for hardware config
  *
@@ -169,13 +165,11 @@ struct cam_hw_acquire_stream_caps {
  * @hw_mgr_ctx_id          HWMgr context id(returned)
  * @op_flags:              Used as bitwise params from hw_mgr to ctx
  *                         See xxx_hw_mgr_intf.h for definitions
- * @link_hdl:              Link handle
  * @acquired_hw_id:        Acquired hardware mask
  * @acquired_hw_path:      Acquired path mask for an input
  *                         if input splits into multiple paths,
  *                         its updated per hardware
  * @valid_acquired_hw:     Valid num of acquired hardware
- * @total_ports_acq        Total ports acquired ipp+ppp+rdi
  * @op_params:             OP Params from hw_mgr to ctx
  * @mini_dump_cb:          Mini dump callback function
  *
@@ -191,11 +185,11 @@ struct cam_hw_acquire_args {
 	void                        *ctxt_to_hw_map;
 	uint32_t                     hw_mgr_ctx_id;
 	uint32_t                     op_flags;
-	int32_t                      link_hdl;
-	uint32_t                     acquired_hw_id[CAM_MAX_ACQ_RES];
-	uint32_t                     acquired_hw_path[CAM_MAX_ACQ_RES][CAM_MAX_HW_SPLIT];
-	uint32_t                     valid_acquired_hw;
-	uint32_t                     total_ports_acq;
+
+	uint32_t    acquired_hw_id[CAM_MAX_ACQ_RES];
+	uint32_t    acquired_hw_path[CAM_MAX_ACQ_RES][CAM_MAX_HW_SPLIT];
+	uint32_t    valid_acquired_hw;
+
 	struct cam_hw_acquire_stream_caps op_params;
 	cam_ctx_mini_dump_cb_func    mini_dump_cb;
 };

qcom/opensource/camera-kernel/drivers/cam_cpas/cam_cpas_hw.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/device.h>
@@ -514,7 +514,7 @@ bus_register_fail:
 	return rc;
 }
 
-int cam_cpas_util_vote_default_ahb_axi(struct cam_hw_info *cpas_hw,
+static int cam_cpas_util_vote_default_ahb_axi(struct cam_hw_info *cpas_hw,
 	int enable)
 {
 	int rc, i = 0;
@@ -983,8 +983,7 @@ static int cam_cpas_apply_smart_qos(
 	struct cam_cpas_tree_node *niu_node;
 	struct cam_camnoc_info *camnoc_info;
 	uint8_t i;
-	int32_t reg_indx, cam_qos_cnt = 0, ret = 0;
-	struct qcom_scm_camera_qos scm_buf[QCOM_SCM_CAMERA_MAX_QOS_CNT] = {0};
+	int32_t reg_indx;
 
 	if (cpas_core->smart_qos_dump) {
 		CAM_INFO(CAM_PERF, "Printing SmartQos values before update");
@@ -999,44 +998,20 @@ static int cam_cpas_apply_smart_qos(
 		niu_node = soc_private->smart_qos_info->rt_wr_niu_node[i];
 
 		if (niu_node->curr_priority_high != niu_node->applied_priority_high) {
-			if (!soc_private->enable_secure_qos_update) {
-				cam_io_w_mb(niu_node->curr_priority_high,
-					soc_info->reg_map[reg_indx].mem_base +
-					niu_node->pri_lut_high_offset);
-			} else {
-				scm_buf[cam_qos_cnt].offset = niu_node->pri_lut_high_offset;
-				scm_buf[cam_qos_cnt].val = niu_node->curr_priority_high;
-				cam_qos_cnt++;
-			}
+			cam_io_w_mb(niu_node->curr_priority_high,
+				soc_info->reg_map[reg_indx].mem_base +
+				niu_node->pri_lut_high_offset);
 
 			niu_node->applied_priority_high = niu_node->curr_priority_high;
 		}
 
 		if (niu_node->curr_priority_low != niu_node->applied_priority_low) {
-			if (!soc_private->enable_secure_qos_update) {
-				cam_io_w_mb(niu_node->curr_priority_low,
-					soc_info->reg_map[reg_indx].mem_base +
-					niu_node->pri_lut_low_offset);
-			} else {
-				scm_buf[cam_qos_cnt].offset = niu_node->pri_lut_low_offset;
-				scm_buf[cam_qos_cnt].val = niu_node->curr_priority_low;
-				cam_qos_cnt++;
-			}
+			cam_io_w_mb(niu_node->curr_priority_low,
+				soc_info->reg_map[reg_indx].mem_base +
+				niu_node->pri_lut_low_offset);
 
 			niu_node->applied_priority_low = niu_node->curr_priority_low;
 		}
-
-		if (soc_private->enable_secure_qos_update && cam_qos_cnt) {
-			CAM_DBG(CAM_PERF, "Updating secure camera smartOos count: %d", cam_qos_cnt);
-			ret = cam_update_camnoc_qos_settings(CAM_QOS_UPDATE_TYPE_SMART,
-				cam_qos_cnt, scm_buf);
-			if (ret) {
-				CAM_ERR(CAM_PERF, "Secure camera smartOos update failed:%d", ret);
-				return ret;
-			}
-			CAM_DBG(CAM_PERF, "Updated secure camera smartOos");
-			cam_qos_cnt = 0;
-		}
 	}
 
 	if (cpas_core->smart_qos_dump) {
@@ -1080,6 +1055,9 @@ static int cam_cpas_util_set_camnoc_axi_drv_clk_rate(struct cam_hw_soc_info *soc
 		req_drv_low_camnoc_bw = 0, intermediate_drv_low_result = 0;
 	int64_t drv_high_clk_rate = 0, drv_low_clk_rate = 0;
 	int i, rc = 0;
+	void __iomem *cesta_base =
+		soc_info->reg_map[cpas_core->regbase_index[CAM_CPAS_REG_CESTA]].mem_base;
+	uint32_t cesta_vcd_curr_perfol_val;
 
 	if (!soc_private->enable_cam_clk_drv) {
 		CAM_ERR(CAM_CPAS, "Clk DRV not enabled, can't set clk rates through cesta APIs");
@@ -1182,6 +1160,16 @@ static int cam_cpas_util_set_camnoc_axi_drv_clk_rate(struct cam_hw_soc_info *soc
 				hw_client_idx, rc);
 			return rc;
 		}
+
+		cesta_vcd_curr_perfol_val = cam_io_r_mb(cesta_base + 0x400c);
+		CAM_DBG(CAM_ISP, "Check camnoc VCD val after set I: 0x%x",
+			cesta_vcd_curr_perfol_val);
+		cesta_vcd_curr_perfol_val = cam_io_r_mb(cesta_base + 0x400c);
+		CAM_DBG(CAM_ISP, "Check camnoc VCD val after set II: 0x%x",
+			cesta_vcd_curr_perfol_val);
+		cesta_vcd_curr_perfol_val = cam_io_r_mb(cesta_base + 0x400c);
+		CAM_DBG(CAM_ISP, "Check camnoc VCD val after set III: 0x%x",
+			cesta_vcd_curr_perfol_val);
 	}
 
 	return rc;
@@ -1195,6 +1183,9 @@ static int cam_cpas_util_set_camnoc_axi_hlos_clk_rate(struct cam_hw_soc_info *so
 	int64_t hlos_clk_rate = 0;
 	int i, rc = 0;
 	const struct camera_debug_settings *cam_debug = NULL;
+	void __iomem *cesta_base =
+		soc_info->reg_map[cpas_core->regbase_index[CAM_CPAS_REG_CESTA]].mem_base;
+	uint32_t cesta_vcd_curr_perfol_val;
 
 	for (i = 0; i < CAM_CPAS_MAX_TREE_NODES; i++) {
 		tree_node = soc_private->tree_node[i];
@@ -1238,7 +1229,7 @@ static int cam_cpas_util_set_camnoc_axi_hlos_clk_rate(struct cam_hw_soc_info *so
 	do_div(intermediate_hlos_result, soc_private->camnoc_bus_width);
 	hlos_clk_rate = intermediate_hlos_result;
 
-	CAM_DBG(CAM_PERF, "Setting camnoc axi HLOS clk rate[BW Clk] : [%llu %lld]",
+	CAM_INFO(CAM_PERF, "Setting camnoc axi HLOS clk rate[BW Clk] : [%llu %lld]",
 		req_hlos_camnoc_bw, hlos_clk_rate);
 
 	/*
@@ -1256,8 +1247,19 @@ static int cam_cpas_util_set_camnoc_axi_hlos_clk_rate(struct cam_hw_soc_info *so
 				req_hlos_camnoc_bw, hlos_clk_rate, rc);
 
 		cpas_core->applied_camnoc_axi_rate.sw_client = hlos_clk_rate;
+
+		cesta_vcd_curr_perfol_val = cam_io_r_mb(cesta_base + 0x400c);
+		CAM_DBG(CAM_ISP, "Check camnoc VCD val after set I: 0x%x",
+			cesta_vcd_curr_perfol_val);
+		cesta_vcd_curr_perfol_val = cam_io_r_mb(cesta_base + 0x400c);
+		CAM_DBG(CAM_ISP, "Check camnoc VCD val after set II: 0x%x",
+			cesta_vcd_curr_perfol_val);
+		cesta_vcd_curr_perfol_val = cam_io_r_mb(cesta_base + 0x400c);
+		CAM_DBG(CAM_ISP, "Check camnoc VCD val after set III: 0x%x",
+			cesta_vcd_curr_perfol_val);
 	}
 
+
 	return rc;
 }
 
@@ -3466,10 +3468,7 @@ static void *cam_cpas_user_dump_state_monitor_array_info(
 	*addr++ = monitor->applied_camnoc_clk.hw_client[2].low,
 	*addr++ = monitor->applied_ahb_level;
 	*addr++ = cpas_core->num_valid_camnoc;
-
-	if (soc_private->enable_smart_qos)
-		*addr++ = soc_private->smart_qos_info->num_rt_wr_nius;
-
+	*addr++ = soc_private->smart_qos_info->num_rt_wr_nius;
 	*addr++ = num_vcds;
 	*addr++ = cpas_core->num_axi_ports;
 
@@ -3516,16 +3515,14 @@ static void *cam_cpas_user_dump_state_monitor_array_info(
 		}
 	}
 
-	if (soc_private->enable_smart_qos) {
-		for (i = 0; i < soc_private->smart_qos_info->num_rt_wr_nius; i++) {
-			niu_node = soc_private->smart_qos_info->rt_wr_niu_node[i];
-			dst = (uint8_t *)addr;
-			hdr = (struct cam_common_hw_dump_header *)dst;
-			scnprintf(hdr->tag, CAM_COMMON_HW_DUMP_TAG_MAX_LEN, "%s:", niu_node->node_name);
-			addr = (uint64_t *)(dst + sizeof(struct cam_common_hw_dump_header));
-			*addr++ = monitor->rt_wr_niu_pri_lut_high[i];
-			*addr++ = monitor->rt_wr_niu_pri_lut_low[i];
-		}
+	for (i = 0; i < soc_private->smart_qos_info->num_rt_wr_nius; i++) {
+		niu_node = soc_private->smart_qos_info->rt_wr_niu_node[i];
+		dst = (uint8_t *)addr;
+		hdr = (struct cam_common_hw_dump_header *)dst;
+		scnprintf(hdr->tag, CAM_COMMON_HW_DUMP_TAG_MAX_LEN, "%s:", niu_node->node_name);
+		addr = (uint64_t *)(dst + sizeof(struct cam_common_hw_dump_header));
+		*addr++ = monitor->rt_wr_niu_pri_lut_high[i];
+		*addr++ = monitor->rt_wr_niu_pri_lut_low[i];
 	}
 
 	vcd_reg_debug_info = &monitor->vcd_reg_debug_info;
@@ -3616,11 +3613,9 @@ static int cam_cpas_dump_state_monitor_array_info(
 				min_len += sizeof(struct cam_common_hw_dump_header);
 		}
 
-		if (soc_private->enable_smart_qos) {
-			for (j = 0; j < soc_private->smart_qos_info->num_rt_wr_nius; j++)
-				min_len += sizeof(struct cam_common_hw_dump_header) +
-					CAM_CPAS_DUMP_NUM_WORDS_RT_WR_NIUS * sizeof(uint64_t);
-		}
+		for (j = 0; j < soc_private->smart_qos_info->num_rt_wr_nius; j++)
+			min_len += sizeof(struct cam_common_hw_dump_header) +
+				CAM_CPAS_DUMP_NUM_WORDS_RT_WR_NIUS * sizeof(uint64_t);
 
 		for (j = 0; j < CAM_CPAS_MAX_CESTA_VCD_NUM; j++)
 			min_len += CAM_CPAS_DUMP_NUM_WORDS_VCD_CURR_LVL * sizeof(uint64_t);
@@ -3699,32 +3694,6 @@ done:
 	return rc;
 }
 
-static int cam_cpas_hw_enable_tpg_mux_sel(struct cam_hw_info *cpas_hw,
-	uint32_t tpg_mux)
-{
-	struct cam_cpas *cpas_core = (struct cam_cpas *) cpas_hw->core_info;
-	int rc = 0;
-
-	mutex_lock(&cpas_hw->hw_mutex);
-
-	if (cpas_core->internal_ops.set_tpg_mux_sel) {
-		rc = cpas_core->internal_ops.set_tpg_mux_sel(
-			cpas_hw, tpg_mux);
-		if (rc) {
-			CAM_ERR(CAM_CPAS,
-				"failed in tpg mux selection rc=%d",
-				rc);
-		}
-	} else {
-		CAM_ERR(CAM_CPAS,
-			"CPAS tpg mux sel not enabled");
-		rc = -EINVAL;
-	}
-
-	mutex_unlock(&cpas_hw->hw_mutex);
-	return rc;
-}
-
 static int cam_cpas_activate_cache(
 	struct cam_hw_info *cpas_hw,
 	struct cam_sys_cache_info *cache_info)
@@ -4042,6 +4011,10 @@ static int cam_cpas_hw_csid_input_core_info_update(struct cam_hw_info *cpas_hw,
 
 	rc = cam_common_util_get_string_index(soc_private->client_name,
 		soc_private->num_clients, client_name, &client_indx);
+	if (rc || (client_indx < 0)) {
+		CAM_ERR(CAM_CPAS, "Failed in getting correct client index");
+		return -EINVAL;
+	}
 
 	if (!cpas_core->cpas_client[client_indx]->is_drv_dyn)
 		return 0;
@@ -4394,20 +4367,6 @@ static int cam_cpas_hw_process_cmd(void *hw_priv,
 		rc = cam_cpas_hw_csid_process_resume(hw_priv, *csid_idx);
 		break;
 	}
-	case CAM_CPAS_HW_CMD_TPG_MUX_SEL: {
-		uint32_t *tpg_mux_sel;
-
-		if (sizeof(uint32_t) != arg_size) {
-			CAM_ERR(CAM_CPAS, "cmd_type %d, size mismatch %d",
-				cmd_type, arg_size);
-			break;
-		}
-
-		tpg_mux_sel = (uint32_t *)cmd_args;
-		rc = cam_cpas_hw_enable_tpg_mux_sel(hw_priv, *tpg_mux_sel);
-		break;
-
-	}
 	case CAM_CPAS_HW_CMD_ENABLE_DISABLE_DOMAIN_ID_CLK: {
 		bool *enable;
 
@@ -4711,7 +4670,7 @@ int cam_cpas_hw_probe(struct platform_device *pdev,
 	cpas_hw_intf->hw_ops.process_cmd = cam_cpas_hw_process_cmd;
 
 	cpas_core->work_queue = alloc_workqueue(CAM_CPAS_WORKQUEUE_NAME,
-		WQ_UNBOUND | WQ_MEM_RECLAIM, CAM_CPAS_INFLIGHT_WORKS);
+		WQ_UNBOUND | WQ_MEM_RECLAIM | WQ_HIGHPRI, CAM_CPAS_INFLIGHT_WORKS);
 	if (!cpas_core->work_queue) {
 		rc = -ENOMEM;
 		goto release_mem;

qcom/opensource/camera-kernel/drivers/cam_cpas/cam_cpas_hw.h

@@ -170,7 +170,6 @@ struct cam_cpas_kobj_map {
  * @print_poweron_settings: Function pointer for hw to print poweron settings
  * @qchannel_handshake: Function pointer for hw core specific qchannel
  *                      handshake settings
- * @set_tpg_mux_sel: Set tpg mux select on CPAS TOP register
  *
  */
 struct cam_cpas_internal_ops {
@@ -187,7 +186,6 @@ struct cam_cpas_internal_ops {
 		uint32_t selection_mask);
 	int (*print_poweron_settings)(struct cam_hw_info *cpas_hw);
 	int (*qchannel_handshake)(struct cam_hw_info *cpas_hw, bool power_on, bool force_on);
-	int (*set_tpg_mux_sel)(struct cam_hw_info *cpas_hw, uint32_t tpg_num);
 };
 
 /**
@@ -460,7 +458,4 @@ int cam_cpas_util_reg_read(struct cam_hw_info *cpas_hw,
 
 int cam_cpas_util_client_cleanup(struct cam_hw_info *cpas_hw);
 
-int cam_cpas_util_vote_default_ahb_axi(struct cam_hw_info *cpas_hw,
-	int enable);
-
 #endif /* _CAM_CPAS_HW_H_ */

qcom/opensource/camera-kernel/drivers/cam_cpas/cam_cpas_hw_intf.h

@@ -72,7 +72,6 @@ enum cam_cpas_hw_cmd_process {
 	CAM_CPAS_HW_CMD_CSID_INPUT_CORE_INFO_UPDATE,
 	CAM_CPAS_HW_CMD_CSID_PROCESS_RESUME,
 	CAM_CPAS_HW_CMD_ENABLE_DISABLE_DOMAIN_ID_CLK,
-	CAM_CPAS_HW_CMD_TPG_MUX_SEL,
 	CAM_CPAS_HW_CMD_DUMP_STATE_MONITOR_INFO,
 	CAM_CPAS_HW_CMD_INVALID,
 };
@@ -202,10 +201,4 @@ int cam_cpas_dev_init_module(void);
  * @brief : API to remove CPAS interface from platform framework.
  */
 void cam_cpas_dev_exit_module(void);
-
-/**
- * @brief : API to select TPG mux select.
- */
-int cam_cpas_enable_tpg_mux_sel(uint32_t tpg_mux_sel);
-
 #endif /* _CAM_CPAS_HW_INTF_H_ */

qcom/opensource/camera-kernel/drivers/cam_cpas/cam_cpas_intf.c

@@ -22,18 +22,10 @@
 #include "cam_cpas_soc.h"
 #include "cam_cpastop_hw.h"
 #include "camera_main.h"
-#include "cam_cpas_hw.h"
 
 #include <linux/soc/qcom/llcc-qcom.h>
 #include "cam_req_mgr_interface.h"
 
-#ifdef CONFIG_DYNAMIC_FD_PORT_CONFIG
-#include <linux/IClientEnv.h>
-#include <linux/ITrustedCameraDriver.h>
-#include <linux/CTrustedCameraDriver.h>
-#define CAM_CPAS_ERROR_NOT_ALLOWED 10
-#endif
-
 #define CAM_CPAS_DEV_NAME    "cam-cpas"
 #define CAM_CPAS_INTF_INITIALIZED() (g_cpas_intf && g_cpas_intf->probe_done)
 
@@ -775,31 +767,6 @@ int cam_cpas_select_qos_settings(uint32_t selection_mask)
 }
 EXPORT_SYMBOL(cam_cpas_select_qos_settings);
 
-int cam_cpas_enable_tpg_mux_sel(uint32_t tpg_mux_sel)
-{
-	int rc = 0;
-
-	if (!CAM_CPAS_INTF_INITIALIZED()) {
-		CAM_ERR(CAM_CPAS, "cpas intf not initialized");
-		return -EBADR;
-	}
-
-	if (g_cpas_intf->hw_intf->hw_ops.process_cmd) {
-		rc = g_cpas_intf->hw_intf->hw_ops.process_cmd(
-			g_cpas_intf->hw_intf->hw_priv,
-			CAM_CPAS_HW_CMD_TPG_MUX_SEL, &tpg_mux_sel,
-			sizeof(tpg_mux_sel));
-		if (rc)
-			CAM_ERR(CAM_CPAS, "Failed in process_cmd, rc=%d", rc);
-	} else {
-		CAM_ERR(CAM_CPAS, "Invalid process_cmd ops");
-		rc = -EBADR;
-	}
-
-	return rc;
-}
-EXPORT_SYMBOL(cam_cpas_enable_tpg_mux_sel);
-
 int cam_cpas_notify_event(const char *identifier_string,
 	int32_t identifier_value)
 {
@@ -1149,154 +1116,6 @@ int cam_cpas_dump_state_monitor_info(struct cam_req_mgr_dump_info *info)
 }
 EXPORT_SYMBOL(cam_cpas_dump_state_monitor_info);
 
-#ifdef CONFIG_DYNAMIC_FD_PORT_CONFIG
-static int cam_cpas_handle_fd_port_config(uint32_t is_secure)
-{
-	int rc = 0;
-	struct Object client_env, sc_object;
-	struct cam_hw_info *cpas_hw = NULL;
-	struct cam_cpas *cpas_core;
-
-	if (!CAM_CPAS_INTF_INITIALIZED()) {
-		CAM_ERR(CAM_CPAS, "cpas intf not initialized");
-		return -EINVAL;
-	}
-
-	cpas_hw = (struct cam_hw_info *) g_cpas_intf->hw_intf->hw_priv;
-	if (cpas_hw) {
-		cpas_core = (struct cam_cpas *) cpas_hw->core_info;
-		mutex_lock(&cpas_hw->hw_mutex);
-		if (cpas_core->streamon_clients > 0) {
-			CAM_ERR(CAM_CPAS,
-				"FD port config can not be updated during the session");
-			mutex_unlock(&cpas_hw->hw_mutex);
-			return -EINVAL;
-		}
-	} else {
-		CAM_ERR(CAM_CPAS, "cpas_hw handle not initialized");
-		return -EINVAL;
-	}
-
-	/* Need to vote first before enabling clocks */
-	rc = cam_cpas_util_vote_default_ahb_axi(cpas_hw, true);
-	if (rc) {
-		CAM_ERR(CAM_CPAS,
-			"failed to vote for the default ahb/axi clock, rc=%d", rc);
-		goto release_mutex;
-	}
-
-	rc = cam_cpas_soc_enable_resources(&cpas_hw->soc_info,
-		cpas_hw->soc_info.lowest_clk_level);
-	if (rc) {
-		CAM_ERR(CAM_CPAS, "failed in soc_enable_resources, rc=%d", rc);
-		goto remove_default_vote;
-	}
-
-	rc = get_client_env_object(&client_env);
-	if (rc) {
-		CAM_ERR(CAM_CPAS, "Failed getting mink env object, rc: %d", rc);
-		goto disable_resources;
-	}
-
-	rc = IClientEnv_open(client_env, CTrustedCameraDriver_UID, &sc_object);
-	if (rc) {
-		CAM_ERR(CAM_CPAS, "Failed getting mink sc_object, rc: %d", rc);
-		goto client_release;
-	}
-
-	rc = ITrustedCameraDriver_dynamicConfigureFDPort(sc_object, is_secure);
-	if (rc) {
-		if (rc == CAM_CPAS_ERROR_NOT_ALLOWED) {
-			CAM_ERR(CAM_CPAS, "Dynamic FD port config not allowed");
-			rc = -EPERM;
-		} else {
-			CAM_ERR(CAM_CPAS, "Mink secure call failed, rc: %d", rc);
-			rc = -EINVAL;
-		}
-		goto obj_release;
-	}
-
-	rc = Object_release(sc_object);
-	if (rc) {
-		CAM_ERR(CAM_CSIPHY, "Failed releasing secure camera object, rc: %d", rc);
-		goto client_release;
-	}
-
-	rc = Object_release(client_env);
-	if (rc) {
-		CAM_ERR(CAM_CSIPHY, "Failed releasing mink env object, rc: %d", rc);
-		goto disable_resources;
-	}
-
-	rc = cam_cpas_soc_disable_resources(&cpas_hw->soc_info, true, true);
-	if (rc) {
-		CAM_ERR(CAM_CPAS, "failed in soc_disable_resources, rc=%d", rc);
-		goto remove_default_vote;
-	}
-
-	rc = cam_cpas_util_vote_default_ahb_axi(cpas_hw, false);
-	if (rc)
-		CAM_ERR(CAM_CPAS,
-			"failed remove the vote on ahb/axi clock, rc=%d", rc);
-
-	mutex_unlock(&cpas_hw->hw_mutex);
-	return rc;
-
-obj_release:
-	Object_release(sc_object);
-client_release:
-	Object_release(client_env);
-disable_resources:
-	cam_cpas_soc_disable_resources(&cpas_hw->soc_info, true, true);
-remove_default_vote:
-	cam_cpas_util_vote_default_ahb_axi(cpas_hw, false);
-release_mutex:
-	mutex_unlock(&cpas_hw->hw_mutex);
-	return rc;
-}
-#endif
-
-static int cam_cpas_handle_custom_config_cmd(struct cam_cpas_intf *cpas_intf,
-	struct cam_custom_cmd *cmd)
-{
-	int32_t rc = 0;
-
-	if (!cmd) {
-		CAM_ERR(CAM_CPAS, "Invalid input cmd");
-		return -EINVAL;
-	}
-
-	switch (cmd->cmd_type) {
-#ifdef CONFIG_DYNAMIC_FD_PORT_CONFIG
-	case CAM_CPAS_CUSTOM_CMD_FD_PORT_CFG: {
-		struct cam_cpas_fd_port_config cfg;
-
-		if (cmd->size < sizeof(cfg))
-			return -EINVAL;
-
-		rc = copy_from_user(&cfg, u64_to_user_ptr(cmd->handle),
-			sizeof(cfg));
-		if (rc) {
-			CAM_ERR(CAM_CPAS, "Failed in copy from user, rc=%d",
-				rc);
-			rc = -EINVAL;
-			break;
-		}
-
-		rc = cam_cpas_handle_fd_port_config(cfg.is_secure);
-		break;
-	}
-#endif
-	default:
-		CAM_ERR(CAM_CPAS, "Invalid custom command %d for CPAS", cmd->cmd_type);
-		rc = -EINVAL;
-		break;
-
-	}
-
-	return rc;
-}
-
 int cam_cpas_subdev_cmd(struct cam_cpas_intf *cpas_intf,
 	struct cam_control *cmd)
 {
@@ -1389,19 +1208,6 @@ int cam_cpas_subdev_cmd(struct cam_cpas_intf *cpas_intf,
 
 		break;
 	}
-	case CAM_CUSTOM_DEV_CONFIG: {
-		struct cam_custom_cmd custom_cmd;
-
-		rc = copy_from_user(&custom_cmd, u64_to_user_ptr(cmd->handle),
-			sizeof(custom_cmd));
-		if (rc) {
-			CAM_ERR(CAM_CPAS, "Failed in copy from user, rc=%d",
-				rc);
-			break;
-		}
-		rc = cam_cpas_handle_custom_config_cmd(cpas_intf, &custom_cmd);
-		break;
-	}
 	case CAM_SD_SHUTDOWN:
 		break;
 	default:

qcom/opensource/camera-kernel/drivers/cam_cpas/cam_cpas_soc.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/device.h>
@@ -1455,9 +1455,6 @@ int cam_cpas_get_custom_dt_info(struct cam_hw_info *cpas_hw,
 		soc_private->num_vdd_ahb_mapping = count;
 	}
 
-	soc_private->enable_secure_qos_update = of_property_read_bool(of_node,
-			"enable-secure-qos-update");
-
 	soc_private->enable_smart_qos = of_property_read_bool(of_node,
 			"enable-smart-qos");
 

qcom/opensource/camera-kernel/drivers/cam_cpas/cam_cpas_soc.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_CPAS_SOC_H_
@@ -268,7 +268,6 @@ struct cam_cpas_sysfs_info {
  * @num_caches: Number of last level caches
  * @part_info: Camera Hw subpart info
  * @llcc_info: Cache info
- * @enable_secure_qos_update: whether to program QoS securely on current chipset
  * @enable_smart_qos: Whether to enable Smart QoS mechanism on current chipset
  * @enable_cam_ddr_drv: Whether to enable Camera DDR DRV on current chipset
  * @enable_cam_clk_drv: Whether to enable Camera Clk DRV on current chipset
@@ -304,7 +303,6 @@ struct cam_cpas_private_soc {
 	bool enable_smart_qos;
 	bool enable_cam_ddr_drv;
 	bool enable_cam_clk_drv;
-	bool enable_secure_qos_update;
 	struct cam_cpas_smart_qos_info *smart_qos_info;
 	int32_t icp_clk_index;
 	struct cam_cpas_domain_id_info domain_id_info;

qcom/opensource/camera-kernel/drivers/cam_cpas/camss_top/cam_camsstop_hw.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2018, 2020 The Linux Foundation. All rights reserved.
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "cam_cpas_hw_intf.h"
@@ -81,7 +80,6 @@ int cam_camsstop_get_internal_ops(struct cam_cpas_internal_ops *internal_ops)
 	internal_ops->setup_qos_settings = NULL;
 	internal_ops->print_poweron_settings = NULL;
 	internal_ops->qchannel_handshake = NULL;
-	internal_ops->set_tpg_mux_sel = NULL;
 
 	return 0;
 }

qcom/opensource/camera-kernel/drivers/cam_cpas/cpas_top/cam_cpastop_hw.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/delay.h>
@@ -36,19 +36,13 @@
 #include "cpastop_v165_100.h"
 #include "cpastop_v780_100.h"
 #include "cpastop_v640_200.h"
-#include "cpastop_v640_210.h"
 #include "cpastop_v880_100.h"
 #include "cpastop_v980_100.h"
-#include "cpastop_v860_100.h"
-#include "cpastop_v770_100.h"
-#include "cpastop_v665_100.h"
 #include "cam_req_mgr_workq.h"
 #include "cam_common_util.h"
 
 struct cam_camnoc_info *camnoc_info[CAM_CAMNOC_HW_TYPE_MAX];
 struct cam_cpas_info *cpas_info;
-struct cam_cpas_camnoc_qchannel *qchannel_info;
-struct cam_cpas_top_regs *cpas_top_info;
 
 #if (defined(CONFIG_CAM_TEST_IRQ_LINE) && defined(CONFIG_CAM_TEST_IRQ_LINE_AT_PROBE))
 	struct completion test_irq_hw_complete[CAM_CAMNOC_HW_TYPE_MAX];
@@ -76,7 +70,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_170 */
 	{
@@ -86,7 +79,6 @@ static const uint32_t cam_cpas_hw_version_map
 		CAM_CPAS_TITAN_170_V120,
 		0,
 		CAM_CPAS_TITAN_170_V200,
-		0,
 	},
 	/* for camera_175 */
 	{
@@ -96,7 +88,6 @@ static const uint32_t cam_cpas_hw_version_map
 		CAM_CPAS_TITAN_175_V120,
 		CAM_CPAS_TITAN_175_V130,
 		0,
-		0,
 	},
 	/* for camera_480 */
 	{
@@ -106,7 +97,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_580 */
 	{
@@ -116,7 +106,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_520 */
 	{
@@ -126,7 +115,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 
 	},
 	/* for camera_540 */
@@ -137,7 +125,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_545 */
 	{
@@ -147,7 +134,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_570 */
 	{
@@ -157,7 +143,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		CAM_CPAS_TITAN_570_V200,
-		0,
 	},
 	/* for camera_680 */
 	{
@@ -167,7 +152,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_165 */
 	{
@@ -177,7 +161,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_780 */
 	{
@@ -187,7 +170,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_640 */
 	{
@@ -197,7 +179,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		CAM_CPAS_TITAN_640_V200,
-		CAM_CPAS_TITAN_640_V210,
 	},
 	/* for camera_880 */
 	{
@@ -207,7 +188,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
 	},
 	/* for camera_980 */
 	{
@@ -217,37 +197,6 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		0,
 		0,
-		0,
-	},
-	/* for camera_860 */
-	{
-		CAM_CPAS_TITAN_860_V100,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-	},
-	/* for camera_770 */
-	{
-		CAM_CPAS_TITAN_770_V100,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-	},
-	/* for camera_665 */
-	{
-		CAM_CPAS_TITAN_665_V100,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
 	},
 };
 
@@ -330,15 +279,6 @@ static int cam_cpas_translate_camera_cpas_version_id(
 	case CAM_CPAS_CAMERA_VERSION_980:
 		*cam_version_id = CAM_CPAS_CAMERA_VERSION_ID_980;
 		break;
-	case CAM_CPAS_CAMERA_VERSION_860:
-		*cam_version_id = CAM_CPAS_CAMERA_VERSION_ID_860;
-		break;
-	case CAM_CPAS_CAMERA_VERSION_770:
-		*cam_version_id = CAM_CPAS_CAMERA_VERSION_ID_770;
-		break;
-	case CAM_CPAS_CAMERA_VERSION_665:
-		*cam_version_id = CAM_CPAS_CAMERA_VERSION_ID_665;
-		break;
 	default:
 		CAM_ERR(CAM_CPAS, "Invalid cam version %u",
 			cam_version);
@@ -370,10 +310,6 @@ static int cam_cpas_translate_camera_cpas_version_id(
 		*cpas_version_id = CAM_CPAS_VERSION_ID_200;
 		break;
 
-	case CAM_CPAS_VERSION_210:
-		*cpas_version_id = CAM_CPAS_VERSION_ID_210;
-		break;
-
 	default:
 		CAM_ERR(CAM_CPAS, "Invalid cpas version %u",
 			cpas_version);
@@ -1040,72 +976,59 @@ static int cam_cpastop_print_poweron_settings(struct cam_hw_info *cpas_hw)
 
 static int cam_cpastop_poweron(struct cam_hw_info *cpas_hw)
 {
-	int i, j, rc = 0;
+	int i, j;
 	struct cam_cpas_hw_errata_wa_list *errata_wa_list;
 	struct cam_cpas_hw_errata_wa *errata_wa;
 	struct cam_cpas *cpas_core = cpas_hw->core_info;
-	struct cam_cpas_private_soc *soc_private =
-		(struct cam_cpas_private_soc *) cpas_hw->soc_info.soc_private;
 	bool errata_enabled = false;
 
 	for (i = 0; i < cpas_core->num_valid_camnoc; i++)
 		cam_cpastop_reset_irq(0x0, cpas_hw, i);
 
-	if (!soc_private->enable_secure_qos_update) {
-		for (i = 0; i < cpas_core->num_valid_camnoc; i++) {
-			CAM_DBG(CAM_CPAS, "QOS settings for %s :",
-				camnoc_info[i]->camnoc_name);
-			for (j = 0; j < camnoc_info[i]->specific_size; j++) {
-				if (camnoc_info[i]->specific[j].enable) {
-					CAM_DBG(CAM_CPAS,
-						"Updating QoS settings port: %d prot name: %s",
-						camnoc_info[i]->specific[j].port_type,
-						camnoc_info[i]->specific[j].port_name);
-
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].priority_lut_low);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].priority_lut_high);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].urgency);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].danger_lut);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].safe_lut);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].ubwc_ctl);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].flag_out_set0_low);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].dynattr_mainctl);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].qosgen_mainctl);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].qosgen_shaping_low);
-					cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
-						&camnoc_info[i]->specific[j].qosgen_shaping_high);
-				}
+	for (i = 0; i < cpas_core->num_valid_camnoc; i++) {
+		CAM_DBG(CAM_CPAS, "QOS settings for %s :",
+			camnoc_info[i]->camnoc_name);
+		for (j = 0; j < camnoc_info[i]->specific_size; j++) {
+			if (camnoc_info[i]->specific[j].enable) {
+				CAM_DBG(CAM_CPAS,
+					"Updating QoS settings port: %d prot name: %s",
+					camnoc_info[i]->specific[j].port_type,
+					camnoc_info[i]->specific[j].port_name);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].priority_lut_low);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].priority_lut_high);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].urgency);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].danger_lut);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].safe_lut);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].ubwc_ctl);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].flag_out_set0_low);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].dynattr_mainctl);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].qosgen_mainctl);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].qosgen_shaping_low);
+				cam_cpas_util_reg_update(cpas_hw, camnoc_info[i]->reg_base,
+					&camnoc_info[i]->specific[j].qosgen_shaping_high);
 			}
+		}
 
-			if (!errata_enabled) {
-				errata_wa_list = camnoc_info[i]->errata_wa_list;
-				if (errata_wa_list) {
-					errata_wa = &errata_wa_list->tcsr_camera_hf_sf_ares_glitch;
-					if (errata_wa->enable) {
-						cam_cpastop_scm_write(errata_wa);
-						errata_enabled = true;
-					}
+		if (!errata_enabled) {
+			errata_wa_list = camnoc_info[i]->errata_wa_list;
+			if (errata_wa_list) {
+				errata_wa = &errata_wa_list->tcsr_camera_hf_sf_ares_glitch;
+				if (errata_wa->enable) {
+					cam_cpastop_scm_write(errata_wa);
+					errata_enabled = true;
 				}
 			}
 		}
-	} else {
-		CAM_DBG(CAM_CPAS, "Updating secure camera static QoS settings");
-		rc = cam_update_camnoc_qos_settings(CAM_QOS_UPDATE_TYPE_STATIC, 0, NULL);
-		if (rc) {
-			CAM_ERR(CAM_CPAS, "Secure camera static OoS update failed: %d", rc);
-			return rc;
-		}
-		CAM_DBG(CAM_CPAS, "Updated secure camera static QoS settings");
 	}
 
 	return 0;
@@ -1354,33 +1277,6 @@ static int cam_cpastop_get_hw_capability(struct cam_hw_info *cpas_hw)
 	return 0;
 }
 
-static int cam_cpastop_set_tpg_mux_sel(struct cam_hw_info *cpas_hw,
-	uint32_t tpg_mux)
-{
-	struct cam_cpas *cpas_core = (struct cam_cpas *) cpas_hw->core_info;
-	struct cam_hw_soc_info *soc_info = &cpas_hw->soc_info;
-	int reg_cpas_top;
-	uint32_t curr_tpg_mux = 0;
-
-	reg_cpas_top = cpas_core->regbase_index[CAM_CPAS_REG_CPASTOP];
-
-	if (cpas_top_info == NULL)
-		return 0;
-
-	if (!cpas_top_info->tpg_mux_sel_enabled)
-		return 0;
-
-	curr_tpg_mux = cam_io_r_mb(soc_info->reg_map[reg_cpas_top].mem_base +
-		cpas_top_info->tpg_mux_sel);
-
-	curr_tpg_mux = curr_tpg_mux | ((1 << tpg_mux) << cpas_top_info->tpg_mux_sel_shift);
-	cam_io_w_mb(curr_tpg_mux, soc_info->reg_map[reg_cpas_top].mem_base +
-		cpas_top_info->tpg_mux_sel);
-	CAM_DBG(CAM_CPAS, "SET TPG MUX to 0x%x", curr_tpg_mux);
-
-	return 0;
-}
-
 static int cam_cpastop_init_hw_version(struct cam_hw_info *cpas_hw,
 	struct cam_cpas_hw_caps *hw_caps)
 {
@@ -1390,9 +1286,6 @@ static int cam_cpastop_init_hw_version(struct cam_hw_info *cpas_hw,
 	struct cam_cpas_cesta_info *cesta_info = NULL;
 	struct cam_camnoc_info *alloc_camnoc_info[CAM_CAMNOC_HW_TYPE_MAX] = {0};
 
-	qchannel_info = NULL;
-	cpas_top_info = NULL;
-
 	CAM_DBG(CAM_CPAS,
 		"hw_version=0x%x Camera Version %d.%d.%d, cpas version %d.%d.%d",
 		soc_info->hw_version,
@@ -1483,12 +1376,6 @@ static int cam_cpastop_init_hw_version(struct cam_hw_info *cpas_hw,
 	case CAM_CPAS_TITAN_640_V200:
 		alloc_camnoc_info[CAM_CAMNOC_HW_COMBINED] = &cam640_cpas200_camnoc_info;
 		cpas_info = &cam640_cpas200_cpas_info;
-		cpas_top_info = &cam640_cpas200_cpas_top_info;
-		break;
-	case CAM_CPAS_TITAN_640_V210:
-		alloc_camnoc_info[CAM_CAMNOC_HW_COMBINED] = &cam640_cpas210_camnoc_info;
-		cpas_info = &cam640_cpas210_cpas_info;
-		cpas_top_info = &cam640_cpas210_cpas_top_info;
 		break;
 	case CAM_CPAS_TITAN_880_V100:
 		alloc_camnoc_info[CAM_CAMNOC_HW_COMBINED] = &cam880_cpas100_camnoc_info;
@@ -1501,21 +1388,6 @@ static int cam_cpastop_init_hw_version(struct cam_hw_info *cpas_hw,
 		cpas_info = &cam980_cpas100_cpas_info;
 		cesta_info = &cam_v980_cesta_info;
 		break;
-	case CAM_CPAS_TITAN_860_V100:
-		alloc_camnoc_info[CAM_CAMNOC_HW_COMBINED] = &cam860_cpas100_camnoc_info;
-		cpas_info = &cam860_cpas100_cpas_info;
-		cesta_info = &cam_v860_cesta_info;
-		break;
-	case CAM_CPAS_TITAN_770_V100:
-		alloc_camnoc_info[CAM_CAMNOC_HW_COMBINED] = &cam770_cpas100_camnoc_info;
-		cpas_info = &cam770_cpas100_cpas_info;
-		cpas_top_info = &cam770_cpas100_cpas_top_info;
-		break;
-	case CAM_CPAS_TITAN_665_V100:
-		alloc_camnoc_info[CAM_CAMNOC_HW_COMBINED] = &cam665_cpas100_camnoc_info;
-		cpas_info = &cam665_cpas100_cpas_info;
-		cpas_top_info = &cam665_cpas100_cpas_top_info;
-		break;
 	default:
 		CAM_ERR(CAM_CPAS, "Camera Version not supported %d.%d.%d",
 			hw_caps->camera_version.major,
@@ -1599,7 +1471,6 @@ int cam_cpastop_get_internal_ops(struct cam_cpas_internal_ops *internal_ops)
 	internal_ops->print_poweron_settings =
 		cam_cpastop_print_poweron_settings;
 	internal_ops->qchannel_handshake = cam_cpastop_qchannel_handshake;
-	internal_ops->set_tpg_mux_sel = cam_cpastop_set_tpg_mux_sel;
 
 	return 0;
 }

qcom/opensource/camera-kernel/drivers/cam_cpas/cpas_top/cam_cpastop_hw.h

@@ -534,17 +534,4 @@ struct cam_cpas_info {
 	uint8_t num_qchannel;
 };
 
-/**
- * struct cam_cpas_top_regs : CPAS Top registers
- * @tpg_mux_sel_shift:     TPG mux select shift value
- * @tpg_mux_sel:           For selecting TPG
- * @tpg_mux_sel_enabled:   TPG mux select enabled or not
- *
- */
-struct cam_cpas_top_regs {
-	uint32_t tpg_mux_sel_shift;
-	uint32_t tpg_mux_sel;
-	bool     tpg_mux_sel_enabled;
-};
-
 #endif /* _CAM_CPASTOP_HW_H_ */

qcom/opensource/camera-kernel/drivers/cam_cpas/cpas_top/cpastop_v640_200.h

@@ -547,9 +547,6 @@ static struct cam_camnoc_err_logger_info cam640_cpas200_err_logger_offsets = {
 };
 
 static struct cam_cpas_hw_errata_wa_list cam640_cpas200_errata_wa_list = {
-	.enable_icp_clk_for_qchannel = {
-		.enable = true,
-	},
 };
 
 static struct cam_camnoc_info cam640_cpas200_camnoc_info = {
@@ -576,11 +573,5 @@ static struct cam_cpas_info cam640_cpas200_cpas_info = {
 	.num_qchannel = 1,
 };
 
-static struct cam_cpas_top_regs cam640_cpas200_cpas_top_info = {
-	.tpg_mux_sel_enabled = true,
-	.tpg_mux_sel_shift   = 0x0,
-	.tpg_mux_sel         = 0x1C,
-};
-
 #endif /* _CPASTOP_V640_200_H_ */
 

qcom/opensource/camera-kernel/drivers/cam_cpas/cpas_top/cpastop_v640_210.h

@@ -1,583 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CPASTOP_V640_210_H_
-#define _CPASTOP_V640_210_H_
-
-#define TEST_IRQ_ENABLE 0
-
-static struct cam_camnoc_irq_sbm cam_cpas_v640_210_irq_sbm = {
-	.sbm_enable = {
-		.access_type = CAM_REG_TYPE_READ_WRITE,
-		.enable = true,
-		.offset = 0x6840, /* CAM_NOC_SBM_FAULTINEN0_LOW */
-		.value = 0x2 |    /* SBM_FAULTINEN0_LOW_PORT1_MASK */
-			0x04 |     /* SBM_FAULTINEN0_LOW_PORT2_MASK */
-			0x08 |     /* SBM_FAULTINEN0_LOW_PORT3_MASK */
-			0x10 |    /* SBM_FAULTINEN0_LOW_PORT4_MASK */
-			0x20 |    /* SBM_FAULTINEN0_LOW_PORT5_MASK */
-			(TEST_IRQ_ENABLE ?
-			0x80 :    /* SBM_FAULTINEN0_LOW_PORT7_MASK */
-			0x0),
-	},
-	.sbm_status = {
-		.access_type = CAM_REG_TYPE_READ,
-		.enable = true,
-		.offset = 0x6848, /* CAM_NOC_SBM_FAULTINSTATUS0_LOW */
-	},
-	.sbm_clear = {
-		.access_type = CAM_REG_TYPE_WRITE,
-		.enable = true,
-		.offset = 0x6880, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		.value = TEST_IRQ_ENABLE ? 0x5 : 0x1,
-	}
-};
-
-static struct cam_camnoc_irq_err
-	cam_cpas_v640_210_irq_err[] = {
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_SLAVE_ERROR,
-		.enable = false,
-		.sbm_port = 0x1, /* SBM_FAULTINSTATUS0_LOW */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x6608, /* CAM_NOC_ERL_MAINCTL_LOW */
-			.value = 1,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x6610, /* CAM_NOC_ERL_ERRVLD_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x6618, /* CAM_NOC_ERL_ERRCLR_LOW */
-			.value = 1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE_UBWC_ENCODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x2, /* SBM_FAULTINSTATUS0_LOW_PORT1_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x5DA0, /* WR_NIU_ENCERREN_LOW */
-			.value = 0XF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x5D90, /* WR_NIU_ENCERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x5D98, /* WR_NIU_ENCERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE0_UBWC_DECODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x4, /* SBM_FAULTINSTATUS0_LOW_PORT2_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x5F20, /* CAM_NOC_IPE_0_RD_NIU_DECERREN_LOW */
-			.value = 0xFF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x5F10, /* CAM_NOC_IPE_0_RD_NIU_DECERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x5F18, /* CAM_NOC_IPE_0_RD_NIU_DECERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_AHB_TIMEOUT,
-		.enable = false,
-		.sbm_port = 0x40, /* SBM_FAULTINSTATUS0_LOW_PORT6_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x6888, /* CAM_NOC_SBM_FLAGOUTSET0_LOW */
-			.value = 0x1,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x6890, /* CAM_NOC_SBM_FLAGOUTSTATUS0_LOW */
-		},
-		.err_clear = {
-			.enable = false, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED1,
-		.enable = false,
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED2,
-		.enable = false,
-	},
-};
-
-static struct cam_camnoc_specific
-	cam_cpas_v640_210_camnoc_specific[] = {
-	{
-		.port_type = CAM_CAMNOC_TFE_BAYER_STATS,
-		.port_name = "TFE_BAYER",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5830, /*PRIORITYLUT_LOW */
-			.value = 0x55554433,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5834, /* PRIORITYLUT_HIGH */
-			.value = 0x66666666,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5838, /* URGENCY_LOW */
-			.value = 0x00001030,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5840, /* DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5848, /* SAFELUT_LOW */
-			.value = 0x0000000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4208, /* QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4220, /* QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4224, /* QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x5820, /* UBWC_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_TFE_RAW,
-		.port_name = "TFE_RDI_RAW",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5A30, /* PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5A34, /* PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5A38, /* URGENCY_LOW */
-			.value = 0x00001030,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5A40, /* DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5A48, /* SAFELUT_LOW */
-			.value = 0x000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4408, /* QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4420, /* QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4424, /* QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x5A20, /* STATS_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_OPE_BPS_WR,
-		.port_name = "OPE_BPS_WR",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5C30, /* PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5C34, /* PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5C38, /* URGENCY_LOW */
-			.value = 0x00000030,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5C40, /* DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5C48, /* SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4608, /* QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4620, /* QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4624, /* QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x5C20, /* MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_OPE_BPS_CDM_RD,
-		.port_name = "OPE_BPS_CDM_RD",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5E30, /* IPE_WR_PRIORITYLUT_LOW */
-			.value = 0x55554433,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5E34, /* IPE_WR_PRIORITYLUT_HIGH */
-			.value = 0x66666666,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5E38, /* IPE_WR_URGENCY_LOW */
-			.value = 0x3,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5E40, /* IPE_WR_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x5E48, /* IPE_WR_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4808, /* IPE_WR_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4820, /* IPE_WR_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4824, /* IPE_WR_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_CRE,
-		.port_name = "CRE_RD_WR",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x6030, /* BPS_WR_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x6034, /* BPS_WR_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x6038, /* BPS_WR_URGENCY_LOW */
-			.value = 0x03,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x6040, /* BPS_WR_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x6048, /* BPS_WR_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4A08, /* BPS_WR_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4A20, /* BPS_WR_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4A24, /* BPS_WR_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x6020, /* BPS_WR_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_ICP,
-		.port_name = "ICP",
-		.enable = false,
-		.flag_out_set0_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_WRITE,
-			.masked_value = 0,
-			.offset = 0x6888,
-			.value = 0x100000,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4008, /* ICP_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4020, /* ICP_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x4024, /* ICP_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-};
-
-static struct cam_camnoc_err_logger_info cam640_cpas210_err_logger_offsets = {
-	.mainctrl     =  0x6608, /* ERRLOGGER_MAINCTL_LOW */
-	.errvld       =  0x6610, /* ERRLOGGER_ERRVLD_LOW */
-	.errlog0_low  =  0x6620, /* ERRLOGGER_ERRLOG0_LOW */
-	.errlog0_high =  0x6624, /* ERRLOGGER_ERRLOG0_HIGH */
-	.errlog1_low  =  0x6628, /* ERRLOGGER_ERRLOG1_LOW */
-	.errlog1_high =  0x662c, /* ERRLOGGER_ERRLOG1_HIGH */
-	.errlog2_low  =  0x6630, /* ERRLOGGER_ERRLOG2_LOW */
-	.errlog2_high =  0x6634, /* ERRLOGGER_ERRLOG2_HIGH */
-	.errlog3_low  =  0x6638, /* ERRLOGGER_ERRLOG3_LOW */
-	.errlog3_high =  0x663c, /* ERRLOGGER_ERRLOG3_HIGH */
-};
-
-static struct cam_cpas_hw_errata_wa_list cam640_cpas210_errata_wa_list = {
-};
-
-static struct cam_camnoc_info cam640_cpas210_camnoc_info = {
-	.specific = &cam_cpas_v640_210_camnoc_specific[0],
-	.specific_size = ARRAY_SIZE(cam_cpas_v640_210_camnoc_specific),
-	.irq_sbm = &cam_cpas_v640_210_irq_sbm,
-	.irq_err = &cam_cpas_v640_210_irq_err[0],
-	.irq_err_size = ARRAY_SIZE(cam_cpas_v640_210_irq_err),
-	.err_logger = &cam640_cpas210_err_logger_offsets,
-	.errata_wa_list = &cam640_cpas210_errata_wa_list,
-};
-
-static struct cam_cpas_camnoc_qchannel cam640_cpas210_qchannel_info = {
-	.qchannel_ctrl   = 0x14,
-	.qchannel_status = 0x18,
-};
-
-static struct cam_cpas_info cam640_cpas210_cpas_info = {
-	.hw_caps_info = {
-		.num_caps_registers = 1,
-		.hw_caps_offsets = {0x8},
-	},
-	.qchannel_info = {&cam640_cpas210_qchannel_info},
-	.num_qchannel = 1,
-};
-
-static struct cam_cpas_top_regs cam640_cpas210_cpas_top_info = {
-	.tpg_mux_sel_enabled = true,
-	.tpg_mux_sel_shift   = 0x0,
-	.tpg_mux_sel         = 0x1C,
-};
-
-#endif /* _CPASTOP_V640_210_H_ */
-

qcom/opensource/camera-kernel/drivers/cam_cpas/cpas_top/cpastop_v665_100.h

@@ -1,649 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CPASTOP_V665_100_H_
-#define _CPASTOP_V665_100_H_
-
-#define TEST_IRQ_ENABLE 0
-
-static struct cam_camnoc_irq_sbm cam_cpas_v665_100_irq_sbm = {
-	.sbm_enable = {
-		.access_type = CAM_REG_TYPE_READ_WRITE,
-		.enable = true,
-		.offset = 0x240, /* CAM_NOC_SBM_FAULTINEN0_LOW */
-		.value = 0x2 |    /* SBM_FAULTINEN0_LOW_PORT1_MASK */
-			0x04 |     /* SBM_FAULTINEN0_LOW_PORT2_MASK */
-			0x08 |     /* SBM_FAULTINEN0_LOW_PORT3_MASK */
-			0x10 |    /* SBM_FAULTINEN0_LOW_PORT4_MASK */
-			0x20 |    /* SBM_FAULTINEN0_LOW_PORT5_MASK */
-			(TEST_IRQ_ENABLE ?
-			0x80 :    /* SBM_FAULTINEN0_LOW_PORT7_MASK */
-			0x0),
-	},
-	.sbm_status = {
-		.access_type = CAM_REG_TYPE_READ,
-		.enable = true,
-		.offset = 0x248, /* CAM_NOC_SBM_FAULTINSTATUS0_LOW */
-	},
-	.sbm_clear = {
-		.access_type = CAM_REG_TYPE_WRITE,
-		.enable = true,
-		.offset = 0x280, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		.value = TEST_IRQ_ENABLE ? 0x5 : 0x1,
-	}
-};
-
-static struct cam_camnoc_irq_err
-	cam_cpas_v665_100_irq_err[] = {
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_SLAVE_ERROR,
-		.enable = false,
-		.sbm_port = 0x1, /* SBM_FAULTINSTATUS0_LOW */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x8, /* CAM_NOC_ERL_MAINCTL_LOW */
-			.value = 1,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x10, /* CAM_NOC_ERL_ERRVLD_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x18, /* CAM_NOC_ERL_ERRCLR_LOW */
-			.value = 1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE_UBWC_ENCODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x2, /* SBM_FAULTINSTATUS0_LOW_PORT1_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x89A0, /* WR_NIU_ENCERREN_LOW */
-			.value = 0XF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x8990, /* WR_NIU_ENCERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x8998, /* WR_NIU_ENCERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE0_UBWC_DECODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x4, /* SBM_FAULTINSTATUS0_LOW_PORT2_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x8720, /* CAM_NOC_IPE_0_RD_NIU_DECERREN_LOW */
-			.value = 0xFF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x8710, /* CAM_NOC_IPE_0_RD_NIU_DECERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x8718, /* CAM_NOC_IPE_0_RD_NIU_DECERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_AHB_TIMEOUT,
-		.enable = false,
-		.sbm_port = 0x40, /* SBM_FAULTINSTATUS0_LOW_PORT6_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x288, /* CAM_NOC_SBM_FLAGOUTSET0_LOW */
-			.value = 0x1,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x290, /* CAM_NOC_SBM_FLAGOUTSTATUS0_LOW */
-		},
-		.err_clear = {
-			.enable = false, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED1,
-		.enable = false,
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED2,
-		.enable = false,
-	},
-};
-
-static struct cam_camnoc_specific
-	cam_cpas_v665_100_camnoc_specific[] = {
-	{
-		.port_type = CAM_CAMNOC_TFE_BAYER_STATS,
-		.port_name = "TFE_BAYER",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A30, /* TFE_BAYER_NIU_PRIORITYLUT_LOW */
-			.value = 0x55554433,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A34, /* TFE_BAYER_NIU_PRIORITYLUT_HIGH */
-			.value = 0x66555555,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A38, /* TFE_BAYER_NIU_URGENCY_LOW */
-			.value = 0x1030,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A40, /* TFE_BAYER_NIU_DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A48, /* TFE_BAYER_NIU_SAFELUT_LOW */
-			.value = 0x0000000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9008, /* TFE_BAYER_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9020, /* TFE_BAYER_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9024, /* TFE_BAYER_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8A20, /* TFE_BAYER_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_TFE_RAW,
-		.port_name = "TFE_RDI_RAW",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C30, /* TFE_RDI_NIU_PRIORITYLUT_LOW */
-			.value = 0x55554433,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C34, /* TFE_RDI_NIU_PRIORITYLUT_HIGH */
-			.value = 0x66555555,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C38, /* TFE_RDI_RAW_URGENCY_LOW */
-			.value = 0x1030,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C40, /* TFE_RDI_NIU_DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C48, /* TFE_RDI_NIU_SAFELUT_LOW */
-			.value = 0x0000000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9088, /* TFE_RDI_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x90A0, /* TFE_RDI_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x90A4, /* TFE_RDI_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8C20, /* TFE_RDI_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_OPE_BPS_WR,
-		.port_name = "OPE_BPS_WR",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8830, /* OFFLINE_WR_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8834, /* OFFLINE_WR_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8838, /* OFFLINE_WR_NIU_URGENCY_LOW */
-			.value = 0x030,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8840, /* OFFLINE_WR_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8848, /* OFFLINE_WR_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8F88, /* OFFLINE_WR_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8FA0, /* OFFLINE_WR_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8FA4, /* OFFLINE_WR_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8820, /* OFFLINE_WR_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_OPE_BPS_CDM_RD,
-		.port_name = "OPE_BPS_CDM_RD",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8630, /* OFFLINE_RD_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8634, /* OFFLINE_RD_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8638, /* OFFLINE_RD_NIU_URGENCY_LOW */
-			.value = 0x003,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8640, /* OFFLINE_RD_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8648, /* OFFLINE_RD_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8F08, /* OFFLINE_RD_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8F20, /* OFFLINE_RD_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8F24, /* OFFLINE_RD_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_CRE,
-		.port_name = "CRE_RD_WR",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8230, /* CRE_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8234, /* CRE_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8238, /* CRE_NIU_URGENCY_LOW */
-			.value = 0x033,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8240, /* CRE_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8248, /* CRE_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E88, /* CRE_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8EA0, /* CRE_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8EA4, /* CRE_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8220, /* CRE_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_CDM,
-		.port_name = "CDM",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8030, /* CDM_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8034, /* CDM_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8038, /* CDM_NIU_URGENCY_LOW */
-			.value = 0x3,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8040, /* CDM_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8048, /* CDM_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E08, /* CDM_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E20, /* CDM_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E24, /* CDM_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_ICP,
-		.port_name = "ICP",
-		.enable = false,
-		.flag_out_set0_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_WRITE,
-			.masked_value = 0,
-			.offset = 0x288,
-			.value = 0x100000,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9108, /* ICP_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9120, /* ICP_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9124, /* ICP_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-};
-
-static struct cam_camnoc_err_logger_info cam665_cpas100_err_logger_offsets = {
-	.mainctrl     =  0x8,    /* ERL_MAINCTL_LOW */
-	.errvld       =  0x10,   /* ERl_ERRVLD_LOW */
-	.errlog0_low  =  0x20,   /* ERL_ERRLOG0_LOW */
-	.errlog0_high =  0x24,   /* ERL_ERRLOG0_HIGH */
-	.errlog1_low  =  0x28,   /* ERL_ERRLOG1_LOW */
-	.errlog1_high =  0x2C,   /* ERL_ERRLOG1_HIGH */
-	.errlog2_low  =  0x30,   /* ERL_ERRLOG2_LOW */
-	.errlog2_high =  0x34,   /* ERL_ERRLOG2_HIGH */
-	.errlog3_low  =  0x38,   /* ERL_ERRLOG3_LOW */
-	.errlog3_high =  0x3C,   /* ERL_ERRLOG3_HIGH */
-};
-
-static struct cam_cpas_hw_errata_wa_list cam665_cpas100_errata_wa_list = {
-	.enable_icp_clk_for_qchannel = {
-		.enable = true,
-	},
-};
-
-static struct cam_camnoc_info cam665_cpas100_camnoc_info = {
-	.specific = &cam_cpas_v665_100_camnoc_specific[0],
-	.specific_size = ARRAY_SIZE(cam_cpas_v665_100_camnoc_specific),
-	.irq_sbm = &cam_cpas_v665_100_irq_sbm,
-	.irq_err = &cam_cpas_v665_100_irq_err[0],
-	.irq_err_size = ARRAY_SIZE(cam_cpas_v665_100_irq_err),
-	.err_logger = &cam665_cpas100_err_logger_offsets,
-	.errata_wa_list = &cam665_cpas100_errata_wa_list,
-};
-
-static struct cam_cpas_camnoc_qchannel cam665_cpas100_qchannel_info = {
-	.qchannel_ctrl   = 0x14,
-	.qchannel_status = 0x18,
-};
-
-static struct cam_cpas_info cam665_cpas100_cpas_info = {
-	.hw_caps_info = {
-		.num_caps_registers = 1,
-		.hw_caps_offsets = {0x8},
-	},
-	.qchannel_info = {&cam665_cpas100_qchannel_info},
-	.num_qchannel = 1,
-};
-
-static struct cam_cpas_top_regs cam665_cpas100_cpas_top_info = {
-	.tpg_mux_sel_enabled = true,
-	.tpg_mux_sel_shift   = 0x0,
-	.tpg_mux_sel         = 0x1C,
-};
-
-#endif /* _CPASTOP_V665_100_H_ */
-

qcom/opensource/camera-kernel/drivers/cam_cpas/cpas_top/cpastop_v770_100.h

@@ -1,692 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CPASTOP_V770_100_H_
-#define _CPASTOP_V770_100_H_
-
-#define TEST_IRQ_ENABLE 0
-
-static struct cam_camnoc_irq_sbm cam_cpas_v770_100_irq_sbm = {
-	.sbm_enable = {
-		.access_type = CAM_REG_TYPE_READ_WRITE,
-		.enable = true,
-		.offset = 0x240, /* CAM_NOC_SBM_FAULTINEN0_LOW */
-		.value = 0x2 |    /* SBM_FAULTINEN0_LOW_PORT1_MASK */
-			0x04 |     /* SBM_FAULTINEN0_LOW_PORT2_MASK */
-			0x08 |     /* SBM_FAULTINEN0_LOW_PORT3_MASK */
-			0x10 |    /* SBM_FAULTINEN0_LOW_PORT4_MASK */
-			0x20 |    /* SBM_FAULTINEN0_LOW_PORT5_MASK */
-			(TEST_IRQ_ENABLE ?
-			0x80 :    /* SBM_FAULTINEN0_LOW_PORT7_MASK */
-			0x0),
-	},
-	.sbm_status = {
-		.access_type = CAM_REG_TYPE_READ,
-		.enable = true,
-		.offset = 0x248, /* CAM_NOC_SBM_FAULTINSTATUS0_LOW */
-	},
-	.sbm_clear = {
-		.access_type = CAM_REG_TYPE_WRITE,
-		.enable = true,
-		.offset = 0x280, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		.value = TEST_IRQ_ENABLE ? 0x5 : 0x1,
-	}
-};
-
-static struct cam_camnoc_irq_err
-	cam_cpas_v770_100_irq_err[] = {
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_SLAVE_ERROR,
-		.enable = false,
-		.sbm_port = 0x1, /* SBM_FAULTINSTATUS0_LOW */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x8, /* CAM_NOC_ERL_MAINCTL_LOW */
-			.value = 1,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x10, /* CAM_NOC_ERL_ERRVLD_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x18, /* CAM_NOC_ERL_ERRCLR_LOW */
-			.value = 1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE_UBWC_ENCODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x2, /* SBM_FAULTINSTATUS0_LOW_PORT1_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x89A0, /* WR_NIU_ENCERREN_LOW */
-			.value = 0XF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x8990, /* WR_NIU_ENCERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x8998, /* WR_NIU_ENCERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE0_UBWC_DECODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x4, /* SBM_FAULTINSTATUS0_LOW_PORT2_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x8720, /* CAM_NOC_IPE_0_RD_NIU_DECERREN_LOW */
-			.value = 0xFF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x8710, /* CAM_NOC_IPE_0_RD_NIU_DECERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x8718, /* CAM_NOC_IPE_0_RD_NIU_DECERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_AHB_TIMEOUT,
-		.enable = false,
-		.sbm_port = 0x40, /* SBM_FAULTINSTATUS0_LOW_PORT6_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x288, /* CAM_NOC_SBM_FLAGOUTSET0_LOW */
-			.value = 0x1,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x290, /* CAM_NOC_SBM_FLAGOUTSTATUS0_LOW */
-		},
-		.err_clear = {
-			.enable = false, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED1,
-		.enable = false,
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED2,
-		.enable = false,
-	},
-};
-
-static struct cam_camnoc_specific
-	cam_cpas_v770_100_camnoc_specific[] = {
-	{
-		.port_type = CAM_CAMNOC_TFE_BAYER_STATS,
-		.port_name = "TFE_BAYER",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A30, /* TFE_BAYER_NIU_PRIORITYLUT_LOW */
-			.value = 0x66665433,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A34, /* TFE_BAYER_NIU_PRIORITYLUT_HIGH */
-			.value = 0x66666666,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A38, /* TFE_BAYER_NIU_URGENCY_LOW */
-			.value = 0x1030,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A40, /* TFE_BAYER_NIU_DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A48, /* TFE_BAYER_NIU_SAFELUT_LOW */
-			.value = 0x0000000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9008, /* TFE_BAYER_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9020, /* TFE_BAYER_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9024, /* TFE_BAYER_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8A20, /* TFE_BAYER_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_TFE_RAW,
-		.port_name = "TFE_RDI_RAW",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C30, /* TFE_RDI_NIU_PRIORITYLUT_LOW */
-			.value = 0x66665433,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C34, /* TFE_RDI_NIU_PRIORITYLUT_HIGH */
-			.value = 0x66666666,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C38, /* TFE_RDI_RAW_URGENCY_LOW */
-			.value = 0x1030,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C40, /* TFE_RDI_NIU_DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C48, /* TFE_RDI_NIU_SAFELUT_LOW */
-			.value = 0x0000000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9088, /* TFE_RDI_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x90A0, /* TFE_RDI_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x90A4, /* TFE_RDI_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8C20, /* TFE_RDI_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_OPE_BPS_WR,
-		.port_name = "OPE_BPS_WR",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8830, /* OFFLINE_WR_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8834, /* OFFLINE_WR_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8838, /* OFFLINE_WR_NIU_URGENCY_LOW */
-			.value = 0x030,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8840, /* OFFLINE_WR_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8848, /* OFFLINE_WR_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8F88, /* OFFLINE_WR_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8FA0, /* OFFLINE_WR_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8FA4, /* OFFLINE_WR_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8820, /* OFFLINE_WR_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_OPE_BPS_CDM_RD,
-		.port_name = "OPE_BPS_CDM_RD",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8630, /* OFFLINE_RD_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8634, /* OFFLINE_RD_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8638, /* OFFLINE_RD_NIU_URGENCY_LOW */
-			.value = 0x003,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8640, /* OFFLINE_RD_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8648, /* OFFLINE_RD_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8F08, /* OFFLINE_RD_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8F20, /* OFFLINE_RD_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8F24, /* OFFLINE_RD_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_CRE,
-		.port_name = "CRE_RD_WR",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8230, /* CRE_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8234, /* CRE_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8238, /* CRE_NIU_URGENCY_LOW */
-			.value = 0x033,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8240, /* CRE_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8248, /* CRE_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E88, /* CRE_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8EA0, /* CRE_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8EA4, /* CRE_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8220, /* CRE_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_JPEG,
-		.port_name = "JPEG",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8430, /* JPEG_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8434, /* JPEG_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8438, /* JPEG_NIU_URGENCY_LOW */
-			.value = 0x33,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8440, /* JPEG_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8448, /* JPEG_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_CDM,
-		.port_name = "CDM",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8030, /* CDM_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8034, /* CDM_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8038, /* CDM_NIU_URGENCY_LOW */
-			.value = 0x3,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8040, /* CDM_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8048, /* CDM_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E08, /* CDM_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E20, /* CDM_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E24, /* CDM_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_type = CAM_CAMNOC_ICP,
-		.port_name = "ICP",
-		.enable = false,
-		.flag_out_set0_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_WRITE,
-			.masked_value = 0,
-			.offset = 0x288,
-			.value = 0x100000,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9108, /* ICP_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9120, /* ICP_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9124, /* ICP_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-};
-
-static struct cam_camnoc_err_logger_info cam770_cpas100_err_logger_offsets = {
-	.mainctrl     =  0x8,    /* ERL_MAINCTL_LOW */
-	.errvld       =  0x10,   /* ERl_ERRVLD_LOW */
-	.errlog0_low  =  0x20,   /* ERL_ERRLOG0_LOW */
-	.errlog0_high =  0x24,   /* ERL_ERRLOG0_HIGH */
-	.errlog1_low  =  0x28,   /* ERL_ERRLOG1_LOW */
-	.errlog1_high =  0x2C,   /* ERL_ERRLOG1_HIGH */
-	.errlog2_low  =  0x30,   /* ERL_ERRLOG2_LOW */
-	.errlog2_high =  0x34,   /* ERL_ERRLOG2_HIGH */
-	.errlog3_low  =  0x38,   /* ERL_ERRLOG3_LOW */
-	.errlog3_high =  0x3C,   /* ERL_ERRLOG3_HIGH */
-};
-
-static struct cam_cpas_hw_errata_wa_list cam770_cpas100_errata_wa_list = {
-	.enable_icp_clk_for_qchannel = {
-		.enable = true,
-	},
-};
-
-static struct cam_camnoc_info cam770_cpas100_camnoc_info = {
-	.specific = &cam_cpas_v770_100_camnoc_specific[0],
-	.specific_size = ARRAY_SIZE(cam_cpas_v770_100_camnoc_specific),
-	.irq_sbm = &cam_cpas_v770_100_irq_sbm,
-	.irq_err = &cam_cpas_v770_100_irq_err[0],
-	.irq_err_size = ARRAY_SIZE(cam_cpas_v770_100_irq_err),
-	.err_logger = &cam770_cpas100_err_logger_offsets,
-	.errata_wa_list = &cam770_cpas100_errata_wa_list,
-};
-
-static struct cam_cpas_camnoc_qchannel cam770_cpas100_qchannel_info = {
-	.qchannel_ctrl   = 0x14,
-	.qchannel_status = 0x18,
-};
-
-static struct cam_cpas_info cam770_cpas100_cpas_info = {
-	.hw_caps_info = {
-		.num_caps_registers = 1,
-		.hw_caps_offsets = {0x8},
-	},
-	.qchannel_info = {&cam770_cpas100_qchannel_info},
-	.num_qchannel = 1,
-};
-
-static struct cam_cpas_top_regs cam770_cpas100_cpas_top_info = {
-	.tpg_mux_sel_enabled = true,
-	.tpg_mux_sel_shift   = 0x0,
-	.tpg_mux_sel         = 0x1C,
-};
-
-#endif /* _CPASTOP_V770_100_H_ */
-

qcom/opensource/camera-kernel/drivers/cam_cpas/cpas_top/cpastop_v860_100.h

@@ -1,1347 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CPASTOP_V860_100_H_
-#define _CPASTOP_V860_100_H_
-
-static struct cam_camnoc_irq_sbm cam_cpas_v860_100_irq_sbm = {
-	.sbm_enable = {
-		.access_type = CAM_REG_TYPE_READ_WRITE,
-		.enable = true,
-		.offset = 0x240,  /* CAM_NOC_SBM_FAULTINEN0_LOW */
-		.value = 0x01 |/* SBM_FAULTINEN0_LOW_PORT0_MASK */
-			0x02 | /* SBM_FAULTINEN0_LOW_PORT1_MASK */
-			0x04 |    /* SBM_FAULTINEN0_LOW_PORT2_MASK */
-			0x08 |    /* SBM_FAULTINEN0_LOW_PORT3_MASK */
-			0x10 |    /* SBM_FAULTINEN0_LOW_PORT4_MASK */
-			0x20,     /* SBM_FAULTINEN0_LOW_PORT5_MASK */
-	},
-	.sbm_status = {
-		.access_type = CAM_REG_TYPE_READ,
-		.enable = true,
-		.offset = 0x248, /* CAM_NOC_SBM_FAULTINSTATUS0_LOW */
-	},
-	.sbm_clear = {
-		.access_type = CAM_REG_TYPE_WRITE,
-		.enable = true,
-		.offset = 0x280, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		.value = 0xE,
-	}
-};
-
-static struct cam_camnoc_irq_err
-	cam_cpas_v860_100_irq_err[] = {
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_SLAVE_ERROR,
-		.enable = true,
-		.sbm_port = 0x1, /* SBM_FAULTINSTATUS0_LOW_PORT0_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x8, /* CAM_NOC_ERL_MAINCTL_LOW */
-			.value = 1,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x10, /* CAM_NOC_ERL_ERRVLD_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x18, /* CAM_NOC_ERL_ERRCLR_LOW */
-			.value = 1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IFE_UBWC_ENCODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x20, /* SBM_FAULTINSTATUS0_LOW_PORT5_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x93A0, /* IFE_UBWC : RT_1_NIU_ENCERREN_LOW */
-			.value = 0xF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x9390, /* IFE_UBWC : RT_1_NIU_ENCERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x9398, /* IFE_UBWC : RT_1_NIU_ENCERRCLR_LOW */
-			.value = 0x1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_BPS_UBWC_ENCODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x2, /* SBM_FAULTINSTATUS0_LOW_PORT1_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x87A0, /* BPS_WR : NRT_2_NIU_ENCERREN_LOW */
-			.value = 0XF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x8790, /* BPS_WR : NRT_2_NIU_ENCERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x8798, /* BPS_WR : NRT_2_NIU_ENCERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE0_UBWC_DECODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x4, /* SBM_FAULTINSTATUS0_LOW_PORT2_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x8B20, /* IPE_0_RD : NRT_4_NIU_DECERREN_LOW */
-			.value = 0xFF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x8B10, /* IPE_0_RD : NRT_4_NIU_DECERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x8B18, /* IPE_0_RD : NRT_4_NIU_DECERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE1_UBWC_DECODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x8, /* SBM_FAULTINSTATUS0_LOW_PORT3_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x8D20, /* IPE_1_RD : NRT_5_NIU_DECERREN_LOW */
-			.value = 0XFF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x8D10, /* IPE_1_RD : NRT_5_NIU_DECERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x8D18, /* IPE_1_RD : NRT_5_NIU_DECERRCLR_LOW */
-			.value = 0X1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_IPE_UBWC_ENCODE_ERROR,
-		.enable = true,
-		.sbm_port = 0x10, /* SBM_FAULTINSTATUS0_LOW_PORT4_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x8FA0, /* IPE_WR : NRT_6_NIU_ENCERREN_LOW */
-			.value = 0XF,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x8F90, /* IPE_WR : NRT_6_NIU_ENCERRSTATUS_LOW */
-		},
-		.err_clear = {
-			.access_type = CAM_REG_TYPE_WRITE,
-			.enable = true,
-			.offset = 0x8F98, /* IPE_WR : NRT_6_NIU_ENCERRCLR_LOW */
-			.value = 0x1,
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_AHB_TIMEOUT,
-		.enable = false,
-		.sbm_port = 0x40, /* SBM_FAULTINSTATUS0_LOW_PORT6_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x288, /* CAM_NOC_SBM_FLAGOUTSET0_LOW */
-			.value = 0x1,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x290, /* CAM_NOC_SBM_FLAGOUTSTATUS0_LOW */
-		},
-		.err_clear = {
-			.enable = false, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		},
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED1,
-		.enable = false,
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED2,
-		.enable = false,
-	},
-	{
-		.irq_type = CAM_CAMNOC_HW_IRQ_CAMNOC_TEST,
-		.enable = false,
-		.sbm_port = 0x80, /* SBM_FAULTINSTATUS0_LOW_PORT7_MASK */
-		.err_enable = {
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.enable = true,
-			.offset = 0x288, /* CAM_NOC_SBM_FLAGOUTSET0_LOW */
-			.value = 0x3,
-		},
-		.err_status = {
-			.access_type = CAM_REG_TYPE_READ,
-			.enable = true,
-			.offset = 0x290, /* CAM_NOC_SBM_FLAGOUTSTATUS0_LOW */
-		},
-		.err_clear = {
-			.enable = false, /* CAM_NOC_SBM_FLAGOUTCLR0_LOW */
-		},
-	},
-};
-
-static struct cam_camnoc_specific
-	cam_cpas_v860_100_camnoc_specific[] = {
-	/* RT ports */
-	{
-		.port_name = "RT0-SFE_RD",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9030, /* SFE_RD : NOC_RT_0_NIU_PRIORITYLUT_LOW */
-			.value = 0x44444444,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9034, /* SFE_RD : NOC_RT_0_NIU_PRIORITYLUT_HIGH */
-			.value = 0x44444444,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9038, /* SFE_RD : NOC_RT_0_NIU_URGENCY_LOW */
-			.value = 0x1004,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9040, /* SFE_RD : NOC_RT_0_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9048, /* SFE_RD : NOC_RT_0_NIU_SAFELUT_LOW */
-			.value = 0x0,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9D88, /* SFE_RD : NOC_RT_0_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7388, /* SFE_RD : NOC_RT_0_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x73A0, /* SFE_RD : NOC_RT_0_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x73A4, /* SFE_RD : NOC_RT_0_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "RT1-IFE_UBWC",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9230, /* IFE_UBWC_LINEAR : NOC_RT_1_NIU_PRIORITYLUT_LOW */
-			.value = 0x65555544,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9234, /* IFE_UBWC_LINEAR : NOC_RT_1_NIU_PRIORITYLUT_HIGH */
-			.value = 0x66666666,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9238, /* IFE_UBWC_LINEAR : NOC_RT_1_NIU_URGENCY_LOW */
-			.value = 0x1E40,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9240, /* IFE_UBWC_LINEAR : NOC_RT_1_NIU_DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9248, /* IFE_UBWC_LINEAR : NOC_RT_1_NIU_SAFELUT_LOW */
-			.value = 0x000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9E08, /* IFE_UBWC_LINEAR : NOC_RT_1_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7408, /* IFE_UBWC_LINEAR : NOC_RT_1_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7420, /* IFE_UBWC_LINEAR : NOC_RT_1_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7424, /* IFE_UBWC_LINEAR : NOC_RT_1_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x9220, /* IFE_UBWC_LINEAR : NOC_RT_1_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "RT2-IFE_STATS",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9430, /* IFE_STATS : NOC_RT_2_NIU_PRIORITYLUT_LOW */
-			.value = 0x65555544,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9434, /* IFE_STATS : NOC_RT_2_NIU_PRIORITYLUT_HIGH */
-			.value = 0x66666666,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9438, /* IFE_STATS : NOC_RT_2_NIU_URGENCY_LOW */
-			.value = 0x1C40,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9440, /* IFE_STATS : NOC_RT_2_NIU_DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9448, /* IFE_STATS : NOC_RT_2_NIU_SAFELUT_LOW */
-			.value = 0x000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9E88, /* IFE_STATS : NOC_RT_2_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7488, /* IFE_STATS : NOC_RT_2_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x74A0, /* IFE_STATS : NOC_RT_2_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x74A4, /* IFE_STATS : NOC_RT_2_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x9420, /* IFE_STATS : NOC_RT_2_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "RT3-IFE_PDAF_LINEAR_IFELITE",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9630, /* IFE_PDAF_IFELITE : NOC_RT_3_NIU_PRIORITYLUT_LOW */
-			.value = 0x65555544,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9634, /* IFE_PDAF_IFELITE : NOC_RT_3_NIU_PRIORITYLUT_HIGH */
-			.value = 0x66666666,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9638, /* IFE_PDAF_IFELITE : NOC_RT_3_NIU_URGENCY_LOW */
-			.value = 0x1C40,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9640, /* IFE_PDAF_IFELITE : NOC_RT_3_NIU_DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9648, /* IFE_PDAF_IFELITE : NOC_RT_3_NIU_SAFELUT_LOW */
-			.value = 0x000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9F08, /* IFE_PDAF_IFELITE : NOC_RT_3_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7508, /* IFE_PDAF_IFELITE : NOC_RT_3_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7520, /* IFE_PDAF_IFELITE : NOC_RT_3_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7524, /* IFE_PDAF_IFELITE : NOC_RT_3_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x9620, /* IFE_PDAF_IFELITE : NOC_RT_3_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "RT4-IFE_RDI_SFE",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9830, /* IFE_RDI_SFE : NOC_RT_4_NIU_PRIORITYLUT_LOW */
-			.value = 0x65555544,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9834, /* IFE_RDI_SFE : NOC_RT_4_NIU_PRIORITYLUT_HIGH */
-			.value = 0x66666666,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9838, /* IFE_RDI_SFE : NOC_RT_4_NIU_URGENCY_LOW */
-			.value = 0x1E40,
-		},
-		.danger_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9840, /* IFE_RDI_SFE : NOC_RT_4_NIU_DANGERLUT_LOW */
-			.value = 0xffffff00,
-		},
-		.safe_lut = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9848, /* IFE_RDI_SFE : NOC_RT_4_NIU_SAFELUT_LOW */
-			.value = 0x000f,
-		},
-		.ubwc_ctl = {
-			/*
-			 * Do not explicitly set ubwc config register.
-			 * Power on default values are taking care of required
-			 * register settings.
-			 */
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9F88, /* IFE_RDI_SFE : NOC_RT_4_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7588, /* IFE_RDI_SFE : NOC_RT_4_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x75A0, /* IFE_RDI_SFE : NOC_RT_4_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x75A4, /* IFE_RDI_SFE : NOC_RT_4_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x9820, /* IFE_RDI_SFE : NOC_RT_4_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	/* NRT ports */
-	{
-		.port_name = "NRT0-CDM",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8230, /* CDM : NOC_NRT_0_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8234, /* CDM : NOC_NRT_0_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8238, /* CDM : NOC_NRT_0_NIU_URGENCY_LOW */
-			.value = 0x1003,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8240, /* CDM : NOC_NRT_0_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8248, /* CDM : NOC_NRT_0_NIU_SAFELUT_LOW */
-			.value = 0xffff,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9A08, /* CDM : NOC_NRT_0_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7008, /* CDM : NOC_NRT_0_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7020, /* CDM : NOC_NRT_0_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7024, /* CDM : NOC_NRT_0_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "NRT1-JPEG_RD_WR",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8430, /* JPEG : NOC_NRT_1_NIU_PRIORITYLUT_LOW */
-			.value = 0x22222222,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8434, /* JPEG : NOC_NRT_1_NIU_PRIORITYLUT_HIGH */
-			.value = 0x22222222,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8438, /* JPEG : NOC_NRT_1_NIU_URGENCY_LOW */
-			.value = 0x0022,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8440, /* JPEG : NOC_NRT_1_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8448, /* JPEG : NOC_NRT_1_NIU_SAFELUT_LOW */
-			.value = 0xffff,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9A88, /* JPEG : NOC_NRT_1_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7088, /* JPEG : NOC_NRT_1_QOSGEN_MAINCTL */
-			.value = 0x2,
-		},
-		.qosgen_shaping_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x70A0, /* JPEG : NOC_NRT_1_QOSGEN_SHAPING_LOW */
-			.value = 0x10101010,
-		},
-		.qosgen_shaping_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x70A4, /* JPEG : NOC_NRT_1_QOSGEN_SHAPING_HIGH */
-			.value = 0x10101010,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8420, /* JPEG : NOC_NRT_1_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "NRT2-BPS_CRE_WR",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8630, /* BPS_CRE_WR : NOC_NRT_2_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8634, /* BPS_CRE_WR : NOC_NRT_2_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8638, /* BPS_CRE_WR : NOC_NRT_2_NIU_URGENCY_LOW */
-			.value = 0x1030,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8640, /* BPS_CRE_WR : NOC_NRT_2_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8648, /* BPS_CRE_WR : NOC_NRT_2_NIU_SAFELUT_LOW */
-			.value = 0xffff,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9B08, /* BPS_CRE_WR : NOC_NRT_2_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7108, /* BPS_CRE_WR : NOC_NRT_2_QOSGEN_MAINCTL */
-			.value = 0x2,
-		},
-		.qosgen_shaping_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7120, /* BPS_CRE_WR : NOC_NRT_2_QOSGEN_SHAPING_LOW */
-			.value = 0x14141414,
-		},
-		.qosgen_shaping_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7124, /* BPS_CRE_WR : NOC_NRT_2_BPS_WR_QOSGEN_SHAPING_HIGH */
-			.value = 0x14141414,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8620, /* BPS_CRE_WR : NOC_NRT_2_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "NRT3-BPS_CRE_RD",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8830, /* BPS_CRE_RD : NOC_NRT_3_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8834, /* BPS_CRE_RD : NOC_NRT_3_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8838, /* BPS_CRE_RD : NOC_NRT_3_NIU_URGENCY_LOW */
-			.value = 0x1003,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8840, /* BPS_CRE_RD : NOC_NRT_3_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8848, /* BPS_CRE_RD : NOC_NRT_3_NIU_SAFELUT_LOW */
-			.value = 0xffff,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9B88, /* BPS_CRE_RD : NOC_NRT_3_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7188, /* BPS_CRE_RD : NOC_NRT_3_QOSGEN_MAINCTL */
-			.value = 0x2,
-		},
-		.qosgen_shaping_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x71A0, /* BPS_CRE_RD : NOC_NRT_3_QOSGEN_SHAPING_LOW */
-			.value = 0x14141414,
-		},
-		.qosgen_shaping_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x71A4, /* BPS_CRE_RD : NOC_NRT_3_QOSGEN_SHAPING_HIGH */
-			.value = 0x14141414,
-		},
-	},
-	{
-		.port_name = "NRT4-IPE_0_RD",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A30, /* IPE_0_RD : NOC_NRT_4_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A34, /* IPE_0_RD : NOC_NRT_4_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A38, /* IPE_0_RD : NOC_NRT_4_NIU_URGENCY_LOW */
-			.value = 0x1003,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A40, /* IPE_0_RD : NOC_NRT_4_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8A48, /* IPE_0_RD : NOC_NRT_4_NIU_SAFELUT_LOW */
-			.value = 0xffff,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8B08, /* IPE_0_RD : NOC_NRT_4_NIU_DECCTL_LOW */
-			.value = 1,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9C08, /* IPE_0_RD : NOC_NRT_4_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7208, /* IPE_0_RD : NOC_NRT_4_QOSGEN_MAINCTL */
-			.value = 0x2,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7220, /* IPE_0_RD : NOC_NRT_4_QOSGEN_SHAPING_LOW */
-			.value = 0x2E2E2E2E,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7224, /* IPE_0_RD : NOC_NRT_4_QOSGEN_SHAPING_HIGH */
-			.value = 0x2E2E2E2E,
-		},
-	},
-	{
-		.port_name = "NRT5-IPE_1_RD",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C30, /* IPE_1_RD : NOC_NRT_5_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C34, /* IPE_1_RD : NOC_NRT_5_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C38, /* IPE_1_RD : NOC_NRT_5_NIU_URGENCY_LOW */
-			.value = 0x1003,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C40, /* IPE_1_RD : NOC_NRT_5_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8C48, /* IPE_1_RD : NOC_NRT_5_NIU_SAFELUT_LOW */
-			.value = 0xffff,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9C88, /* IPE_1_RD : NOC_NRT_5_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7288, /* IPE_1_RD : NOC_NRT_5_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x72A0, /* IPE_1_RD : NOC_NRT_5_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x72A4, /* IPE_1_RD : NOC_NRT_5_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "NRT6-IPE_WR_0",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E30, /* IPE_WR_0 : NOC_NRT_6_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E34, /* IPE_WR_0 : NOC_NRT_6_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E38, /* IPE_WR_0 : NOC_NRT_6_NIU_URGENCY_LOW */
-			.value = 0x1030,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E40, /* IPE_WR_0 : NOC_NRT_6_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x8E48, /* IPE_WR_0 : NOC_NRT_6_NIU_SAFELUT_LOW */
-			.value = 0xffff,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x9D08, /* IPE_WR_0 : NOC_NRT_6_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7308, /* IPE_WR_0 : NOC_NRT_6_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7320, /* IPE_WR_0 : NOC_NRT_6_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7324, /* IPE_WR_0 : NOC_NRT_6_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0x8E20, /* IPE_WR_0 : NOC_NRT_6_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-		{
-		.port_name = "NRT7-IPE_WR_1",
-		.enable = true,
-		.priority_lut_low = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA430, /* IPE_WR_1 : NOC_NRT_7_NIU_PRIORITYLUT_LOW */
-			.value = 0x33333333,
-		},
-		.priority_lut_high = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA434, /* IPE_WR_1 : NOC_NRT_7_NIU_PRIORITYLUT_HIGH */
-			.value = 0x33333333,
-		},
-		.urgency = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA438, /* IPE_WR_1 : NOC_NRT_7_NIU_URGENCY_LOW */
-			.value = 0x1030,
-		},
-		.danger_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA440, /* IPE_WR_1 : NOC_NRT_7_NIU_DANGERLUT_LOW */
-			.value = 0x0,
-		},
-		.safe_lut = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA448, /* IPE_WR_1 : NOC_NRT_7_NIU_SAFELUT_LOW */
-			.value = 0xffff,
-		},
-		.ubwc_ctl = {
-			.enable = false,
-		},
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA608, /* IPE_WR_1 : NOC_NRT_7_DYNATTR_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA688, /* IPE_WR_1 : NOC_NRT_7_QOSGEN_MAINCTL */
-			.value = 0x0,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA6A0, /* IPE_WR_1 : NOC_NRT_7_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA6A4, /* IPE_WR_1 : NOC_NRT_7_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-		.maxwr_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ,
-			.masked_value = 0,
-			.offset = 0xA420, /* IPE_WR_1 : NOC_NRT_7_NIU_MAXWR_LOW */
-			.value = 0x0,
-		},
-	},
-	{
-		.port_name = "ICP_RD_WR",
-		.enable = false,
-		.dynattr_mainctl = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0xA008, /* ICP_RD_WR : NOC_XM_ICP_DYNATTR_MAINCTL */
-			.value = 0x10,
-		},
-		.qosgen_mainctl = {
-			.enable = true,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7608, /* ICP_RD_WR : NOC_XM_ICP_QOSGEN_MAINCTL */
-			.value = 0x1000040,
-		},
-		.qosgen_shaping_low = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7620, /* ICP_RD_WR : NOC_XM_ICP_QOSGEN_SHAPING_LOW */
-			.value = 0x0,
-		},
-		.qosgen_shaping_high = {
-			.enable = false,
-			.access_type = CAM_REG_TYPE_READ_WRITE,
-			.masked_value = 0,
-			.offset = 0x7624, /* ICP_RD_WR : NOC_XM_ICP_QOSGEN_SHAPING_HIGH */
-			.value = 0x0,
-		},
-	},
-};
-
-static struct cam_camnoc_err_logger_info cam860_cpas100_err_logger_offsets = {
-	.mainctrl     =  0x08, /* NOC_ERL_MAINCTL_LOW */
-	.errvld       =  0x10, /* NOC_ERL_ERRVLD_LOW */
-	.errlog0_low  =  0x20, /* NOC_ERL_ERRLOG0_LOW */
-	.errlog0_high =  0x24, /* NOC_ERL_ERRLOG0_HIGH */
-	.errlog1_low  =  0x28, /* NOC_ERL_ERRLOG1_LOW */
-	.errlog1_high =  0x2C, /* NOC_ERL_ERRLOG1_HIGH */
-	.errlog2_low  =  0x30, /* NOC_ERL_ERRLOG2_LOW */
-	.errlog2_high =  0x34, /* NOC_ERL_ERRLOG2_HIGH */
-	.errlog3_low  =  0x38, /* NOC_ERL_ERRLOG3_LOW */
-	.errlog3_high =  0x3C, /* NOC_ERL_ERRLOG3_HIGH */
-};
-
-static struct cam_cpas_hw_errata_wa_list cam860_cpas100_errata_wa_list = {
-	.camnoc_flush_slave_pending_trans = {
-		.enable = false,
-		.data.reg_info = {
-			.access_type = CAM_REG_TYPE_READ,
-			.offset = 0x300, /* sbm_SenseIn0_Low */
-			.mask = 0xE0000, /* Bits 17, 18, 19 */
-			.value = 0, /* expected to be 0 */
-		},
-	},
-	.enable_icp_clk_for_qchannel = {
-		.enable = true,
-	},
-};
-
-static struct cam_cpas_cesta_vcd_reg_info cam_cpas_v860_100_cesta_reg_info = {
-	.vcd_currol = {
-		.reg_offset = 0x300c,
-		.vcd_base_inc = 0x200,
-		.num_vcds = 8,
-	},
-
-};
-
-static struct cam_cpas_vcd_info cam_v860_100_vcd_info[] = {
-	{
-		.index = 0, .type = CAM_CESTA_CRMC, .clk = "cam_cc_ife_0_clk_src",
-	},
-	{
-		.index = 1, .type = CAM_CESTA_CRMC, .clk = "cam_cc_ife_1_clk_src",
-	},
-	{
-		.index = 2, .type = CAM_CESTA_CRMC, .clk = "cam_cc_ife_2_clk_src",
-	},
-	{
-		.index = 3, .type = CAM_CESTA_CRMC, .clk = "cam_cc_sfe_0_clk_src",
-	},
-	{
-		.index = 4, .type = CAM_CESTA_CRMC, .clk = "cam_cc_sfe_1_clk_src",
-	},
-	{
-		.index = 6, .type = CAM_CESTA_CRMC, .clk = "cam_cc_csid_clk_src",
-	},
-	{
-		.index = 7, .type = CAM_CESTA_CRMC, .clk = "cam_cc_cphy_rx_clk_src",
-	},
-	{
-		.index = 8, .type = CAM_CESTA_CRMB, .clk = "cam_cc_camnoc_axi_rt_clk_src",
-	},
-};
-
-static struct cam_cpas_cesta_info cam_v860_cesta_info = {
-	 .vcd_info = &cam_v860_100_vcd_info[0],
-	 .num_vcds = ARRAY_SIZE(cam_v860_100_vcd_info),
-	 .cesta_reg_info = &cam_cpas_v860_100_cesta_reg_info,
-};
-
-static struct cam_camnoc_info cam860_cpas100_camnoc_info = {
-	.specific = &cam_cpas_v860_100_camnoc_specific[0],
-	.specific_size = ARRAY_SIZE(cam_cpas_v860_100_camnoc_specific),
-	.irq_sbm = &cam_cpas_v860_100_irq_sbm,
-	.irq_err = &cam_cpas_v860_100_irq_err[0],
-	.irq_err_size = ARRAY_SIZE(cam_cpas_v860_100_irq_err),
-	.err_logger = &cam860_cpas100_err_logger_offsets,
-	.errata_wa_list = &cam860_cpas100_errata_wa_list,
-	.test_irq_info = {
-		.sbm_enable_mask = 0x80,
-		.sbm_clear_mask = 0x4,
-	},
-};
-
-static struct cam_cpas_camnoc_qchannel cam860_cpas100_qchannel_info = {
-	.qchannel_ctrl   = 0x5C,
-	.qchannel_status = 0x60,
-};
-
-static struct cam_cpas_info cam860_cpas100_cpas_info = {
-	.hw_caps_info = {
-		.num_caps_registers = 2,
-		.hw_caps_offsets = {0x8, 0xDC},
-	},
-	.qchannel_info = {&cam860_cpas100_qchannel_info},
-	.num_qchannel = 1,
-};
-
-#endif /* _CPASTOP_V860_100_H_ */

qcom/opensource/camera-kernel/drivers/cam_cpas/include/cam_cpas_api.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_CPAS_API_H_
@@ -32,15 +32,6 @@
 #define CAM_CPAS_QOS_DEFAULT_SETTINGS_MASK 0x1
 #define CAM_CPAS_QOS_CUSTOM_SETTINGS_MASK  0x2
 
-/**
- *  Secure camera QoS update id - Enum for identify QOS settings update type
- */
-enum secure_camera_qos_update_type {
-	CAM_QOS_UPDATE_TYPE_STATIC = 0x0,
-	CAM_QOS_UPDATE_TYPE_SMART  = 0x1,
-	CAM_QOS_UPDATE_TYPE_MAX,
-};
-
 /**
  * enum cam_cpas_regbase_types - Enum for cpas regbase available for clients
  *                             to read/write
@@ -95,9 +86,6 @@ enum cam_cpas_camera_version {
 	CAM_CPAS_CAMERA_VERSION_640  = 0x00060400,
 	CAM_CPAS_CAMERA_VERSION_880  = 0x00080800,
 	CAM_CPAS_CAMERA_VERSION_980  = 0x00090800,
-	CAM_CPAS_CAMERA_VERSION_860  = 0x00080600,
-	CAM_CPAS_CAMERA_VERSION_770  = 0x00070700,
-	CAM_CPAS_CAMERA_VERSION_665  = 0x00060605,
 	CAM_CPAS_CAMERA_VERSION_MAX
 };
 
@@ -112,7 +100,6 @@ enum cam_cpas_version {
 	CAM_CPAS_VERSION_120  = 0x10020000,
 	CAM_CPAS_VERSION_130  = 0x10030000,
 	CAM_CPAS_VERSION_200  = 0x20000000,
-	CAM_CPAS_VERSION_210  = 0x20010000,
 	CAM_CPAS_VERSION_MAX
 };
 
@@ -136,9 +123,6 @@ enum cam_cpas_camera_version_map_id {
 	CAM_CPAS_CAMERA_VERSION_ID_640  = 0xC,
 	CAM_CPAS_CAMERA_VERSION_ID_880  = 0xD,
 	CAM_CPAS_CAMERA_VERSION_ID_980  = 0xE,
-	CAM_CPAS_CAMERA_VERSION_ID_860  = 0xF,
-	CAM_CPAS_CAMERA_VERSION_ID_770  = 0x10,
-	CAM_CPAS_CAMERA_VERSION_ID_665  = 0x11,
 	CAM_CPAS_CAMERA_VERSION_ID_MAX
 };
 
@@ -153,7 +137,6 @@ enum cam_cpas_version_map_id {
 	CAM_CPAS_VERSION_ID_120  = 0x3,
 	CAM_CPAS_VERSION_ID_130  = 0x4,
 	CAM_CPAS_VERSION_ID_200  = 0x5,
-	CAM_CPAS_VERSION_ID_210  = 0x6,
 	CAM_CPAS_VERSION_ID_MAX
 };
 
@@ -183,12 +166,8 @@ enum cam_cpas_hw_version {
 	CAM_CPAS_TITAN_680_V110 = 0x680110,
 	CAM_CPAS_TITAN_780_V100 = 0x780100,
 	CAM_CPAS_TITAN_640_V200 = 0x640200,
-	CAM_CPAS_TITAN_640_V210 = 0x640210,
 	CAM_CPAS_TITAN_880_V100 = 0x880100,
 	CAM_CPAS_TITAN_980_V100 = 0x980100,
-	CAM_CPAS_TITAN_860_V100 = 0x860100,
-	CAM_CPAS_TITAN_770_V100 = 0x770100,
-	CAM_CPAS_TITAN_665_V100 = 0x665100,
 	CAM_CPAS_TITAN_MAX
 };
 

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_context.c

@@ -43,7 +43,7 @@ static int __cam_cre_ctx_flush_dev_in_ready(struct cam_context *ctx,
 	flush_args.cmd = cmd;
 	flush_args.flush_active_req = false;
 
-	rc = cam_context_flush_dev_to_hw(ctx, &flush_args);
+	rc = cam_context_flush_dev_to_hw(ctx, cmd, &flush_args);
 	if (rc)
 		CAM_ERR(CAM_CRE, "Failed to flush device");
 

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cam_cre_hw_mgr.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/mutex.h>
@@ -210,17 +210,9 @@ static int cam_cre_mgr_process_cmd_io_buf_req(struct cam_cre_hw_mgr *hw_mgr,
 
 				/* Width for WE has to be updated in number of pixels */
 				if (acq_io_buf->direction == CAM_BUF_OUTPUT) {
-					if (plane_info->format == CAM_FORMAT_PLAIN16_10) {
-						plane_info->width =
-							io_cfg_ptr[j].planes[k].plane_stride/2;
-					} else if (plane_info->format == CAM_FORMAT_PLAIN128) {
-						/* PLAIN 128/8 = 16 Bytes per pixel */
-						plane_info->width =
-							io_cfg_ptr[j].planes[k].plane_stride/16;
-					} else {
-						plane_info->width =
-							io_cfg_ptr[j].planes[k].width;
-					}
+					/* PLAIN 128/8 = 16 Bytes per pixel */
+					plane_info->width =
+						io_cfg_ptr[j].planes[k].plane_stride/16;
 				} else {
 					/* FE width should be in bytes */
 					plane_info->width     =
@@ -410,6 +402,10 @@ static int cam_cre_mgr_remove_bw(struct cam_cre_hw_mgr *hw_mgr, int ctx_id)
 			ctx_data->clk_info.axi_path[i].mnoc_ab_bw;
 		hw_mgr_clk_info->axi_path[path_index].mnoc_ib_bw -=
 			ctx_data->clk_info.axi_path[i].mnoc_ib_bw;
+		hw_mgr_clk_info->axi_path[path_index].ddr_ab_bw -=
+			ctx_data->clk_info.axi_path[i].ddr_ab_bw;
+		hw_mgr_clk_info->axi_path[path_index].ddr_ib_bw -=
+			ctx_data->clk_info.axi_path[i].ddr_ib_bw;
 	}
 
 	rc = cam_cre_update_cpas_vote(hw_mgr, ctx_data);
@@ -478,6 +474,10 @@ static bool cam_cre_update_bw_v2(struct cam_cre_hw_mgr *hw_mgr,
 			ctx_data->clk_info.axi_path[i].mnoc_ab_bw;
 		hw_mgr_clk_info->axi_path[path_index].mnoc_ib_bw -=
 			ctx_data->clk_info.axi_path[i].mnoc_ib_bw;
+		hw_mgr_clk_info->axi_path[path_index].ddr_ab_bw -=
+			ctx_data->clk_info.axi_path[i].ddr_ab_bw;
+		hw_mgr_clk_info->axi_path[path_index].ddr_ib_bw -=
+			ctx_data->clk_info.axi_path[i].ddr_ib_bw;
 	}
 
 	ctx_data->clk_info.num_paths =
@@ -515,6 +515,10 @@ static bool cam_cre_update_bw_v2(struct cam_cre_hw_mgr *hw_mgr,
 			ctx_data->clk_info.axi_path[i].mnoc_ab_bw;
 		hw_mgr_clk_info->axi_path[path_index].mnoc_ib_bw +=
 			ctx_data->clk_info.axi_path[i].mnoc_ib_bw;
+		hw_mgr_clk_info->axi_path[path_index].ddr_ab_bw +=
+			ctx_data->clk_info.axi_path[i].ddr_ab_bw;
+		hw_mgr_clk_info->axi_path[path_index].ddr_ib_bw +=
+			ctx_data->clk_info.axi_path[i].ddr_ib_bw;
 		CAM_DBG(CAM_CRE,
 			"Consolidate Path Vote : Dev[%s] i[%d] path_idx[%d] : [%s %s] [%lld %lld]",
 			ctx_data->cre_acquire.dev_name,
@@ -760,51 +764,45 @@ static int cam_cre_mgr_process_cmd(void *priv, void *data)
 	task_data = (struct cre_cmd_work_data *)data;
 
 	mutex_lock(&hw_mgr->hw_mgr_mutex);
-	mutex_lock(&ctx_data->ctx_mutex);
 
 	if (ctx_data->ctx_state != CRE_CTX_STATE_ACQUIRED) {
+		mutex_unlock(&hw_mgr->hw_mgr_mutex);
 		CAM_ERR(CAM_CRE, "ctx id :%u is not in use",
 			ctx_data->ctx_id);
-		rc = -EINVAL;
-		goto err;
+		return -EINVAL;
 	}
 
 	if (task_data->req_idx >= CAM_CTX_REQ_MAX) {
+		mutex_unlock(&hw_mgr->hw_mgr_mutex);
 		CAM_ERR(CAM_CRE, "Invalid reqIdx = %llu",
-			task_data->req_idx);
-		rc = -EINVAL;
-		goto err;
-	}
-
-	if (task_data->request_id <= ctx_data->last_flush_req) {
-		CAM_WARN(CAM_CRE,
-			"request %lld has been flushed, reject packet", task_data->request_id);
-		rc = -EINVAL;
-		goto err;
+				task_data->req_idx);
+		return -EINVAL;
 	}
 
 	cre_req = ctx_data->req_list[task_data->req_idx];
 	if (cre_req->request_id > ctx_data->last_flush_req)
 		ctx_data->last_flush_req = 0;
 
+	if (cre_req->request_id <= ctx_data->last_flush_req) {
+		CAM_WARN(CAM_CRE,
+			"request %lld has been flushed, reject packet",
+			cre_req->request_id, ctx_data->last_flush_req);
+		mutex_unlock(&hw_mgr->hw_mgr_mutex);
+		return -EINVAL;
+	}
+
 	if (!cam_cre_is_pending_request(ctx_data)) {
 		CAM_WARN(CAM_CRE, "no pending req, req %lld last flush %lld",
 			cre_req->request_id, ctx_data->last_flush_req);
-		rc = -EINVAL;
-		goto err;
+		mutex_unlock(&hw_mgr->hw_mgr_mutex);
+		return -EINVAL;
 	}
 	hw_mgr = task_data->data;
 	num_batch = cre_req->num_batch;
 
-	if (num_batch > CRE_MAX_BATCH_SIZE) {
-		CAM_WARN(CAM_CRE, "num_batch = %u is greater than max",
-				num_batch);
-		num_batch = CRE_MAX_BATCH_SIZE;
-	}
-
 	CAM_DBG(CAM_CRE,
-		"Ctx %d Going to configure cre for req %d, req_idx %d num_batch %d",
-		ctx_data->ctx_id, cre_req->request_id, cre_req->req_idx, num_batch);
+		"Going to configure cre for req %d, req_idx %d num_batch %d",
+		cre_req->request_id, cre_req->req_idx, num_batch);
 
 	for (i = 0; i < num_batch; i++) {
 		if (i != 0) {
@@ -815,8 +813,7 @@ static int cam_cre_mgr_process_cmd(void *priv, void *data)
 				cam_cre_device_timer_reset(cre_hw_mgr);
 				CAM_ERR(CAM_CRE,
 					"Timedout waiting for bufdone on last frame");
-				rc = -EINVAL;
-				goto err;
+				return -ETIMEDOUT;
 			} else {
 				reinit_completion(&ctx_data->cre_top->bufdone);
 				CAM_INFO(CAM_CRE,
@@ -828,13 +825,27 @@ static int cam_cre_mgr_process_cmd(void *priv, void *data)
 		cam_cre_mgr_update_reg_set(hw_mgr, cre_req, i);
 		cam_cre_ctx_wait_for_idle_irq(ctx_data);
 	}
-err:
-	mutex_unlock(&ctx_data->ctx_mutex);
 	mutex_unlock(&hw_mgr->hw_mgr_mutex);
 
 	return rc;
 }
 
+static int cam_get_valid_ctx_id(void)
+{
+	struct cam_cre_hw_mgr *hw_mgr = cre_hw_mgr;
+	int i;
+
+	for (i = 0; i < CRE_CTX_MAX; i++) {
+		if (hw_mgr->ctx[i].ctx_state == CRE_CTX_STATE_ACQUIRED)
+			break;
+	}
+
+	if (i == CRE_CTX_MAX)
+		return -EINVAL;
+
+	return i;
+}
+
 static int32_t cam_cre_mgr_process_msg(void *priv, void *data)
 {
 	struct cre_msg_work_data *task_data;
@@ -843,7 +854,7 @@ static int32_t cam_cre_mgr_process_msg(void *priv, void *data)
 	struct cam_cre_ctx *ctx;
 	struct cam_cre_request *active_req;
 	struct cam_cre_irq_data irq_data;
-	struct cam_cre_hw_cfg_req *cfg_req = NULL;
+	int32_t ctx_id;
 	uint32_t evt_id;
 	uint32_t active_req_idx;
 	int rc = 0;
@@ -855,51 +866,30 @@ static int32_t cam_cre_mgr_process_msg(void *priv, void *data)
 
 	task_data = data;
 	hw_mgr = priv;
-
-	mutex_lock(&hw_mgr->hw_mgr_mutex);
-	cfg_req = list_first_entry(&hw_mgr->hw_config_req_list,
-		struct cam_cre_hw_cfg_req, list);
-	if (!cfg_req) {
-		CAM_ERR(CAM_CRE, "Hw config req list empty");
-		rc = -EFAULT;
-		mutex_unlock(&hw_mgr->hw_mgr_mutex);
-		return rc;
-	}
-	list_del_init(&cfg_req->list);
-
-	if (cfg_req->ctx_id < 0) {
+	ctx_id = cam_get_valid_ctx_id();
+	if (ctx_id < 0) {
 		CAM_ERR(CAM_CRE, "No valid context to handle error");
-		mutex_unlock(&hw_mgr->hw_mgr_mutex);
-		return -EINVAL;
+		return ctx_id;
 	}
 
-	ctx = &hw_mgr->ctx[cfg_req->ctx_id];
-	mutex_lock(&ctx->ctx_mutex);
+	ctx = &hw_mgr->ctx[ctx_id];
 
+	mutex_lock(&ctx->ctx_mutex);
 	irq_data = task_data->irq_data;
 	if (ctx->ctx_state != CRE_CTX_STATE_ACQUIRED) {
 		CAM_DBG(CAM_CRE, "ctx id: %d not in right state: %d",
-			cfg_req->ctx_id, ctx->ctx_state);
-		rc = -EINVAL;
-		goto end;
+			ctx_id, ctx->ctx_state);
+		mutex_unlock(&ctx->ctx_mutex);
+		return -EINVAL;
 	}
 
 	active_req_idx = find_next_bit(ctx->bitmap, ctx->bits, ctx->last_done_req_idx);
-	CAM_DBG(CAM_CRE, "Ctx %d active_req_idx %d last_done_req_idx %d", ctx->ctx_id,
+	CAM_DBG(CAM_CRE, "active_req_idx %d last_done_req_idx %d",
 		active_req_idx, ctx->last_done_req_idx);
 
-	if (active_req_idx >= CAM_CTX_REQ_MAX) {
-		CAM_WARN(CAM_CRE, "ctx %d not valid req idx active_req_idx %d", active_req_idx);
-		rc = -EINVAL;
-		goto end;
-	}
-
 	active_req = ctx->req_list[active_req_idx];
-	if (!active_req) {
+	if (!active_req)
 		CAM_ERR(CAM_CRE, "Active req cannot be null");
-		rc = -EINVAL;
-		goto end;
-	}
 
 	if (irq_data.error) {
 		evt_id = CAM_CTX_EVT_ID_ERROR;
@@ -915,14 +905,14 @@ static int32_t cam_cre_mgr_process_msg(void *priv, void *data)
 	} else if (irq_data.wr_buf_done) {
 		/* Signal Buf done */
 		active_req->frames_done++;
-		CAM_DBG(CAM_CRE, "Ctx %d Received frames_done %d num_batch %d req id %d",
-			ctx->ctx_id, active_req->frames_done, active_req->num_batch,
+		CAM_DBG(CAM_CRE, "Received frames_done %d num_batch %d req id %d",
+			active_req->frames_done, active_req->num_batch,
 			active_req->request_id);
 		complete(&ctx->cre_top->bufdone);
 		if (active_req->frames_done == active_req->num_batch) {
 			ctx->last_done_req_idx = active_req_idx;
-			CAM_DBG(CAM_CRE, "Ctx %d signaling buff done for req %d",
-				ctx->ctx_id, active_req->request_id);
+			CAM_DBG(CAM_CRE, "signaling buff done for req %d",
+				active_req->request_id);
 			evt_id = CAM_CTX_EVT_ID_SUCCESS;
 			buf_data.evt_param = CAM_SYNC_COMMON_EVENT_SUCCESS;
 			buf_data.request_id = active_req->request_id;
@@ -934,10 +924,7 @@ static int32_t cam_cre_mgr_process_msg(void *priv, void *data)
 			ctx->req_list[active_req_idx] = NULL;
 		}
 	}
-end:
-	list_add_tail(&cfg_req->list, &hw_mgr->free_req_list);
 	mutex_unlock(&ctx->ctx_mutex);
-	mutex_unlock(&hw_mgr->hw_mgr_mutex);
 	return rc;
 }
 
@@ -1563,12 +1550,6 @@ static int cam_cre_validate_acquire_res_info(
 					cre_acquire->in_res[i].format);
 				return -EINVAL;
 		}
-
-		if (!cre_acquire->in_res[i].width || !cre_acquire->in_res[i].height) {
-			CAM_ERR(CAM_CRE, "Invalid width %d height %d for in res %d",
-				cre_acquire->in_res[i].width, cre_acquire->in_res[i].height, i);
-			return -EINVAL;
-		}
 	}
 
 	for (i = 0; i < cre_acquire->num_out_res; i++) {
@@ -1813,6 +1794,8 @@ static int cam_cre_mgr_acquire_hw(void *hw_priv, void *hw_acquire_args)
 			hw_mgr->clk_info.axi_path[i].camnoc_bw = 0;
 			hw_mgr->clk_info.axi_path[i].mnoc_ab_bw = 0;
 			hw_mgr->clk_info.axi_path[i].mnoc_ib_bw = 0;
+			hw_mgr->clk_info.axi_path[i].ddr_ab_bw = 0;
+			hw_mgr->clk_info.axi_path[i].ddr_ib_bw = 0;
 		}
 	}
 
@@ -1860,6 +1843,8 @@ static int cam_cre_mgr_acquire_hw(void *hw_priv, void *hw_acquire_args)
 		bw_update->axi_vote.axi_path[0].camnoc_bw = 600000000;
 		bw_update->axi_vote.axi_path[0].mnoc_ab_bw = 600000000;
 		bw_update->axi_vote.axi_path[0].mnoc_ib_bw = 600000000;
+		bw_update->axi_vote.axi_path[0].ddr_ab_bw = 600000000;
+		bw_update->axi_vote.axi_path[0].ddr_ib_bw = 600000000;
 		bw_update->axi_vote.axi_path[0].transac_type =
 			CAM_AXI_TRANSACTION_WRITE;
 		bw_update->axi_vote.axi_path[0].path_data_type =
@@ -2023,7 +2008,7 @@ static int cam_cre_mgr_release_hw(void *hw_priv, void *hw_release_args)
 	mutex_lock(&hw_mgr->hw_mgr_mutex);
 	rc = cam_cre_mgr_release_ctx(hw_mgr, ctx_id);
 	if (!hw_mgr->cre_ctx_cnt) {
-		CAM_DBG(CAM_CRE, "Last Release #of CRE %d", cre_hw_mgr->num_cre);
+		CAM_DBG(CAM_CRE, "Last Release");
 		for (i = 0; i < cre_hw_mgr->num_cre; i++) {
 			dev_intf = hw_mgr->cre_dev_intf[i];
 			irq_cb.cre_hw_mgr_cb = NULL;
@@ -2121,20 +2106,20 @@ static int cam_cre_packet_generic_blob_handler(void *user_data,
 
 		clk_info = &ctx_data->req_list[index]->clk_info;
 		clk_info_v2 = &ctx_data->req_list[index]->clk_info_v2;
-		clk_info_v2->budget_ns = soc_req->budget_ns;
-		clk_info_v2->frame_cycles = soc_req->frame_cycles;
-		clk_info_v2->rt_flag = soc_req->rt_flag;
-		clk_info_v2->num_paths = soc_req->num_paths;
+		clk_info_v2.budget_ns = soc_req->budget_ns;
+		clk_info_v2.frame_cycles = soc_req->frame_cycles;
+		clk_info_v2.rt_flag = soc_req->rt_flag;
+		clk_info_v2.num_paths = soc_req->num_paths;
 
 		for (i = 0; i < soc_req->num_paths; i++) {
-			clk_info_v2->axi_path[i].usage_data = soc_req->axi_path[i].usage_data;
-			clk_info_v2->axi_path[i].transac_type = soc_req->axi_path[i].transac_type;
-			clk_info_v2->axi_path[i].path_data_type =
+			clk_info_v2.axi_path[i].usage_data = soc_req->axi_path[i].usage_data;
+			clk_info_v2.axi_path[i].transac_type = soc_req->axi_path[i].transac_type;
+			clk_info_v2.axi_path[i].path_data_type =
 				soc_req->axi_path[i].path_data_type;
-			clk_info_v2->axi_path[i].vote_level = 0;
-			clk_info_v2->axi_path[i].camnoc_bw = soc_req->axi_path[i].camnoc_bw;
-			clk_info_v2->axi_path[i].mnoc_ab_bw = soc_req->axi_path[i].mnoc_ab_bw;
-			clk_info_v2->axi_path[i].mnoc_ib_bw = soc_req->axi_path[i].mnoc_ib_bw;
+			clk_info_v2.axi_path[i].vote_level = 0;
+			clk_info_v2.axi_path[i].camnoc_bw = soc_req->axi_path[i].camnoc_bw;
+			clk_info_v2.axi_path[i].mnoc_ab_bw = soc_req->axi_path[i].mnoc_ab_bw;
+			clk_info_v2.axi_path[i].mnoc_ib_bw = soc_req->axi_path[i].mnoc_ib_bw;
 		}
 
 		/* Use v1 structure for clk fields */
@@ -2307,6 +2292,7 @@ static int cam_cre_mgr_prepare_hw_update(void *hw_priv,
 
 	prepare_args->num_hw_update_entries = 1;
 	prepare_args->priv = ctx_data->req_list[request_idx];
+	cre_req->hang_data.packet = packet;
 	ktime_get_boottime_ts64(&ts);
 	ctx_data->last_req_time = (uint64_t)((ts.tv_sec * 1000000000) +
 		ts.tv_nsec);
@@ -2344,8 +2330,7 @@ static int cam_cre_mgr_enqueue_config(struct cam_cre_hw_mgr *hw_mgr,
 	request_id = config_args->request_id;
 	hw_update_entries = config_args->hw_update_entries;
 
-	CAM_DBG(CAM_CRE, "Ctx %d req_id = %lld %pK", ctx_data->ctx_id,
-		request_id, config_args->priv);
+	CAM_DBG(CAM_CRE, "req_id = %lld %pK", request_id, config_args->priv);
 
 	task = cam_req_mgr_workq_get_task(cre_hw_mgr->cmd_work);
 	if (!task) {
@@ -2356,7 +2341,6 @@ static int cam_cre_mgr_enqueue_config(struct cam_cre_hw_mgr *hw_mgr,
 	task_data = (struct cre_cmd_work_data *)task->payload;
 	task_data->data = (void *)hw_mgr;
 	task_data->req_idx = cre_req->req_idx;
-	task_data->request_id = cre_req->request_id;
 	task_data->type = CRE_WORKQ_TASK_CMD_TYPE;
 	task->process_cb = cam_cre_mgr_process_cmd;
 
@@ -2377,8 +2361,8 @@ static int cam_cre_mgr_config_hw(void *hw_priv, void *hw_config_args)
 	struct cam_hw_config_args *config_args = hw_config_args;
 	struct cam_cre_ctx *ctx_data = NULL;
 	struct cam_cre_request *cre_req = NULL;
-	struct cam_cre_hw_cfg_req  *cfg_req = NULL;
 
+	CAM_DBG(CAM_CRE, "E");
 	if (!hw_mgr || !config_args) {
 		CAM_ERR(CAM_CRE, "Invalid arguments %pK %pK",
 			hw_mgr, config_args);
@@ -2394,42 +2378,23 @@ static int cam_cre_mgr_config_hw(void *hw_priv, void *hw_config_args)
 	mutex_lock(&hw_mgr->hw_mgr_mutex);
 	mutex_lock(&ctx_data->ctx_mutex);
 	if (ctx_data->ctx_state != CRE_CTX_STATE_ACQUIRED) {
+		mutex_unlock(&ctx_data->ctx_mutex);
+		mutex_unlock(&hw_mgr->hw_mgr_mutex);
 		CAM_ERR(CAM_CRE, "ctx id :%u is not in use",
 			ctx_data->ctx_id);
-		rc= -EINVAL;
-		goto end;
-	}
-
-	if (list_empty(&hw_mgr->free_req_list)) {
-		CAM_ERR(CAM_CRE, "No request in free list");
-		rc = -ENOMEM;
-		goto end;
+		return -EINVAL;
 	}
 
-	cfg_req = list_first_entry(&hw_mgr->free_req_list,
-		struct cam_cre_hw_cfg_req, list);
-	list_del_init(&cfg_req->list);
-
 	cre_req = config_args->priv;
 
 	cam_cre_mgr_cre_clk_update(hw_mgr, ctx_data, cre_req->req_idx);
 	ctx_data->req_list[cre_req->req_idx]->submit_timestamp = ktime_get();
 
-	CAM_DBG(CAM_CRE, "ctx id :%u req id %lld", ctx_data->ctx_id, cre_req->request_id);
-
-	cfg_req->req_id = cre_req->request_id;
-	cfg_req->ctx_id = ctx_data->ctx_id;
-
-	if (cre_req->request_id <= ctx_data->last_flush_req) {
+	if (cre_req->request_id <= ctx_data->last_flush_req)
 		CAM_WARN(CAM_CRE,
 			"Anomaly submitting flushed req %llu [last_flush %llu] in ctx %u",
 			cre_req->request_id, ctx_data->last_flush_req,
 			ctx_data->ctx_id);
-		rc = -EINVAL;
-		goto end;
-	}
-
-	list_add_tail(&cfg_req->list, &hw_mgr->hw_config_req_list);
 
 	rc = cam_cre_mgr_enqueue_config(hw_mgr, ctx_data, config_args);
 	if (rc)
@@ -2444,7 +2409,6 @@ static int cam_cre_mgr_config_hw(void *hw_priv, void *hw_config_args)
 	return rc;
 config_err:
 	cam_cre_mgr_handle_config_err(config_args, ctx_data);
-end:
 	mutex_unlock(&ctx_data->ctx_mutex);
 	mutex_unlock(&hw_mgr->hw_mgr_mutex);
 	return rc;
@@ -2453,7 +2417,6 @@ end:
 static void cam_cre_mgr_dump_pf_data(struct cam_cre_hw_mgr  *hw_mgr,
 	struct cam_hw_cmd_pf_args *pf_cmd_args)
 {
-	int rc = 0;
 	struct cam_packet          *packet;
 	struct cam_hw_dump_pf_args *pf_args;
 	size_t                      len;
@@ -3007,14 +2970,6 @@ int cam_cre_hw_mgr_init(struct device_node *of_node, void *hw_mgr,
 	if (rc)
 		goto cre_wq_create_failed;
 
-	INIT_LIST_HEAD(&cre_hw_mgr->hw_config_req_list);
-	INIT_LIST_HEAD(&cre_hw_mgr->free_req_list);
-	for (i = 0; i < CAM_CRE_HW_CFG_Q_MAX; i++) {
-		INIT_LIST_HEAD(&cre_hw_mgr->req_list[i].list);
-		list_add_tail(&cre_hw_mgr->req_list[i].list,
-			&cre_hw_mgr->free_req_list);
-	}
-
 	cam_cre_create_debug_fs();
 
 	if (iommu_hdl)

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cam_cre_hw_mgr.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef CAM_CRE_HW_MGR_H
@@ -146,16 +146,14 @@ struct cam_cre_clk_info {
 /**
  * struct cre_cmd_work_data
  *
- * @type:        Type of work data
- * @data:        Private data
- * @req_idx:     Request Idx
- * @request_id:  Request id
+ * @type:       Type of work data
+ * @data:       Private data
+ * @req_id:     Request Idx
  */
 struct cre_cmd_work_data {
 	uint32_t type;
 	void *data;
 	int64_t req_idx;
-	uint64_t request_id;
 };
 
 /**
@@ -343,20 +341,6 @@ struct cam_cre_ctx {
 	cam_hw_event_cb_func ctxt_event_cb;
 };
 
-/**
- * struct cam_cre_hw_cfg_req
- *
- * @list:              Requests submiited to HW
- * @req_id:            Request id
- * ctx_id:             Ctx id
- *
- */
-struct cam_cre_hw_cfg_req {
-	struct list_head   list;
-	uint64_t           req_id;
-	uint32_t           ctx_id;
-};
-
 /**
  * struct cam_cre_hw_mgr
  *
@@ -383,9 +367,6 @@ struct cam_cre_hw_cfg_req {
  * @clk_info:          CRE clock Info for HW manager
  * @dentry:            Pointer to CRE debugfs directory
  * @dump_req_data_enable: CRE hang dump enablement
- * @hw_config_req_list: Requests submitted to HW
- * @free_req_list:     Requests that are free
- * @req_list:          Request list which is applied
  */
 struct cam_cre_hw_mgr {
 	uint32_t      cre_ctx_cnt;
@@ -414,10 +395,6 @@ struct cam_cre_hw_mgr {
 	struct cam_cre_clk_info clk_info;
 	struct dentry *dentry;
 	bool   dump_req_data_enable;
-
-	struct list_head hw_config_req_list;
-	struct list_head free_req_list;
-	struct cam_cre_hw_cfg_req req_list[CAM_CRE_HW_CFG_Q_MAX];
 };
 
 /**

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cre_hw/bus_rd/cre_bus_rd.c

@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
-
 #include <linux/delay.h>
 #include "cam_hw.h"
 #include "cam_hw_intf.h"
@@ -68,7 +66,7 @@ static void cam_cre_update_read_reg_val(struct plane_info p_info,
 		p_info.alignment);
 
 	/* Fetch engine width has to be updated in number of bytes */
-	rd_client_reg_val->img_width  = p_info.width;
+	rd_client_reg_val->img_width  = p_info.stride;
 	rd_client_reg_val->stride     = p_info.stride;
 	rd_client_reg_val->img_height = p_info.height;
 	rd_client_reg_val->alignment  = p_info.alignment;
@@ -139,10 +137,6 @@ static int cam_cre_bus_rd_update(struct cam_cre_hw *cam_cre_hw_info,
 
 	in_port_idx =
 	cam_cre_bus_rd_in_port_idx(io_buf->resource_type);
-	if (in_port_idx < 0) {
-		CAM_ERR(CAM_CRE, "Invalid in_port_idx for resource %d", io_buf->resource_type);
-		return -EINVAL;
-	}
 
 	CAM_DBG(CAM_CRE, "in_port_idx %d", in_port_idx);
 	for (k = 0; k < io_buf->num_planes; k++) {
@@ -185,7 +179,7 @@ static int cam_cre_bus_rd_update(struct cam_cre_hw *cam_cre_hw_info,
 		/* Buffer size */
 		update_cre_reg_set(cre_reg_buf,
 			rd_reg->offset + rd_reg_client->rd_width,
-			ctx_data->cre_acquire.in_res[in_port_idx].width);
+			rd_client_reg_val->img_width);
 		update_cre_reg_set(cre_reg_buf,
 			rd_reg->offset + rd_reg_client->rd_height,
 			rd_client_reg_val->img_height);
@@ -229,7 +223,7 @@ static int cam_cre_bus_rd_prepare(struct cam_cre_hw *cam_cre_hw_info,
 	struct cre_io_buf *io_buf;
 	struct cam_cre_bus_rd_reg *rd_reg;
 	struct cam_cre_bus_rd_reg_val *rd_reg_val;
-	struct cre_reg_buffer *cre_reg_buf = NULL;
+	struct cre_reg_buffer *cre_reg_buf;
 
 	int val;
 
@@ -273,12 +267,11 @@ static int cam_cre_bus_rd_prepare(struct cam_cre_hw *cam_cre_hw_info,
 			rd_reg->offset + rd_reg->input_if_cmd,
 			val);
 	}
-	if (cre_reg_buf) {
-		for (i = 0; i < cre_reg_buf->num_rd_reg_set; i++) {
-			CAM_DBG(CAM_CRE, "CRE value 0x%x offset 0x%x",
-					cre_reg_buf->rd_reg_set[i].value,
-					cre_reg_buf->rd_reg_set[i].offset);
-		}
+
+	for (i = 0; i < cre_reg_buf->num_rd_reg_set; i++) {
+		CAM_DBG(CAM_CRE, "CRE value 0x%x offset 0x%x",
+				cre_reg_buf->rd_reg_set[i].value,
+				cre_reg_buf->rd_reg_set[i].offset);
 	}
 end:
 	return 0;
@@ -448,8 +441,7 @@ static int cam_cre_bus_rd_isr(struct cam_cre_hw *cam_cre_hw_info,
 	int32_t ctx_id, void *data)
 {
 	uint32_t irq_status;
-	uint32_t const_violation_status;
-	uint32_t ccif_violation_status;
+	uint32_t violation_status;
 	uint32_t debug_status_0;
 	uint32_t debug_status_1;
 	struct cam_cre_bus_rd_reg *bus_rd_reg;
@@ -472,30 +464,24 @@ static int cam_cre_bus_rd_isr(struct cam_cre_hw *cam_cre_hw_info,
 	cam_io_w_mb(bus_rd_reg_val->irq_cmd_clear,
 		bus_rd_reg->base + bus_rd_reg->irq_cmd);
 
-	CAM_DBG(CAM_CRE, "BUS irq_status 0x%x", irq_status);
-
 	if (irq_status & bus_rd_reg_val->rup_done)
 		CAM_DBG(CAM_CRE, "CRE Read Bus RUP done");
 
 	if (irq_status & bus_rd_reg_val->rd_buf_done)
 		CAM_DBG(CAM_CRE, "CRE Read Bus Buff done");
 
-	if ((irq_status & bus_rd_reg_val->cons_violation) ||
-		(irq_status & bus_rd_reg_val->ccif_violation)) {
+	if (irq_status & bus_rd_reg_val->cons_violation) {
 		irq_data->error = 1;
-		const_violation_status = cam_io_r_mb(bus_rd_reg->base +
-			bus_rd_reg->cons_violation);
-		ccif_violation_status = cam_io_r_mb(bus_rd_reg->base +
-			bus_rd_reg->ccif_violation);
+		violation_status = cam_io_r_mb(bus_rd_reg->base +
+			bus_rd_reg->rd_clients[0].cons_violation_status);
 		debug_status_0 = cam_io_r_mb(bus_rd_reg->base +
 			bus_rd_reg->rd_clients[0].debug_status_0);
 		debug_status_1 = cam_io_r_mb(bus_rd_reg->base +
 			bus_rd_reg->rd_clients[0].debug_status_1);
 		CAM_DBG(CAM_CRE, "CRE Read Bus Violation");
 		CAM_DBG(CAM_CRE,
-			"violation status 0x%x 0x%x debug status 0/1 0x%x/0x%x",
-			const_violation_status, ccif_violation_status,
-			debug_status_0, debug_status_1);
+			"violation status 0x%x debug status 0/1 0x%x/0x%x",
+			violation_status, debug_status_0, debug_status_1);
 	}
 
 	return 0;

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cre_hw/bus_wr/cre_bus_wr.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 #include <linux/delay.h>
 #include "cam_io_util.h"
@@ -23,70 +22,6 @@ static struct cre_bus_wr *wr_info;
 		cre_reg_buf->num_wr_reg_set++; \
 	} while (0)
 
-static uint32_t cam_cre_bus_wr_format_idx(uint32_t format)
-{
-	uint32_t format_idx = 0;
-
-	switch(format) {
-	case CAM_FORMAT_PLAIN128:
-		format_idx = 0x0;
-		break;
-	case CAM_FORMAT_PLAIN8:
-		format_idx = 0x1;
-		break;
-	case CAM_FORMAT_PLAIN8_SWAP:
-		format_idx = 0x2;
-		break;
-	case CAM_FORMAT_PLAIN8_10:
-		format_idx = 0x3;
-		break;
-	case CAM_FORMAT_PLAIN8_10_SWAP:
-		format_idx = 0x4;
-		break;
-	case CAM_FORMAT_PLAIN16_10:
-		format_idx = 0x5;
-		break;
-	case CAM_FORMAT_PLAIN16_12:
-		format_idx = 0x6;
-		break;
-	case CAM_FORMAT_PLAIN16_14:
-		format_idx = 0x7;
-		break;
-	case CAM_FORMAT_PLAIN16_16:
-		format_idx = 0x8;
-		break;
-	case CAM_FORMAT_PLAIN32:
-		format_idx = 0x9;
-		break;
-	case CAM_FORMAT_PLAIN64:
-		format_idx = 0xA;
-		break;
-	case CAM_FORMAT_PD10:
-		format_idx = 0xB;
-		break;
-	case CAM_FORMAT_MIPI_RAW_10:
-		format_idx = 0xC;
-		break;
-	case CAM_FORMAT_MIPI_RAW_12:
-		format_idx = 0xD;
-		break;
-	case CAM_FORMAT_MIPI_RAW_14:
-		format_idx = 0xE;
-		break;
-	case CAM_FORMAT_MIPI_RAW_20:
-		format_idx = 0xF;
-		break;
-	case CAM_FORMAT_PLAIN32_20:
-		format_idx = 0x10;
-		break;
-	default:
-		CAM_WARN(CAM_CRE, "Invalid format %d", format);
-		break;
-	}
-
-	return format_idx;
-}
-
 static int cam_cre_translate_write_format(struct plane_info p_info,
 	struct cam_cre_bus_wr_client_reg_val *wr_client_reg_val)
 {
@@ -101,7 +36,12 @@ static int cam_cre_translate_write_format(struct plane_info p_info,
 	wr_client_reg_val->height    = p_info.height;
 	wr_client_reg_val->alignment = p_info.alignment;
 
-	wr_client_reg_val->format = p_info.format;
+	/*
+	 * Update packer format to zero irrespective of output format
+	 * This is as per the recomendation from CRE HW team for CRE 1.0
+	 * This logic has to be updated for CRE 1.1
+	 */
+	wr_client_reg_val->format = 0;
 
 	return 0;
 }
@@ -161,7 +101,6 @@ static int cam_cre_bus_wr_update(struct cam_cre_hw *cam_cre_hw_info,
 	int rc, k, out_port_idx;
 	uint32_t req_idx;
 	uint32_t val = 0;
-	uint32_t format_idx = 0;
 	uint32_t iova_base, iova_offset;
 	struct cam_hw_prepare_update_args *prepare_args;
 	struct cam_cre_ctx *ctx_data;
@@ -265,13 +204,12 @@ static int cam_cre_bus_wr_update(struct cam_cre_hw *cam_cre_hw_info,
 			wr_client_reg_val->stride);
 
 		val = 0;
-		format_idx = cam_cre_bus_wr_format_idx(wr_client_reg_val->format);
-		val |= ((format_idx & wr_client_reg_val->format_mask) <<
+		val |= ((wr_client_reg_val->format &
+			wr_client_reg_val->format_mask) <<
 			wr_client_reg_val->format_shift);
-
-		/* Update alignment as LSB by default*/
-		val |= (0x1 << wr_client_reg_val->alignment_shift);
-
+		val |= ((wr_client_reg_val->alignment &
+			wr_client_reg_val->alignment_mask) <<
+			wr_client_reg_val->alignment_shift);
 		/* pack cfg : Format and alignment */
 		update_cre_reg_set(cre_reg_buf,
 			wr_reg->offset + wr_reg_client->packer_cfg,

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cre_hw/cre_core.c

@@ -168,6 +168,10 @@ int cam_cre_init_hw(void *device_priv,
 		CAM_CPAS_DEFAULT_AXI_BW;
 	cpas_vote->axi_vote.axi_path[0].mnoc_ib_bw =
 		CAM_CPAS_DEFAULT_AXI_BW;
+	cpas_vote->axi_vote.axi_path[0].ddr_ab_bw =
+		CAM_CPAS_DEFAULT_AXI_BW;
+	cpas_vote->axi_vote.axi_path[0].ddr_ib_bw =
+		CAM_CPAS_DEFAULT_AXI_BW;
 
 	rc = cam_cpas_start(core_info->cpas_handle,
 		&cpas_vote->ahb_vote, &cpas_vote->axi_vote);
@@ -233,11 +237,6 @@ int cam_cre_deinit_hw(void *device_priv,
 		CAM_ERR(CAM_CRE, "soc disable is failed : %d", rc);
 	core_info->clk_enable = false;
 
-	if (cam_cpas_stop(core_info->cpas_handle))
-		CAM_ERR(CAM_CRE, "cpas stop is failed");
-	else
-		core_info->cpas_start = false;
-
 	return rc;
 }
 

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cre_hw/cre_dev.c

@@ -18,7 +18,6 @@
 #include "cam_cpas_api.h"
 #include "cam_debug_util.h"
 #include "cre_hw_100.h"
-#include "cre_hw_110.h"
 #include "cre_dev_intf.h"
 #include "cam_smmu_api.h"
 #include "camera_main.h"
@@ -59,17 +58,6 @@ static int cam_cre_init_hw_version(struct cam_hw_soc_info *soc_info,
 	switch (core_info->hw_version) {
 	case CRE_HW_VER_1_0_0:
 		core_info->cre_hw_info->cre_hw = &cre_hw_100;
-
-		cre_hw_100.top_reg_offset->base = core_info->cre_hw_info->cre_top_base;
-		cre_hw_100.bus_rd_reg_offset->base = core_info->cre_hw_info->cre_bus_rd_base;
-		cre_hw_100.bus_wr_reg_offset->base = core_info->cre_hw_info->cre_bus_wr_base;
-		break;
-	case CRE_HW_VER_1_1_0:
-		core_info->cre_hw_info->cre_hw = &cre_hw_110;
-
-		cre_hw_110.top_reg_offset->base = core_info->cre_hw_info->cre_top_base;
-		cre_hw_110.bus_rd_reg_offset->base = core_info->cre_hw_info->cre_bus_rd_base;
-		cre_hw_110.bus_wr_reg_offset->base = core_info->cre_hw_info->cre_bus_wr_base;
 		break;
 	default:
 		CAM_ERR(CAM_CRE, "Unsupported version : %u",
@@ -78,6 +66,9 @@ static int cam_cre_init_hw_version(struct cam_hw_soc_info *soc_info,
 		break;
 	}
 
+	cre_hw_100.top_reg_offset->base = core_info->cre_hw_info->cre_top_base;
+	cre_hw_100.bus_rd_reg_offset->base = core_info->cre_hw_info->cre_bus_rd_base;
+	cre_hw_100.bus_wr_reg_offset->base = core_info->cre_hw_info->cre_bus_wr_base;
 
 	return rc;
 }
@@ -209,6 +200,10 @@ static int cam_cre_component_bind(struct device *dev,
 		CAM_CPAS_DEFAULT_AXI_BW;
 	cpas_vote.axi_vote.axi_path[0].mnoc_ib_bw =
 		CAM_CPAS_DEFAULT_AXI_BW;
+	cpas_vote.axi_vote.axi_path[0].ddr_ab_bw =
+		CAM_CPAS_DEFAULT_AXI_BW;
+	cpas_vote.axi_vote.axi_path[0].ddr_ib_bw =
+		CAM_CPAS_DEFAULT_AXI_BW;
 
 	rc = cam_cpas_start(core_info->cpas_handle,
 		&cpas_vote.ahb_vote, &cpas_vote.axi_vote);

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cre_hw/cre_hw.h

@@ -1,14 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef CAM_CRE_HW_H
 #define CAM_CRE_HW_H
 
 #define CRE_HW_VER_1_0_0 0x10000000
-#define CRE_HW_VER_1_1_0 0x10010000
 
 #define CRE_DEV_CRE  0
 #define CRE_DEV_MAX  1
@@ -26,8 +24,6 @@
 #define CRE_WAIT_BUS_RD_DONE   0x3
 #define CRE_WAIT_IDLE_IRQ      0x4
 
-#define CAM_CRE_HW_CFG_Q_MAX 30
-
 struct cam_cre_top_reg {
 	void *base;
 	uint32_t offset;
@@ -91,7 +87,6 @@ struct cam_cre_bus_rd_client_reg {
 	uint32_t misr_cfg_0;
 	uint32_t misr_cfg_1;
 	uint32_t misr_rd_val;
-	uint32_t system_cache_cfg;
 	uint32_t debug_status_cfg;
 	uint32_t debug_status_0;
 	uint32_t debug_status_1;
@@ -114,8 +109,6 @@ struct cam_cre_bus_rd_reg {
 	uint32_t iso_cfg;
 	uint32_t iso_seed;
 	uint32_t test_bus_ctrl;
-	uint32_t cons_violation;
-	uint32_t ccif_violation;
 
 	uint32_t num_clients;
 	struct   cam_cre_bus_rd_client_reg rd_clients[MAX_CRE_RD_CLIENTS];
@@ -168,7 +161,6 @@ struct cam_cre_bus_rd_reg_val {
 	uint32_t rup_done;
 	uint32_t rd_buf_done;
 	uint32_t cons_violation;
-	uint32_t ccif_violation;
 	uint32_t static_prg;
 	uint32_t static_prg_mask;
 	uint32_t ica_en;
@@ -198,9 +190,8 @@ struct cam_cre_bus_wr_client_reg {
 	uint32_t img_cfg_0;
 	uint32_t img_cfg_1;
 	uint32_t img_cfg_2;
-	uint32_t packer_cfg;
 	uint32_t bw_limit;
-	uint32_t system_cache_cfg;
+	uint32_t packer_cfg;
 	uint32_t addr_cfg;
 	uint32_t debug_status_cfg;
 	uint32_t debug_status_0;

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cre_hw/cre_hw_100.h

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef CAM_CRE_HW_100_H
@@ -12,7 +11,7 @@
 #define CRE_BUS_RD_TYPE            0x1
 #define CRE_BUS_WR_TYPE            0x2
 
-static struct cam_cre_top_reg cre100_top_reg = {
+static struct cam_cre_top_reg top_reg = {
 	.hw_version            =  0x000,
 	.hw_cap                =  0x004,
 	.debug_0               =  0x080,
@@ -31,7 +30,7 @@ static struct cam_cre_top_reg cre100_top_reg = {
 	.top_spare             =  0x1FC,
 };
 
-struct cam_cre_top_reg_val cre100_top_reg_value = {
+struct cam_cre_top_reg_val top_reg_value = {
 	.hw_version = 0x10000000,
 	.hw_cap = 0x4000,
 	.irq_mask = 0xf,
@@ -47,7 +46,7 @@ struct cam_cre_top_reg_val cre100_top_reg_value = {
 	.hw_reset_cmd = 0x1,
 };
 
-struct cam_cre_bus_rd_reg cre100_bus_rd_reg = {
+struct cam_cre_bus_rd_reg bus_rd_reg = {
 	.hw_version     = 0x00,
 	.irq_mask       = 0x04,
 	.irq_clear      = 0x08,
@@ -83,7 +82,7 @@ struct cam_cre_bus_rd_reg cre100_bus_rd_reg = {
 	},
 };
 
-struct cam_cre_bus_wr_reg_val cre100_bus_wr_reg_value = {
+struct cam_cre_bus_wr_reg_val bus_wr_reg_value = {
 	.hw_version                   = 0x30000000,
 	.cgc_override                 = 0x1,
 	.irq_mask_0                   = 0xd0000101,
@@ -138,7 +137,7 @@ struct cam_cre_bus_wr_reg_val cre100_bus_wr_reg_value = {
 	},
 };
 
-struct cam_cre_bus_rd_reg_val cre100_bus_rd_reg_value = {
+struct cam_cre_bus_rd_reg_val bus_rd_reg_value = {
 	.hw_version              = 0x30000000,
 	.irq_mask                = 0x1, /* INFO_CONS_VIOLATION */
 	.rd_buf_done             = 0x4,
@@ -184,7 +183,7 @@ struct cam_cre_bus_rd_reg_val cre100_bus_rd_reg_value = {
 	},
 };
 
-struct cam_cre_bus_wr_reg cre100_bus_wr_reg = {
+struct cam_cre_bus_wr_reg bus_wr_reg = {
 	.hw_version                   = 0x00,
 	.cgc_override                 = 0x08,
 	.irq_mask_0                   = 0x18,
@@ -231,11 +230,11 @@ struct cam_cre_bus_wr_reg cre100_bus_wr_reg = {
 };
 
 static struct cam_cre_hw cre_hw_100 = {
-	.top_reg_offset    = &cre100_top_reg,
-	.top_reg_val       = &cre100_top_reg_value,
-	.bus_wr_reg_offset = &cre100_bus_wr_reg,
-	.bus_wr_reg_val    = &cre100_bus_wr_reg_value,
-	.bus_rd_reg_offset = &cre100_bus_rd_reg,
-	.bus_rd_reg_val    = &cre100_bus_rd_reg_value,
+	.top_reg_offset    = &top_reg,
+	.top_reg_val       = &top_reg_value,
+	.bus_wr_reg_offset = &bus_wr_reg,
+	.bus_wr_reg_val    = &bus_wr_reg_value,
+	.bus_rd_reg_offset = &bus_rd_reg,
+	.bus_rd_reg_val    = &bus_rd_reg_value,
 };
 #endif // CAM_CRE_HW_100_H

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cre_hw/cre_hw_110.h

@@ -1,243 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef CAM_CRE_HW_110_H
-#define CAM_CRE_HW_110_H
-
-#include "cre_hw.h"
-
-#define CRE_BUS_RD_TYPE            0x1
-#define CRE_BUS_WR_TYPE            0x2
-
-static struct cam_cre_top_reg cre110_top_reg = {
-	.hw_version            =  0x000,
-	.hw_cap                =  0x004,
-	.debug_0               =  0x080,
-	.debug_1               =  0x084,
-	.debug_cfg             =  0x0DC,
-	.testbus_ctrl          =  0x1F4,
-	.scratch_0             =  0x1F8,
-	.irq_status            =  0x00C,
-	.irq_mask              =  0x010,
-	.irq_clear             =  0x014,
-	.irq_set               =  0x018,
-	.irq_cmd               =  0x01C,
-	.reset_cmd             =  0x008,
-	.core_clk_cfg_ctrl_0   =  0x020,
-	.core_clk_cfg_ctrl_1   =  0x024,
-	.top_spare             =  0x1FC,
-};
-
-struct cam_cre_top_reg_val cre110_top_reg_value = {
-	.hw_version = 0x10010000,
-	.hw_cap = 0x4000,
-	.irq_mask = 0xf,
-	.irq_clear = 0xf,
-	.irq_set = 0xf,
-	.irq_cmd_set = 0xf,
-	.irq_cmd_clear = 0xf,
-	.idle = 0x8,
-	.fe_done = 0x4,
-	.we_done = 0x2,
-	.rst_done = 0x1,
-	.sw_reset_cmd = 0x2,
-	.hw_reset_cmd = 0x1,
-};
-
-struct cam_cre_bus_rd_reg cre110_bus_rd_reg = {
-	.hw_version     = 0x00,
-	.irq_mask       = 0x04,
-	.irq_clear      = 0x08,
-	.irq_cmd        = 0x0C,
-	.irq_status     = 0x10,
-	.input_if_cmd   = 0x14,
-	.irq_set        = 0x18,
-	.misr_reset     = 0x1C,
-	.security_cfg   = 0x20,
-	.iso_cfg        = 0x24,
-	.iso_seed       = 0x28,
-	.test_bus_ctrl  = 0x2C,
-	.cons_violation = 0x30,
-	.ccif_violation = 0x34,
-	.num_clients    = 1,
-	.rd_clients[0]  = {
-		.core_cfg               = 0x50,
-		.ccif_meta_data         = 0x54,
-		.img_addr               = 0x58,
-		.rd_width               = 0x5C,
-		.rd_height              = 0x60,
-		.rd_stride              = 0x64,
-		.unpacker_cfg           = 0x68,
-		.latency_buf_allocation = 0x7C,
-		.misr_cfg_0             = 0x84,
-		.misr_cfg_1             = 0x88,
-		.misr_rd_val            = 0x8C,
-		.system_cache_cfg       = 0x90,
-		.read_buff_cfg          = 0x94,
-		.addr_cfg               = 0x98,
-		.debug_status_cfg       = 0xA4,
-		.debug_status_0         = 0xA8,
-		.debug_status_1         = 0xAC,
-		.spare                  = 0x38,
-	},
-};
-
-struct cam_cre_bus_wr_reg_val cre110_bus_wr_reg_value = {
-	.hw_version                   = 0x40000000,
-	.cgc_override                 = 0x1,
-	.irq_mask_0                   = 0xd0000101,
-	.irq_set_0                    = 0xd0000101,
-	.irq_clear_0                  = 0xd0000101,
-	.img_size_violation           = 0x80000000,
-	.violation                    = 0x40000000,
-	.cons_violation               = 0x10000000,
-	.comp_buf_done                = 0x100,
-	.comp_rup_done                = 0x1,
-	.irq_mask_1                   = 0x1,
-	.irq_set_1                    = 0x1,
-	.irq_clear_1                  = 0x1,
-	.irq_status_1                 = 0x1,
-	.irq_cmd_set                  = 0x10,
-	.irq_cmd_clear                = 0x1,
-	.iso_en                       = 0x1,
-	.iso_en_mask                  = 0x1,
-	.misr_0_en                    = 0x1,
-	.misr_0_en_mask               = 0x1,
-	.misr_0_samp_mode             = 0x1,
-	.misr_0_samp_mode_mask        = 0x10000,
-	.misr_0_id_mask               = 0xff,
-	.misr_rd_misr_sel_mask        = 0xf,
-	.misr_rd_word_sel_mask        = 0x70,
-	.num_clients = 1,
-	.wr_clients[0] = {
-		.client_en                = 0x1,
-		.client_en_mask           = 0x1,
-		.client_en_shift          = 0x0,
-		.auto_recovery_en         = 0x1,
-		.auto_recovery_en_mask    = 0x1,
-		.auto_recovery_en_shift   = 0x4,
-		.mode_mask                = 0x3,
-		.mode_shift               = 0x10,
-		.width_mask               = 0xffff,
-		.width_shift              = 0x0,
-		.height_mask              = 0xffff,
-		.height_shift             = 0x10,
-		.x_init_mask              = 0xff,
-		.stride_mask              = 0xffffff,
-		.format_mask              = 0xf,
-		.format_shift             = 0x0,
-		.alignment_mask           = 0x1,
-		.alignment_shift          = 0x5,
-		.bw_limit_en              = 0x1,
-		.bw_limit_en_mask         = 0x1,
-		.bw_limit_counter_mask    = 0x1fe,
-		.client_buf_done          = 0x1,
-		.output_port_id           = CAM_CRE_OUTPUT_IMAGE,
-		.wm_port_id               = 0,
-	},
-};
-
-struct cam_cre_bus_rd_reg_val cre110_bus_rd_reg_value = {
-	.hw_version              = 0x40000000,
-	.irq_mask                = 0x80000001,
-	.rd_buf_done             = 0x4,
-	.rup_done                = 0x2,
-	.cons_violation          = 0x1,
-	.ccif_violation          = 0x80000000,
-	.irq_cmd_set             = 0x10,
-	.irq_cmd_clear           = 0x1,
-	.static_prg              = 0x8,
-	.static_prg_mask         = 0x8,
-	.ica_en                  = 0x1,
-	.ica_en_mask             = 0x2,
-	.go_cmd                  = 0x1,
-	.go_cmd_mask             = 0x1,
-	.irq_set                 = 0x7,
-	.irq_clear               = 0x7,
-	.misr_reset              = 0x1,
-	.security_cfg            = 0x1,
-	.iso_bpp_select_mask     = 0x60,
-	.iso_pattern_select_mask = 0x6,
-	.iso_en                  = 0x1,
-	.iso_en_mask             = 0x1,
-	.num_clients = 1,
-	.rd_clients[0] = {
-		.client_en               = 0x1,
-		.ai_en                   = 0x1,
-		.ai_en_mask              = 0x1000,
-		.ai_en_shift             = 0xc,
-		.pix_pattern_mask        = 0xfc,
-		.pix_pattern_shift       = 0x2,
-		.stripe_location_mask    = 0x3,
-		.stripe_location_shift   = 0x0,
-		.alignment_mask          = 0x1,
-		.alignment_shift         = 0x5,
-		.format_mask             = 0x1f,
-		.format_shift            = 0x0,
-		.latency_buf_size_mask   = 0xffff,
-		.misr_cfg_en_mask        = 0x4,
-		.misr_cfg_samp_mode_mask = 0x3,
-		.x_int_mask              = 0xffff,
-		.byte_offset_mask        = 0xff,
-		.input_port_id           = CAM_CRE_INPUT_IMAGE,
-		.rm_port_id              = 0x0,
-	},
-};
-
-struct cam_cre_bus_wr_reg cre110_bus_wr_reg = {
-	.hw_version                   = 0x00,
-	.cgc_override                 = 0x08,
-	.irq_mask_0                   = 0x18,
-	.irq_mask_1                   = 0x1C,
-	.irq_clear_0                  = 0x20,
-	.irq_clear_1                  = 0x24,
-	.irq_status_0                 = 0x28,
-	.irq_status_1                 = 0x2C,
-	.irq_cmd                      = 0x30,
-	.local_frame_header_cfg_0     = 0x4C,
-	.irq_set_0                    = 0x50,
-	.irq_set_1                    = 0x54,
-	.iso_cfg                      = 0x5C,
-	.violation_status             = 0x64,
-	.image_size_violation_status  = 0x70,
-	.perf_count_cfg_0             = 0x74,
-	.perf_count_cfg_1             = 0x78,
-	.perf_count_cfg_2             = 0x7C,
-	.perf_count_cfg_3             = 0x80,
-	.perf_count_val_0             = 0x94,
-	.perf_count_val_1             = 0x98,
-	.perf_count_val_2             = 0x9C,
-	.perf_count_val_3             = 0xA0,
-	.perf_count_status            = 0xB4,
-	.misr_cfg_0                   = 0xB8,
-	.misr_cfg_1                   = 0xBC,
-	.misr_rd_sel                  = 0xC8,
-	.misr_reset                   = 0xCC,
-	.misr_val                     = 0xD0,
-	.wr_clients[0]             = {
-		.client_cfg           = 0x200,
-		.img_addr             = 0x204,
-		.img_cfg_0            = 0x20C,
-		.img_cfg_1            = 0x210,
-		.img_cfg_2            = 0x214,
-		.packer_cfg           = 0x218,
-		.bw_limit             = 0x21C,
-		.system_cache_cfg     = 0x268,
-		.addr_cfg             = 0x270,
-		.debug_status_cfg     = 0x288,
-		.debug_status_0       = 0x28c,
-		.debug_status_1       = 0x290,
-	},
-};
-
-static struct cam_cre_hw cre_hw_110 = {
-	.top_reg_offset    = &cre110_top_reg,
-	.top_reg_val       = &cre110_top_reg_value,
-	.bus_wr_reg_offset = &cre110_bus_wr_reg,
-	.bus_wr_reg_val    = &cre110_bus_wr_reg_value,
-	.bus_rd_reg_offset = &cre110_bus_rd_reg,
-	.bus_rd_reg_val    = &cre110_bus_rd_reg_value,
-};
-#endif // CAM_CRE_HW_110_H

qcom/opensource/camera-kernel/drivers/cam_cre/cam_cre_hw_mgr/cre_hw/top/cre_top.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 #include <linux/platform_device.h>
 #include <linux/delay.h>
@@ -47,8 +46,8 @@ static int cam_cre_top_reset(struct cam_cre_hw *cre_hw_info,
 	cam_io_w_mb(top_reg_val->irq_mask,
 		cre_hw_info->top_reg_offset->base + top_reg->irq_mask);
 
-	/* CRE HW RESET */
-	cam_io_w_mb(top_reg_val->hw_reset_cmd,
+	/* CRE SW RESET */
+	cam_io_w_mb(top_reg_val->sw_reset_cmd,
 		cre_hw_info->top_reg_offset->base + top_reg->reset_cmd);
 
 	rc = wait_for_completion_timeout(

qcom/opensource/camera-kernel/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_csid/cam_custom_csid_dev.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/slab.h>
@@ -108,19 +107,13 @@ err:
 static void cam_custom_csid_component_unbind(struct device *dev,
 	struct device *master_dev, void *data)
 {
-	struct cam_hw_intf             *csid_hw_intf = NULL;
+	struct cam_hw_intf             *csid_hw_intf;
 	struct cam_hw_info             *csid_hw_info;
 	struct cam_ife_csid_core_info  *core_info = NULL;
 	struct platform_device *pdev = to_platform_device(dev);
 	const struct of_device_id      *match_dev = NULL;
 
 	csid_hw_intf = (struct cam_hw_intf *)platform_get_drvdata(pdev);
-
-	if (!csid_hw_intf) {
-		CAM_ERR(CAM_CUSTOM, "ERROR No data in csid_hw_intf");
-		return;
-	}
-
 	csid_hw_info = csid_hw_intf->hw_priv;
 	core_info = csid_hw_info->core_info;
 

qcom/opensource/camera-kernel/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "cam_fd_hw_core.h"
@@ -368,13 +368,6 @@ static int cam_fd_hw_util_processcmd_prestart(struct cam_hw_info *fd_hw,
 		((struct cam_fd_soc_private *)soc_info->soc_private)->
 		regbase_index[CAM_FD_REG_CORE]);
 
-	if (mem_base == -1) {
-		CAM_ERR(CAM_FD, "failed to get mem_base, index: %d num_reg_map: %u",
-			((struct cam_fd_soc_private *)soc_info->soc_private)->
-			regbase_index[CAM_FD_REG_CORE], soc_info->num_reg_map);
-		return -EINVAL;
-	}
-
 	ctx_hw_private->cdm_ops->cdm_write_changebase(cmd_buf_addr, mem_base);
 	cmd_buf_addr += size;
 	available_size -= (size * 4);

qcom/opensource/camera-kernel/drivers/cam_icp/cam_icp_subdev.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022,2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/delay.h>
@@ -249,12 +249,10 @@ const struct v4l2_subdev_internal_ops cam_icp_subdev_internal_ops = {
 	.close = cam_icp_subdev_close,
 };
 
-static inline int cam_icp_subdev_clean_up(uint32_t device_idx)
+static inline void cam_icp_subdev_clean_up(uint32_t device_idx)
 {
 	kfree(g_icp_dev[device_idx]);
 	g_icp_dev[device_idx] = NULL;
-
-	return 0;
 }
 
 static int cam_icp_component_bind(struct device *dev,
@@ -294,7 +292,6 @@ static int cam_icp_component_bind(struct device *dev,
 	else
 		subdev_name = cam_icp_subdev_name_arr[device_idx];
 
-
 	mutex_lock(&g_dev_lock);
 	if (g_icp_dev[device_idx]) {
 		CAM_ERR(CAM_ICP,
@@ -306,15 +303,15 @@ static int cam_icp_component_bind(struct device *dev,
 	}
 	mutex_unlock(&g_dev_lock);
 
-	icp_dev = kzalloc(sizeof(struct cam_icp_subdev), GFP_KERNEL);
-	if (!icp_dev) {
-		CAM_ERR(CAM_ICP,
-			"Unable to allocate memory for icp device:%s size:%llu",
-			pdev->name, sizeof(struct cam_icp_subdev));
-		return -ENOMEM;
-	}
+    icp_dev = kzalloc(sizeof(struct cam_icp_subdev), GFP_KERNEL);
+    if (!icp_dev) {
+        CAM_ERR(CAM_ICP,
+            "Unable to allocate memory for icp device:%s size:%llu",
+            pdev->name, sizeof(struct cam_icp_subdev));
+        return -ENOMEM;
+    }
 
-	mutex_lock(&g_dev_lock);
+    mutex_lock(&g_dev_lock);
 	g_icp_dev[device_idx] = icp_dev;
 	mutex_unlock(&g_dev_lock);
 
@@ -374,7 +371,6 @@ ctx_fail:
 		cam_icp_context_deinit(&icp_dev->ctx_icp[i]);
 	cam_icp_hw_mgr_deinit(device_idx);
 hw_init_fail:
-	cam_node_deinit(icp_dev->node);
 	cam_subdev_remove(&icp_dev->sd);
 probe_fail:
 	cam_icp_subdev_clean_up(device_idx);

qcom/opensource/camera-kernel/drivers/cam_icp/hfi.c

@@ -76,7 +76,7 @@ static void __iomem *hfi_iface_addr(struct hfi_info *hfi)
 
 static inline int hfi_get_client_info(int client_handle, struct hfi_info **hfi)
 {
-	uint32_t idx;
+	int idx;
 
 	idx = HFI_GET_INDEX(client_handle);
 	if (!IS_VALID_HFI_INDEX(idx)) {
@@ -310,7 +310,6 @@ int hfi_read_message(int client_handle, uint32_t *pmsg, uint8_t q_id,
 	struct hfi_q_hdr *q;
 	uint32_t new_read_idx, size_in_words, word_diff, temp;
 	uint32_t *read_q, *read_ptr, *write_ptr;
-	uint32_t size_upper_bound = 0;
 	struct mutex *q_lock;
 	int rc = 0;
 
@@ -352,15 +351,6 @@ int hfi_read_message(int client_handle, uint32_t *pmsg, uint8_t q_id,
 	q_tbl_ptr = (struct hfi_qtbl *)hfi->map.qtbl.kva;
 	q = &q_tbl_ptr->q_hdr[q_id];
 
-	if (q->qhdr_read_idx == q->qhdr_write_idx) {
-		CAM_DBG(CAM_HFI, "[%s] hfi hdl: %d Q not ready, state:%u, r idx:%u, w idx:%u",
-			hfi->client_name, client_handle, hfi->hfi_state,
-			q->qhdr_read_idx, q->qhdr_write_idx);
-		rc = -EIO;
-		goto err;
-	}
-
-	size_upper_bound = q->qhdr_q_size;
 	if (q_id == Q_MSG)
 		read_q = (uint32_t *)hfi->map.msg_q.kva;
 	else
@@ -369,15 +359,20 @@ int hfi_read_message(int client_handle, uint32_t *pmsg, uint8_t q_id,
 	read_ptr = (uint32_t *)(read_q + q->qhdr_read_idx);
 	write_ptr = (uint32_t *)(read_q + q->qhdr_write_idx);
 
-	if (write_ptr > read_ptr)
+	if (write_ptr >= read_ptr)
 		size_in_words = write_ptr - read_ptr;
 	else {
 		word_diff = read_ptr - write_ptr;
 		size_in_words =  q->qhdr_q_size -  word_diff;
 	}
 
-	if ((size_in_words == 0) ||
-		(size_in_words > size_upper_bound)) {
+	if (size_in_words == 0) {
+		CAM_DBG(CAM_HFI, "[%s] hfi hdl: %d Q is empty, state:%u, r idx:%u, w idx:%u",
+			hfi->client_name, client_handle, hfi->hfi_state,
+			q->qhdr_read_idx, q->qhdr_write_idx);
+		rc = -ENOMSG;
+		goto err;
+	} else if (size_in_words > q->qhdr_q_size) {
 		CAM_ERR(CAM_HFI, "[%s] Invalid HFI message packet size - 0x%08x hfi hdl:%d",
 			hfi->client_name, size_in_words << BYTE_WORD_SHIFT,
 			client_handle);
@@ -386,13 +381,9 @@ int hfi_read_message(int client_handle, uint32_t *pmsg, uint8_t q_id,
 		goto err;
 	}
 
-	if (size_in_words > buf_words_size) {
-		CAM_ERR(CAM_HFI,
-			"[%s] hdl: %d Size of buffer: %u is smaller than size to read from queue: %u",
-			hfi->client_name, client_handle, buf_words_size, size_in_words);
-		rc = -EIO;
-		goto err;
-	}
+	/* size to read from q is bounded by size of buffer */
+	if (size_in_words > buf_words_size)
+		size_in_words = buf_words_size;
 
 	new_read_idx = q->qhdr_read_idx + size_in_words;
 

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/bps_hw/bps_core.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/of.h>
@@ -473,10 +473,6 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type,
 	case CAM_ICP_DEV_CMD_RESET:
 		rc = cam_bps_cmd_reset(soc_info, core_info);
 		break;
-	case CAM_ICP_DEV_CMD_DUMP_CLK: {
-		rc = cam_soc_util_dump_clk(soc_info);
-		break;
-	}
 	default:
 		CAM_ERR(CAM_ICP, "Invalid Cmd Type:%u", cmd_type);
 		rc = -EINVAL;

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/bps_hw/bps_dev.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -205,12 +205,6 @@ static void cam_bps_component_unbind(struct device *dev,
 
 	CAM_DBG(CAM_ICP, "Unbinding component: %s", pdev->name);
 	bps_dev_intf = platform_get_drvdata(pdev);
-
-	if (!bps_dev_intf) {
-		CAM_ERR(CAM_ICP, "Error No data in pdev");
-		return;
-	}
-
 	bps_dev = bps_dev_intf->hw_priv;
 	core_info = (struct cam_bps_device_core_info *)bps_dev->core_info;
 	cam_cpas_unregister_client(core_info->cpas_handle);

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/uaccess.h>
@@ -2329,28 +2329,9 @@ static void cam_icp_mgr_compute_fw_avg_response_time(struct cam_icp_hw_ctx_data
 		(perf_stats->total_resp_time / perf_stats->total_requests));
 }
 
-static int cam_icp_mgr_dump_clk(struct cam_icp_hw_ctx_data *ctx_data)
-{
-	uint32_t i;
-	struct cam_hw_intf *dev_intf = NULL;
-
-	for (i = 0; i < ctx_data->device_info->hw_dev_cnt; i++) {
-		dev_intf = ctx_data->device_info->dev_intf[i];
-		if (!dev_intf) {
-			CAM_ERR(CAM_ICP, "Device intf for %s[%u] is NULL",
-				ctx_data->device_info->dev_name, i);
-			return -EINVAL;
-		}
-		dev_intf->hw_ops.process_cmd(dev_intf->hw_priv, CAM_ICP_DEV_CMD_DUMP_CLK,
-				NULL, 0);
-	}
-
-	return 0;
-}
-
 static int cam_icp_mgr_handle_frame_process(uint32_t *msg_ptr, int flag)
 {
-	int i, rc;
+	int i;
 	uint32_t idx, event_id;
 	uint64_t request_id;
 	struct cam_icp_hw_mgr *hw_mgr = NULL;
@@ -2413,7 +2394,6 @@ static int cam_icp_mgr_handle_frame_process(uint32_t *msg_ptr, int flag)
 				cam_icp_error_handle_id_to_type(ioconfig_ack->err_type),
 				request_id);
 			event_id = CAM_CTX_EVT_ID_ERROR;
-			rc = cam_icp_mgr_dump_clk(ctx_data);
 		}
 		buf_data.evt_param = cam_icp_handle_err_type_to_evt_param(ioconfig_ack->err_type);
 	} else {
@@ -2511,6 +2491,8 @@ static int cam_icp_mgr_process_msg_frame_process(uint32_t *msg_ptr)
 	if (ioconfig_ack->err_type != CAMERAICP_SUCCESS) {
 		cam_icp_mgr_handle_frame_process(msg_ptr,
 			ICP_FRAME_PROCESS_FAILURE);
+		if (ioconfig_ack->err_type == CAMERAICP_EABORTED)
+			return 0;
 		return -EIO;
 	}
 
@@ -2969,68 +2951,90 @@ static int cam_icp_mgr_process_fatal_error(
 static void cam_icp_mgr_process_dbg_buf(struct cam_icp_hw_mgr *hw_mgr)
 {
 	uint32_t *msg_ptr = NULL, *pkt_ptr = NULL;
-	struct hfi_msg_debug *dbg_msg;
-	uint32_t read_len, size_processed = 0, debug_lvl;
+	struct hfi_msg_debug *dbg_msg = NULL;
+	uint32_t read_in_words, remain_len, pre_remain_len = 0;
+	uint32_t buf_word_size = ICP_DBG_BUF_SIZE_IN_WORDS;
 	uint64_t timestamp = 0;
-	char *dbg_buf;
+	char *msg_data;
 	int rc = 0;
 
-	rc = hfi_read_message(hw_mgr->hfi_handle, hw_mgr->dbg_buf, Q_DBG,
-		ICP_DBG_BUF_SIZE_IN_WORDS, &read_len);
-	if (rc)
+	if (!hw_mgr) {
+		CAM_ERR(CAM_ICP, "Invalid data");
 		return;
+	}
 
-	msg_ptr = (uint32_t *)hw_mgr->dbg_buf;
-	debug_lvl = hw_mgr->icp_dbg_lvl;
-	while (true) {
-		pkt_ptr = msg_ptr;
-		if (pkt_ptr[ICP_PACKET_TYPE] == HFI_MSG_SYS_DEBUG) {
-			dbg_msg = (struct hfi_msg_debug *)pkt_ptr;
-			dbg_buf = (char *)&dbg_msg->msg_data;
-			timestamp = ((((uint64_t)(dbg_msg->timestamp_hi) << 32)
-				| dbg_msg->timestamp_lo) >> 16);
-			trace_cam_icp_fw_dbg(dbg_buf, timestamp/2,
-				hw_mgr->hw_mgr_name);
-			if (!debug_lvl)
-				CAM_INFO(CAM_ICP, "[%s]: FW_DBG:%s",
-					hw_mgr->hw_mgr_name, dbg_buf);
+	do {
+		rc = hfi_read_message(hw_mgr->hfi_handle,
+			hw_mgr->dbg_buf + (pre_remain_len >> BYTE_WORD_SHIFT),
+			Q_DBG, buf_word_size, &read_in_words);
+		if (rc)
+			break;
+
+		remain_len = pre_remain_len + (read_in_words << BYTE_WORD_SHIFT);
+		pre_remain_len = 0;
+		msg_ptr = (uint32_t *)hw_mgr->dbg_buf;
+		buf_word_size = ICP_DBG_BUF_SIZE_IN_WORDS;
+
+		while (remain_len) {
+			pkt_ptr = msg_ptr;
+			if ((remain_len < sizeof(struct hfi_msg_debug)) ||
+				(remain_len < pkt_ptr[ICP_PACKET_SIZE])) {
+				/*
+				 * MSG is broken into two parts, need to read from dbg q again
+				 * to complete the msg and get the remaining packets. Copy
+				 * the remain data to start of buffer and shift buffer ptr to
+				 * after the remaining data ends to read from queue.
+				 */
+				memcpy(hw_mgr->dbg_buf, msg_ptr, remain_len);
+				pre_remain_len = remain_len;
+				buf_word_size -= (pre_remain_len >> BYTE_WORD_SHIFT);
+				break;
+			}
+
+			if (pkt_ptr[ICP_PACKET_TYPE] == HFI_MSG_SYS_DEBUG) {
+				dbg_msg = (struct hfi_msg_debug *)pkt_ptr;
+				msg_data = (char *)&dbg_msg->msg_data;
+				timestamp = ((((uint64_t)(dbg_msg->timestamp_hi) << 32)
+					| dbg_msg->timestamp_lo) >> 16);
+				trace_cam_icp_fw_dbg(msg_data, timestamp/2,
+					hw_mgr->hw_mgr_name);
+				if (!hw_mgr->icp_dbg_lvl)
+					CAM_INFO(CAM_ICP, "[%s]: FW_DBG:%s",
+						hw_mgr->hw_mgr_name, msg_data);
+			}
+
+			remain_len -= pkt_ptr[ICP_PACKET_SIZE];
+			if (remain_len > 0)
+				msg_ptr += (pkt_ptr[ICP_PACKET_SIZE] >> BYTE_WORD_SHIFT);
+			else
+				break;
 		}
-		size_processed += (pkt_ptr[ICP_PACKET_SIZE] >>
-			BYTE_WORD_SHIFT);
-		if (size_processed >= read_len)
-			return;
-		msg_ptr += (pkt_ptr[ICP_PACKET_SIZE] >>
-		BYTE_WORD_SHIFT);
-	}
+
+	/* Repeat reading if drain buffer is insufficient to read all MSGs at once */
+	} while (read_in_words >= buf_word_size);
 }
 
 static int cam_icp_process_msg_pkt_type(
 	struct cam_icp_hw_mgr *hw_mgr,
-	uint32_t *msg_ptr,
-	uint32_t *msg_processed_len)
+	uint32_t *msg_ptr)
 {
 	int rc = 0;
-	int size_processed = 0;
 
 	switch (msg_ptr[ICP_PACKET_TYPE]) {
 	case HFI_MSG_SYS_INIT_DONE:
 		CAM_DBG(CAM_ICP, "[%s] received SYS_INIT_DONE", hw_mgr->hw_mgr_name);
 		complete(&hw_mgr->icp_complete);
-		size_processed = (
-			(struct hfi_msg_init_done *)msg_ptr)->size;
 		break;
 
 	case HFI_MSG_SYS_PC_PREP_DONE:
 		CAM_DBG(CAM_ICP, "[%s] HFI_MSG_SYS_PC_PREP_DONE is received\n",
 			hw_mgr->hw_mgr_name);
 		complete(&hw_mgr->icp_complete);
-		size_processed = sizeof(struct hfi_msg_pc_prep_done);
 		break;
 
 	case HFI_MSG_SYS_PING_ACK:
 		CAM_DBG(CAM_ICP, "[%s] received SYS_PING_ACK", hw_mgr->hw_mgr_name);
 		rc = cam_icp_mgr_process_msg_ping_ack(msg_ptr);
-		size_processed = sizeof(struct hfi_msg_ping_ack);
 		break;
 
 	case HFI_MSG_IPEBPS_CREATE_HANDLE_ACK:
@@ -3038,36 +3042,27 @@ static int cam_icp_process_msg_pkt_type(
 		CAM_DBG(CAM_ICP, "[%s] received IPE/BPS/OFE CREATE_HANDLE_ACK",
 			hw_mgr->hw_mgr_name);
 		rc = cam_icp_mgr_process_msg_create_handle(msg_ptr);
-		size_processed = sizeof(struct hfi_msg_create_handle_ack);
 		break;
 
 	case HFI_MSG_IPEBPS_ASYNC_COMMAND_INDIRECT_ACK:
 		CAM_DBG(CAM_ICP, "[%s] received IPE/BPS ASYNC_INDIRECT_ACK",
 			hw_mgr->hw_mgr_name);
 		rc = cam_icp_mgr_process_ipebps_indirect_ack_msg(msg_ptr);
-		size_processed = (
-			(struct hfi_msg_dev_async_ack *)msg_ptr)->size;
 		break;
 
 	case HFI_MSG_OFE_ASYNC_COMMAND_ACK:
 		CAM_DBG(CAM_ICP, "[%s] received OFE ASYNC COMMAND ACK",
 			hw_mgr->hw_mgr_name);
 		rc = cam_icp_mgr_process_ofe_indirect_ack_msg(msg_ptr);
-		size_processed = (
-			(struct hfi_msg_dev_async_ack *)msg_ptr)->size;
 		break;
 
 	case HFI_MSG_IPEBPS_ASYNC_COMMAND_DIRECT_ACK:
 		CAM_DBG(CAM_ICP, "[%s] received ASYNC_DIRECT_ACK", hw_mgr->hw_mgr_name);
 		rc = cam_icp_mgr_process_direct_ack_msg(msg_ptr);
-		size_processed = (
-			(struct hfi_msg_dev_async_ack *)msg_ptr)->size;
 		break;
 
 	case HFI_MSG_EVENT_NOTIFY:
 		CAM_DBG(CAM_ICP, "[%s] received EVENT_NOTIFY", hw_mgr->hw_mgr_name);
-		size_processed = (
-			(struct hfi_msg_event_notify *)msg_ptr)->size;
 		rc = cam_icp_mgr_process_fatal_error(hw_mgr, msg_ptr);
 		if (rc)
 			CAM_ERR(CAM_ICP, "[%s] failed in processing evt notify",
@@ -3077,63 +3072,148 @@ static int cam_icp_process_msg_pkt_type(
 
 	case HFI_MSG_DBG_SYNX_TEST:
 		CAM_DBG(CAM_ICP, "received DBG_SYNX_TEST");
-		size_processed = sizeof(struct hfi_cmd_synx_test_payload);
 		complete(&hw_mgr->icp_complete);
 		break;
+
 	default:
 		CAM_ERR(CAM_ICP, "[%s] invalid msg : %u",
 			hw_mgr->hw_mgr_name, msg_ptr[ICP_PACKET_TYPE]);
 		rc = -EINVAL;
 	}
 
-	*msg_processed_len = size_processed;
 	return rc;
 }
 
-static int32_t cam_icp_mgr_process_msg(void *priv, void *data)
+static int cam_icp_get_msg_pkt_size(
+	struct cam_icp_hw_mgr *hw_mgr,
+	uint32_t *msg_ptr,
+	uint32_t *pkt_size)
+{
+	switch (msg_ptr[ICP_PACKET_TYPE]) {
+	case HFI_MSG_SYS_INIT_DONE:
+		*pkt_size = (
+			(struct hfi_msg_init_done *)msg_ptr)->size;
+		break;
+	case HFI_MSG_SYS_PC_PREP_DONE:
+		*pkt_size = sizeof(struct hfi_msg_pc_prep_done);
+		break;
+	case HFI_MSG_SYS_PING_ACK:
+		*pkt_size = sizeof(struct hfi_msg_ping_ack);
+		break;
+	case HFI_MSG_IPEBPS_CREATE_HANDLE_ACK:
+	case HFI_MSG_OFE_CREATE_HANDLE_ACK:
+		*pkt_size = sizeof(struct hfi_msg_create_handle_ack);
+		break;
+	case HFI_MSG_IPEBPS_ASYNC_COMMAND_INDIRECT_ACK:
+		*pkt_size = (
+			(struct hfi_msg_dev_async_ack *)msg_ptr)->size;
+		break;
+	case HFI_MSG_OFE_ASYNC_COMMAND_ACK:
+		*pkt_size = (
+			(struct hfi_msg_dev_async_ack *)msg_ptr)->size;
+		break;
+	case HFI_MSG_IPEBPS_ASYNC_COMMAND_DIRECT_ACK:
+		*pkt_size = (
+			(struct hfi_msg_dev_async_ack *)msg_ptr)->size;
+		break;
+	case HFI_MSG_EVENT_NOTIFY:
+		*pkt_size = (
+			(struct hfi_msg_event_notify *)msg_ptr)->size;
+		break;
+	case HFI_MSG_DBG_SYNX_TEST:
+		*pkt_size = sizeof(struct hfi_cmd_synx_test_payload);
+		break;
+	default:
+		CAM_ERR(CAM_ICP, "[%s] invalid msg : %u",
+			hw_mgr->hw_mgr_name, msg_ptr[ICP_PACKET_TYPE]);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int cam_icp_mgr_process_msg(struct cam_icp_hw_mgr *hw_mgr)
 {
-	uint32_t read_len, msg_processed_len;
+	uint32_t msg_pkt_size, read_in_words;
+	uint32_t remain_len, pre_remain_len = 0;
 	uint32_t *msg_ptr = NULL;
-	struct hfi_msg_work_data *task_data;
-	struct cam_icp_hw_mgr *hw_mgr;
+	uint32_t buf_word_size = ICP_MSG_BUF_SIZE_IN_WORDS;
 	int rc = 0;
 
-	if (!data || !priv) {
+	if (!hw_mgr) {
 		CAM_ERR(CAM_ICP, "Invalid data");
 		return -EINVAL;
 	}
 
-	task_data = data;
-	hw_mgr = priv;
+	do {
+		rc = hfi_read_message(hw_mgr->hfi_handle,
+			hw_mgr->msg_buf + (pre_remain_len >> BYTE_WORD_SHIFT),
+			Q_MSG, buf_word_size, &read_in_words);
+		if (rc) {
+			if (rc != -ENOMSG)
+				CAM_DBG(CAM_ICP, "Unable to read msg q rc %d", rc);
+			break;
+		}
 
-	rc = hfi_read_message(hw_mgr->hfi_handle, hw_mgr->msg_buf, Q_MSG,
-		ICP_MSG_BUF_SIZE_IN_WORDS, &read_len);
-	if (rc) {
-		CAM_DBG(CAM_ICP, "Unable to read msg q rc %d", rc);
-	} else {
-		read_len = read_len << BYTE_WORD_SHIFT;
+		remain_len = pre_remain_len + (read_in_words << BYTE_WORD_SHIFT);
+		pre_remain_len = 0;
 		msg_ptr = (uint32_t *)hw_mgr->msg_buf;
-		while (true) {
-			cam_icp_process_msg_pkt_type(hw_mgr, msg_ptr,
-				&msg_processed_len);
+		buf_word_size = ICP_MSG_BUF_SIZE_IN_WORDS;
 
-			if (!msg_processed_len) {
-				CAM_ERR(CAM_ICP, "Failed to read");
-				rc = -EINVAL;
+		while (remain_len) {
+			rc = cam_icp_get_msg_pkt_size(hw_mgr, msg_ptr, &msg_pkt_size);
+			if (rc) {
+				CAM_ERR(CAM_ICP, "Failed to get pkt size");
 				break;
 			}
 
-			read_len -= msg_processed_len;
-			if (read_len > 0) {
-				msg_ptr += (msg_processed_len >>
-				BYTE_WORD_SHIFT);
-				msg_processed_len = 0;
-			} else {
+			if (remain_len < msg_pkt_size) {
+				/*
+				 * MSG is broken into two parts, need to read from msg q again
+				 * to complete the msg and get the remaining packets. Copy
+				 * the remain data to start of buffer and shift buffer ptr to
+				 * after the remaining data ends to read from queue.
+				 */
+				memcpy(hw_mgr->msg_buf, msg_ptr, remain_len);
+				pre_remain_len = remain_len;
+				buf_word_size -= (pre_remain_len >> BYTE_WORD_SHIFT);
 				break;
 			}
+
+			rc = cam_icp_process_msg_pkt_type(hw_mgr, msg_ptr);
+			if (rc)
+				CAM_ERR(CAM_ICP, "Failed to process MSG");
+
+			remain_len -= msg_pkt_size;
+			if (remain_len > 0) {
+				msg_ptr += (msg_pkt_size >> BYTE_WORD_SHIFT);
+				msg_pkt_size = 0;
+			} else
+				break;
 		}
+	/* Repeat reading if drain buffer is insufficient to read all MSGs at once */
+	} while (read_in_words >= buf_word_size);
+
+	return rc;
+}
+
+static int32_t cam_icp_mgr_process_cb(void *priv, void *data)
+{	struct hfi_msg_work_data *task_data;
+	struct cam_icp_hw_mgr *hw_mgr;
+	int rc = 0;
+
+	if (!data || !priv) {
+		CAM_ERR(CAM_ICP, "Invalid data");
+		return -EINVAL;
 	}
 
+	task_data = data;
+	hw_mgr = priv;
+
+	rc = cam_icp_mgr_process_msg(hw_mgr);
+	if (rc && (rc != -ENOMSG))
+		CAM_ERR(CAM_ICP, "Failed to process MSG");
+
 	cam_icp_mgr_process_dbg_buf(hw_mgr);
 
 	if (task_data->recover) {
@@ -3170,7 +3250,7 @@ static int32_t cam_icp_hw_mgr_cb(void *data, bool recover)
 	task_data->data = hw_mgr;
 	task_data->recover = recover;
 	task_data->type = ICP_WORKQ_TASK_MSG_TYPE;
-	task->process_cb = cam_icp_mgr_process_msg;
+	task->process_cb = cam_icp_mgr_process_cb;
 	rc = cam_req_mgr_workq_enqueue_task(task, hw_mgr,
 		CRM_TASK_PRIORITY_0);
 	spin_unlock_irqrestore(&hw_mgr->hw_mgr_lock, flags);
@@ -4648,7 +4728,7 @@ static int cam_icp_mgr_device_init(struct cam_icp_hw_mgr *hw_mgr)
 hw_dev_deinit:
 	for (; i >= 0; i--) {
 		dev_info = &hw_mgr->dev_info[i];
-		j = (j == -1) ? (dev_info->hw_dev_cnt - 1) : (j - 1);
+		j = (j == -1) ? dev_info->hw_dev_cnt : (j - 1);
 		for (; j >= 0; j--) {
 			dev_intf = dev_info->dev_intf[j];
 			dev_intf->hw_ops.deinit(dev_intf->hw_priv, NULL, 0);
@@ -5393,8 +5473,7 @@ static bool cam_icp_mgr_is_valid_outconfig(struct cam_packet *packet)
 		packet->io_configs_offset/4);
 
 	for (i = 0 ; i < packet->num_io_configs; i++)
-		if ((io_cfg_ptr[i].direction == CAM_BUF_OUTPUT) ||
-			(io_cfg_ptr[i].direction == CAM_BUF_IN_OUT))
+		if (io_cfg_ptr[i].direction == CAM_BUF_OUTPUT)
 			num_out_map_entries++;
 
 	if (num_out_map_entries <= CAM_MAX_OUT_RES) {
@@ -5551,20 +5630,13 @@ static int cam_icp_mgr_process_io_cfg(struct cam_icp_hw_mgr *hw_mgr,
 		if (io_cfg_ptr[i].direction == CAM_BUF_INPUT) {
 			sync_in_obj[j++] = io_cfg_ptr[i].fence;
 			prepare_args->num_in_map_entries++;
-		} else if ((io_cfg_ptr[i].direction == CAM_BUF_OUTPUT) ||
-			(io_cfg_ptr[i].direction == CAM_BUF_IN_OUT)) {
+		} else {
 			prepare_args->out_map_entries[k].sync_id =
 				io_cfg_ptr[i].fence;
 			prepare_args->out_map_entries[k].resource_handle =
 				io_cfg_ptr[i].resource_type;
 			k++;
 			prepare_args->num_out_map_entries++;
-		} else {
-			CAM_ERR(CAM_ICP, "dir: %d, max_out:%u, out %u",
-				io_cfg_ptr[i].direction,
-				prepare_args->max_out_map_entries,
-				prepare_args->num_out_map_entries);
-			return -EINVAL;
 		}
 
 		CAM_DBG(CAM_REQ,
@@ -5792,11 +5864,6 @@ static int cam_icp_packet_generic_blob_handler(void *user_data,
 
 	switch (blob_type) {
 	case CAM_ICP_CMD_GENERIC_BLOB_CLK:
-		if (index < 0) {
-			CAM_ERR(CAM_ICP, "Invalid index %d", index);
-			return -EINVAL;
-		}
-
 		CAM_WARN_RATE_LIMIT_CUSTOM(CAM_PERF, 300, 1,
 			"Using deprecated blob type GENERIC_BLOB_CLK");
 		if (blob_size != sizeof(struct cam_icp_clk_bw_request)) {
@@ -5828,11 +5895,6 @@ static int cam_icp_packet_generic_blob_handler(void *user_data,
 		break;
 
 	case CAM_ICP_CMD_GENERIC_BLOB_CLK_V2:
-		if (index < 0) {
-			CAM_ERR(CAM_ICP, "Invalid index %d", index);
-			return -EINVAL;
-		}
-
 		if (blob_size < sizeof(struct cam_icp_clk_bw_request_v2)) {
 			CAM_ERR(CAM_ICP, "%s: Mismatch blob size %d expected %lu",
 				ctx_data->ctx_id_string,
@@ -5980,11 +6042,6 @@ static int cam_icp_packet_generic_blob_handler(void *user_data,
 		break;
 
 	case CAM_ICP_CMD_GENERIC_BLOB_PRESIL_HANGDUMP:
-		if (index < 0) {
-			CAM_ERR(CAM_ICP, "Invalid index %d", index);
-			return -EINVAL;
-		}
-
 		if (cam_presil_mode_enabled()) {
 			cmd_mem_regions = (struct cam_cmd_mem_regions *)blob_data;
 			if (cmd_mem_regions->num_regions <= 0) {
@@ -6204,10 +6261,10 @@ static int cam_icp_mgr_prepare_hw_update(void *hw_mgr_priv,
 
 	packet = prepare_args->packet;
 
-	if (cam_packet_util_validate_packet(packet, prepare_args->remain_len)) {
-		mutex_unlock(&ctx_data->ctx_mutex);
-		return -EINVAL;
-	}
+ 	if (cam_packet_util_validate_packet(packet, prepare_args->remain_len)) {
+ 		mutex_unlock(&ctx_data->ctx_mutex);
+  		return -EINVAL;
+ 	}
 
 	rc = cam_icp_mgr_pkt_validation(ctx_data, packet);
 	if (rc) {
@@ -6596,7 +6653,7 @@ static int cam_icp_mgr_hw_dump(void *hw_priv, void *hw_dump_args)
 	*mgr_addr++ = hw_mgr->icp_booted;
 	*mgr_addr++ = hw_mgr->icp_resumed;
 	*mgr_addr++ = hw_mgr->disable_ubwc_comp;
-	memcpy(mgr_addr, &hw_mgr->dev_info, sizeof(struct cam_icp_hw_device_info));
+	memcpy(mgr_addr, &hw_mgr->dev_info, sizeof(hw_mgr->dev_info));
 	mgr_addr += sizeof(hw_mgr->dev_info);
 	*mgr_addr++ = hw_mgr->icp_pc_flag;
 	*mgr_addr++ = hw_mgr->dev_pc_flag;
@@ -7629,7 +7686,7 @@ static int cam_icp_mgr_alloc_devs(struct device_node *np, struct cam_icp_hw_mgr
 	struct cam_hw_intf **alloc_devices = NULL;
 	int rc, i;
 	enum cam_icp_hw_type icp_hw_type;
-	uint32_t num = 0, mask = 0, num_cpas_mask = 0, cpas_hw_mask[MAX_HW_CAPS_MASK] = {0};
+	uint32_t num = 0, num_cpas_mask = 0, cpas_hw_mask[MAX_HW_CAPS_MASK] = {0};
 
 	rc = cam_icp_alloc_processor_devs(np, &icp_hw_type, &alloc_devices, hw_dev_cnt);
 	if (rc) {
@@ -7658,11 +7715,6 @@ static int cam_icp_mgr_alloc_devs(struct device_node *np, struct cam_icp_hw_mgr
 	devices[icp_hw_type] = alloc_devices;
 	hw_mgr->hw_cap_mask |= BIT(icp_hw_type);
 	num_cpas_mask = max(num_cpas_mask, (uint32_t)(ICP_CAPS_MASK_IDX + 1));
-
-	rc = of_property_read_u32(np, "icp-mask", &mask);
-	if (!rc)
-		icp_cpas_mask[hw_mgr->hw_mgr_id] = mask;
-
 	cpas_hw_mask[ICP_CAPS_MASK_IDX] |= icp_cpas_mask[hw_mgr->hw_mgr_id];
 
 	rc = of_property_read_u32(np, "num-ipe", &num);
@@ -7678,12 +7730,7 @@ static int cam_icp_mgr_alloc_devs(struct device_node *np, struct cam_icp_hw_mgr
 		devices[CAM_ICP_DEV_IPE] = alloc_devices;
 		hw_mgr->hw_cap_mask |= BIT(CAM_ICP_DEV_IPE);
 		num_cpas_mask = max(num_cpas_mask, (uint32_t)(IPE_CAPS_MASK_IDX + 1));
-
-		rc = of_property_read_u32(np, "ipe0-mask", &mask);
-		if (!rc)
-			cpas_hw_mask[IPE_CAPS_MASK_IDX] |= mask;
-		else
-			cpas_hw_mask[IPE_CAPS_MASK_IDX] |= CPAS_TITAN_IPE0_CAP_BIT;
+		cpas_hw_mask[IPE_CAPS_MASK_IDX] |= CPAS_TITAN_IPE0_CAP_BIT;
 	}
 
 	rc = of_property_read_u32(np, "num-bps", &num);
@@ -7699,12 +7746,7 @@ static int cam_icp_mgr_alloc_devs(struct device_node *np, struct cam_icp_hw_mgr
 		devices[CAM_ICP_DEV_BPS] = alloc_devices;
 		hw_mgr->hw_cap_mask |= BIT(CAM_ICP_DEV_BPS);
 		num_cpas_mask = max(num_cpas_mask, (uint32_t)(BPS_CAPS_MASK_IDX + 1));
-
-		rc = of_property_read_u32(np, "bps-mask", &mask);
-		if (!rc)
-			cpas_hw_mask[BPS_CAPS_MASK_IDX] |= mask;
-		else
-			cpas_hw_mask[BPS_CAPS_MASK_IDX] |= CPAS_BPS_BIT;
+		cpas_hw_mask[BPS_CAPS_MASK_IDX] |= CPAS_BPS_BIT;
 	}
 
 	rc = of_property_read_u32(np, "num-ofe", &num);
@@ -8163,7 +8205,7 @@ int cam_icp_hw_mgr_init(struct device_node *of_node, uint64_t *hw_mgr_hdl,
 
 	memset(hw_mgr_intf, 0, sizeof(struct cam_hw_mgr_intf));
 
-	hw_mgr = kzalloc(sizeof(struct cam_icp_hw_mgr), GFP_KERNEL);
+	hw_mgr = vzalloc(sizeof(struct cam_icp_hw_mgr));
 	if (!hw_mgr)
 		return -ENOMEM;
 
@@ -8312,7 +8354,7 @@ destroy_mutex:
 			kfree(hw_mgr->ctx_data[i].hfi_frame_process.hangdump_mem_regions);
 	}
 free_hw_mgr:
-	kfree(hw_mgr);
+	vfree(hw_mgr);
 
 	return rc;
 }
@@ -8342,6 +8384,6 @@ void cam_icp_hw_mgr_deinit(int device_idx)
 			kfree(hw_mgr->ctx_data[i].hfi_frame_process.hangdump_mem_regions);
 	}
 
-	kfree(hw_mgr);
+	vfree(hw_mgr);
 	g_icp_hw_mgr[device_idx] = NULL;
 }

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h

@@ -44,7 +44,7 @@
 
 /* size of buffer to drain from msg/dbq queue */
 #define ICP_MSG_BUF_SIZE_IN_WORDS 512
-#define ICP_DBG_BUF_SIZE_IN_WORDS 25600
+#define ICP_DBG_BUF_SIZE_IN_WORDS 5120
 
 #define ICP_OVER_CLK_THRESHOLD  5
 #define ICP_TWO_DEV_BW_SHARE_RATIO 2

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_icp_hw_intf.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef CAM_ICP_HW_INTF_H
@@ -55,7 +55,6 @@ enum cam_icp_dev_cmd_type {
 	CAM_ICP_DEV_CMD_UPDATE_CLK,
 	CAM_ICP_DEV_CMD_DISABLE_CLK,
 	CAM_ICP_DEV_CMD_RESET,
-	CAM_ICP_DEV_CMD_DUMP_CLK,
 	CAM_ICP_DEV_CMD_MAX
 };
 

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/icp_proc/icp_common/cam_icp_proc_common.c

@@ -195,8 +195,14 @@ int cam_icp_proc_mini_dump(struct cam_icp_hw_dump_args *args,
 static int cam_icp_proc_validate_ubwc_cfg(struct cam_icp_ubwc_cfg *ubwc_cfg,
 	uint32_t ubwc_cfg_dev_mask)
 {
-	uint32_t found_ubwc_cfg_mask = ubwc_cfg->found_ubwc_cfg_mask;
+	uint32_t found_ubwc_cfg_mask;
 
+	if (!ubwc_cfg) {
+		CAM_ERR(CAM_ICP, "ubwc_cfg is NULL");
+		return -ENODATA;
+	}
+
+	found_ubwc_cfg_mask = ubwc_cfg->found_ubwc_cfg_mask;
 	if ((ubwc_cfg_dev_mask & BIT(CAM_ICP_DEV_IPE)) &&
 		!(found_ubwc_cfg_mask & BIT(CAM_ICP_DEV_IPE))) {
 		CAM_ERR(CAM_ICP, "IPE does not have UBWC cfg value");

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/icp_proc/icp_v1_hw/cam_icp_v1_dev.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -212,12 +212,6 @@ static void cam_icp_v1_component_unbind(struct device *dev,
 	struct platform_device *pdev = to_platform_device(dev);
 
 	icp_v1_dev_intf = platform_get_drvdata(pdev);
-
-	if (!icp_v1_dev_intf) {
-		CAM_ERR(CAM_ICP, "Error No data in pdev");
-		return;
-	}
-
 	icp_v1_dev = icp_v1_dev_intf->hw_priv;
 	core_info = (struct cam_icp_v1_device_core_info *)icp_v1_dev->core_info;
 

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/icp_proc/icp_v2_hw/cam_icp_v2_dev.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -165,17 +165,8 @@ static void cam_icp_v2_component_unbind(struct device *dev,
 	struct device *mdev, void *data)
 {
 	struct platform_device *pdev = to_platform_device(dev);
-	struct cam_hw_intf *icp_v2_intf = NULL;
-	struct cam_hw_info *icp_v2_info = NULL;
-
-	icp_v2_intf = platform_get_drvdata(pdev);
-
-	if (!icp_v2_intf) {
-		CAM_ERR(CAM_ICP, "Error No data in pdev");
-		return;
-	}
-
-	icp_v2_info = icp_v2_intf->hw_priv;
+	struct cam_hw_intf *icp_v2_intf = platform_get_drvdata(pdev);
+	struct cam_hw_info *icp_v2_info = icp_v2_intf->hw_priv;
 
 	cam_icp_v2_cpas_unregister(icp_v2_intf);
 	cam_icp_soc_resources_deinit(&icp_v2_info->soc_info);

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h

@@ -21,7 +21,7 @@
 
 #define CAM_ICP_BW_BYTES_VOTE    40000000
 
-#define CAM_ICP_CTX_MAX          54
+#define CAM_ICP_CTX_MAX          64
 
 #define CPAS_IPE1_BIT            0x2000
 

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/ipe_hw/ipe_core.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/of.h>
@@ -465,10 +465,6 @@ int cam_ipe_process_cmd(void *device_priv, uint32_t cmd_type,
 	case CAM_ICP_DEV_CMD_RESET:
 		rc = cam_ipe_cmd_reset(soc_info, core_info);
 		break;
-	case CAM_ICP_DEV_CMD_DUMP_CLK: {
-		rc = cam_soc_util_dump_clk(soc_info);
-		break;
-	}
 	default:
 		CAM_ERR(CAM_ICP, "Invalid Cmd Type:%u", cmd_type);
 		rc = -EINVAL;

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/ipe_hw/ipe_dev.c

@@ -188,12 +188,6 @@ static void cam_ipe_component_unbind(struct device *dev,
 
 	CAM_DBG(CAM_ICP, "Unbinding component: %s", pdev->name);
 	ipe_dev_intf = platform_get_drvdata(pdev);
-
-	if (!ipe_dev_intf) {
-		CAM_ERR(CAM_ICP, "Error No data in pdev");
-		return;
-	}
-
 	ipe_dev = ipe_dev_intf->hw_priv;
 	core_info = (struct cam_ipe_device_core_info *)ipe_dev->core_info;
 	cam_cpas_unregister_client(core_info->cpas_handle);

qcom/opensource/camera-kernel/drivers/cam_icp/icp_hw/ofe_hw/ofe_dev.c

@@ -184,12 +184,6 @@ static void cam_ofe_component_unbind(struct device *dev,
 
 	CAM_DBG(CAM_ICP, "Unbinding component: %s", pdev->name);
 	ofe_dev_intf = platform_get_drvdata(pdev);
-
-	if (!ofe_dev_intf) {
-		CAM_ERR(CAM_ICP, "Error No data in pdev");
-		return;
-	}
-
 	ofe_dev = ofe_dev_intf->hw_priv;
 	core_info = (struct cam_ofe_device_core_info *)ofe_dev->core_info;
 	cam_cpas_unregister_client(core_info->cpas_handle);

qcom/opensource/camera-kernel/drivers/cam_isp/cam_isp_context.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_ISP_CONTEXT_H_
@@ -105,7 +105,6 @@ enum cam_isp_ctx_event {
 	CAM_ISP_CTX_EVENT_EPOCH,
 	CAM_ISP_CTX_EVENT_RUP,
 	CAM_ISP_CTX_EVENT_BUFDONE,
-	CAM_ISP_CTX_EVENT_SHUTTER,
 	CAM_ISP_CTX_EVENT_MAX
 };
 
@@ -199,7 +198,7 @@ struct cam_isp_ctx_req {
 	uint32_t                              num_fence_map_in;
 	uint32_t                              num_acked;
 	uint32_t                              num_deferred_acks;
-	uint32_t                             *deferred_fence_map_index;
+	uint32_t                  deferred_fence_map_index[CAM_ISP_CTX_RES_MAX];
 	int32_t                               bubble_report;
 	struct cam_isp_prepare_hw_update_data hw_update_data;
 	enum cam_hw_config_reapply_type       reapply_type;
@@ -242,14 +241,6 @@ struct cam_isp_context_req_id_info {
 	int64_t                          last_bufdone_req_id;
 };
 
-struct shutter_event {
-	uint64_t frame_id;
-	uint64_t req_id;
-	uint32_t status;
-	ktime_t  boot_ts;
-	ktime_t  sof_ts;
-};
-
 /**
  *
  *
@@ -261,12 +252,8 @@ struct shutter_event {
  *
  */
 struct cam_isp_context_event_record {
-	uint64_t req_id;
-	ktime_t  timestamp;
-	int event_type;
-	union event {
-		struct shutter_event shutter_event;
-	} event;
+	uint64_t                         req_id;
+	ktime_t                          timestamp;
 };
 
 /**
@@ -420,9 +407,6 @@ struct cam_isp_fcg_prediction_tracker {
  * @hw_idx:                    Hardware ID
  * @fcg_tracker:               FCG prediction tracker containing number of previously skipped
  *                             frames and indicates which prediction should be used
- * @is_shdr:                   true, if usecase is sdhr
- * @is_shdr_master:            Flag to indicate master context in shdr usecase
- * @last_num_exp:              Last num of exposure
  *
  */
 struct cam_isp_context {
@@ -487,9 +471,6 @@ struct cam_isp_context {
 	bool                                  mode_switch_en;
 	uint32_t                              hw_idx;
 	struct cam_isp_fcg_prediction_tracker fcg_tracker;
-	bool                                  is_tfe_shdr;
-	bool                                  is_shdr_master;
-	uint32_t                              last_num_exp;
 };
 
 /**

qcom/opensource/camera-kernel/drivers/cam_isp/cam_isp_dev.c

@@ -73,22 +73,6 @@ static void cam_isp_dev_iommu_fault_handler(struct cam_smmu_pf_info *pf_smmu_inf
 	}
 }
 
-static void cam_isp_subdev_handle_message(
-		struct v4l2_subdev *sd,
-		enum cam_subdev_message_type_t message_type,
-		void *data)
-{
-	int i, rc = 0;
-	struct cam_node  *node = v4l2_get_subdevdata(sd);
-
-	CAM_DBG(CAM_ISP, "node name %s", node->name);
-	for (i = 0; i < node->ctx_size; i++) {
-		rc = cam_context_handle_message(&(node->ctx_list[i]), message_type, data);
-		if (rc)
-			CAM_ERR(CAM_ISP, "Failed to handle message for %s", node->name);
-	}
-}
-
 static const struct of_device_id cam_isp_dt_match[] = {
 	{
 		.compatible = "qcom,cam-isp"
@@ -186,7 +170,6 @@ static int cam_isp_dev_component_bind(struct device *dev,
 	} else if (strnstr(compat_str, "tfe", strlen(compat_str))) {
 		rc = cam_subdev_probe(&g_isp_dev.sd, pdev, CAM_ISP_DEV_NAME,
 		CAM_TFE_DEVICE_TYPE);
-		g_isp_dev.sd.msg_cb = cam_isp_subdev_handle_message;
 		g_isp_dev.isp_device_type = CAM_TFE_DEVICE_TYPE;
 		g_isp_dev.max_context = CAM_TFE_CTX_MAX;
 	} else  {
@@ -202,22 +185,19 @@ static int cam_isp_dev_component_bind(struct device *dev,
 	node = (struct cam_node *) g_isp_dev.sd.token;
 
 	memset(&hw_mgr_intf, 0, sizeof(hw_mgr_intf));
-	g_isp_dev.ctx = kcalloc(g_isp_dev.max_context,
-		sizeof(struct cam_context),
-		GFP_KERNEL);
+	g_isp_dev.ctx = vzalloc(g_isp_dev.max_context * sizeof(struct cam_context));
 	if (!g_isp_dev.ctx) {
 		CAM_ERR(CAM_ISP,
 			"Mem Allocation failed for ISP base context");
 		goto unregister;
 	}
 
-	g_isp_dev.ctx_isp = kcalloc(g_isp_dev.max_context,
-		sizeof(struct cam_isp_context),
-		GFP_KERNEL);
+	g_isp_dev.ctx_isp = vzalloc(
+		g_isp_dev.max_context * sizeof(struct cam_isp_context));
 	if (!g_isp_dev.ctx_isp) {
 		CAM_ERR(CAM_ISP,
 			"Mem Allocation failed for Isp private context");
-		kfree(g_isp_dev.ctx);
+		vfree(g_isp_dev.ctx);
 		g_isp_dev.ctx = NULL;
 		goto unregister;
 	}
@@ -242,12 +222,8 @@ static int cam_isp_dev_component_bind(struct device *dev,
 		}
 	}
 
-	if (g_isp_dev.isp_device_type == CAM_IFE_DEVICE_TYPE)
-		cam_common_register_evt_inject_cb(cam_isp_dev_evt_inject_cb,
-			CAM_COMMON_EVT_INJECT_HW_IFE);
-	else
-		cam_common_register_evt_inject_cb(cam_isp_dev_evt_inject_cb,
-			CAM_COMMON_EVT_INJECT_HW_TFE);
+	cam_common_register_evt_inject_cb(cam_isp_dev_evt_inject_cb,
+		CAM_COMMON_EVT_INJECT_HW_ISP);
 
 	rc = cam_node_init(node, &hw_mgr_intf, g_isp_dev.ctx,
 			g_isp_dev.max_context, CAM_ISP_DEV_NAME);
@@ -268,9 +244,9 @@ static int cam_isp_dev_component_bind(struct device *dev,
 	return 0;
 
 free_mem:
-	kfree(g_isp_dev.ctx);
+	vfree(g_isp_dev.ctx);
 	g_isp_dev.ctx = NULL;
-	kfree(g_isp_dev.ctx_isp);
+	vfree(g_isp_dev.ctx_isp);
 	g_isp_dev.ctx_isp = NULL;
 
 unregister:
@@ -299,9 +275,9 @@ static void cam_isp_dev_component_unbind(struct device *dev,
 				 i);
 	}
 
-	kfree(g_isp_dev.ctx);
+	vfree(g_isp_dev.ctx);
 	g_isp_dev.ctx = NULL;
-	kfree(g_isp_dev.ctx_isp);
+	vfree(g_isp_dev.ctx_isp);
 	g_isp_dev.ctx_isp = NULL;
 
 	rc = cam_subdev_remove(&g_isp_dev.sd);

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.h

@@ -64,7 +64,7 @@ enum cam_ife_ctx_master_type {
  * @rx_capture_debug_set:      If rx capture debug is set by user
  * @disable_isp_drv:           Disable ISP DRV config
  * @enable_presil_reg_dump:    Enable per req regdump in presil
- * @enable_cdm_cmd_check:      Enable invalid command check in cmd_buf
+ *
  */
 struct cam_ife_hw_mgr_debug {
 	struct dentry  *dentry;
@@ -87,7 +87,6 @@ struct cam_ife_hw_mgr_debug {
 	bool           rx_capture_debug_set;
 	bool           disable_isp_drv;
 	bool           enable_presil_reg_dump;
-	bool           enable_cdm_cmd_check;
 #if defined(CONFIG_SAMSUNG_DEBUG_SENSOR_TIMING)
 	uint32_t       csid_dbg_fps;
 	uint32_t       vfe_dbg_fps;

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_TFE_HW_MGR_H_
@@ -19,6 +19,7 @@
 
 /* TFE resource constants */
 #define CAM_TFE_HW_IN_RES_MAX            (CAM_ISP_TFE_IN_RES_MAX & 0xFF)
+#define CAM_TFE_HW_OUT_RES_MAX           (CAM_ISP_TFE_OUT_RES_MAX & 0xFF)
 #define CAM_TFE_HW_RES_POOL_MAX          64
 
 /**
@@ -31,7 +32,7 @@
  * @camif_debug:               enable sensor diagnosis status
  * @enable_reg_dump:           enable reg dump on error;
  * @per_req_reg_dump:          Enable per request reg dump
- * @enable_cdm_cmd_check:      Enable invalid command check in cmd_buf
+ *
  */
 struct cam_tfe_hw_mgr_debug {
 	struct dentry  *dentry;
@@ -41,7 +42,6 @@ struct cam_tfe_hw_mgr_debug {
 	uint32_t       camif_debug;
 	uint32_t       enable_reg_dump;
 	uint32_t       per_req_reg_dump;
-	bool           enable_cdm_cmd_check;
 };
 
 /**
@@ -71,28 +71,6 @@ struct cam_tfe_comp_record_query {
 	void *reserved;
 };
 
-/**
- * struct cam_tfe_cdm_user_data - TFE HW user data with CDM
- *
- * @prepare:                   hw_update_data
- * @request_id:                Request id
- */
-struct cam_tfe_cdm_user_data {
-	struct cam_isp_prepare_hw_update_data    *hw_update_data;
-	uint64_t                                  request_id;
-};
-
-/**
- * struct cam_isp_tfe_hw_caps - BUS capabilities
- *
- * @max_tfe_out_res_type  :  max tfe out res type value from hw
- * @support_consumed_addr :  indicate whether hw supports last consumed address
- */
-struct cam_isp_tfe_hw_caps {
-	uint32_t     max_tfe_out_res_type;
-	bool         support_consumed_addr;
-};
-
 /**
  * struct cam_tfe_hw_mgr_ctx - TFE HW manager Context object
  *
@@ -104,9 +82,7 @@ struct cam_isp_tfe_hw_caps {
  * @res_list_csid:            csid resource list
  * @res_list_tfe_in:          tfe input resource list
  * @res_list_tfe_out:         tfe output resoruces array
- * @num_acq_tfe_out:          Number of acquired TFE out resources
  * @free_res_list:            free resources list for the branch node
- * @tfe_out_map:              Map for TFE out ports
  * @res_pool:                 memory storage for the free resource list
  * @base                      device base index array contain the all TFE HW
  *                            instance associated with this context.
@@ -137,14 +113,6 @@ struct cam_isp_tfe_hw_caps {
  * @packet                     CSL packet from user mode driver
  * @bw_config_version          BW Config version
  * @tfe_bus_comp_grp          pointer to tfe comp group info
- * @cdm_userdata               CDM user data
- * @try_recovery_cnt          Retry count for overflow recovery
- * @current_mup               Current MUP val
- * @recovery_req_id           The request id on which overflow recovery happens
- * @acquired_wm_mask          Bitmask of acquired out resource
- * @is_shdr                   Indicate if the usecase is SHDR
- * @is_shdr_slave             Indicate whether context is slave in shdr usecase
- * @ctx_state                 Indicate if ctx is active or paused
  */
 struct cam_tfe_hw_mgr_ctx {
 	struct list_head                list;
@@ -156,11 +124,10 @@ struct cam_tfe_hw_mgr_ctx {
 
 	struct list_head                res_list_tfe_csid;
 	struct list_head                res_list_tfe_in;
-	struct cam_isp_hw_mgr_res       *res_list_tfe_out;
-	uint32_t                        num_acq_tfe_out;
+	struct cam_isp_hw_mgr_res
+			res_list_tfe_out[CAM_TFE_HW_OUT_RES_MAX];
 
 	struct list_head                free_res_list;
-	uint8_t                         *tfe_out_map;
 	struct cam_isp_hw_mgr_res       res_pool[CAM_TFE_HW_RES_POOL_MAX];
 
 	struct cam_isp_ctx_base_info    base[CAM_TFE_HW_NUM_MAX];
@@ -189,15 +156,6 @@ struct cam_tfe_hw_mgr_ctx {
 	struct cam_packet              *packet;
 	uint32_t                        bw_config_version;
 	struct cam_tfe_hw_comp_record  *tfe_bus_comp_grp;
-	struct cam_tfe_cdm_user_data    cdm_userdata;
-	uint32_t                        current_mup;
-	uint32_t                        try_recovery_cnt;
-	uint64_t                        recovery_req_id;
-	uint64_t                        acquired_wm_mask;
-	enum cam_cdm_id                 cdm_id;
-	bool                            is_shdr;
-	bool                            is_shdr_slave;
-	uint32_t                        ctx_state;
 };
 
 /**
@@ -214,35 +172,31 @@ struct cam_tfe_hw_mgr_ctx {
  * @free_ctx_list:         free hw context list
  * @used_ctx_list:         used hw context list
  * @ctx_pool:              context storage
- * @session_data:          Data related to current session
  * @tfe_csid_dev_caps      csid device capability stored per core
  * @tfe_dev_caps           tfe device capability per core
  * @work q                 work queue for TFE hw manager
  * @debug_cfg              debug configuration
- * @path_port_map          Mapping of outport to TFE mux
+ * @support_consumed_addr  indicate whether hw supports last consumed address
  * @ctx_lock               Spinlock for HW manager
- * @isp_caps               Capability of underlying TFE HW
  */
 struct cam_tfe_hw_mgr {
-	struct cam_isp_hw_mgr            mgr_common;
-	struct cam_hw_intf              *csid_devices[CAM_TFE_CSID_HW_NUM_MAX];
-	struct cam_isp_hw_intf_data     *tfe_devices[CAM_TFE_HW_NUM_MAX];
-	struct cam_soc_reg_map          *cdm_reg_map[CAM_TFE_HW_NUM_MAX];
-	struct mutex                     ctx_mutex;
-	atomic_t                         active_ctx_cnt;
-	struct list_head                 free_ctx_list;
-	struct list_head                 used_ctx_list;
-	struct cam_tfe_hw_mgr_ctx        ctx_pool[CAM_TFE_CTX_MAX];
-	struct cam_isp_session_data      session_data[CAM_TFE_HW_NUM_MAX];
-
-	struct cam_tfe_csid_hw_caps      tfe_csid_dev_caps[
+	struct cam_isp_hw_mgr          mgr_common;
+	struct cam_hw_intf            *csid_devices[CAM_TFE_CSID_HW_NUM_MAX];
+	struct cam_isp_hw_intf_data   *tfe_devices[CAM_TFE_HW_NUM_MAX];
+	struct cam_soc_reg_map        *cdm_reg_map[CAM_TFE_HW_NUM_MAX];
+	struct mutex                   ctx_mutex;
+	atomic_t                       active_ctx_cnt;
+	struct list_head               free_ctx_list;
+	struct list_head               used_ctx_list;
+	struct cam_tfe_hw_mgr_ctx      ctx_pool[CAM_TFE_CTX_MAX];
+
+	struct cam_tfe_csid_hw_caps    tfe_csid_dev_caps[
 						CAM_TFE_CSID_HW_NUM_MAX];
-	struct cam_tfe_hw_get_hw_cap     tfe_dev_caps[CAM_TFE_HW_NUM_MAX];
-	struct cam_req_mgr_core_workq   *workq;
-	struct cam_tfe_hw_mgr_debug      debug_cfg;
-	struct cam_isp_hw_path_port_map  path_port_map;
-	spinlock_t                       ctx_lock;
-	struct cam_isp_tfe_hw_caps       isp_caps;
+	struct cam_tfe_hw_get_hw_cap   tfe_dev_caps[CAM_TFE_HW_NUM_MAX];
+	struct cam_req_mgr_core_workq *workq;
+	struct cam_tfe_hw_mgr_debug    debug_cfg;
+	bool                           support_consumed_addr;
+	spinlock_t                     ctx_lock;
 };
 
 /**

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <media/cam_defs.h>
@@ -767,8 +767,8 @@ static int cam_isp_io_buf_get_entries_util(
 				&buf_info->scratch_check_cfg->ife_scratch_res_info,
 				io_cfg->resource_type);
 		}
-		*hw_mgr_res = &buf_info->res_list_isp_out[buf_info->out_map[res_id]];
 
+		*hw_mgr_res = &buf_info->res_list_isp_out[buf_info->out_map[res_id]];
 		if ((*hw_mgr_res)->res_type == CAM_ISP_RESOURCE_UNINT) {
 			CAM_ERR(CAM_ISP, "io res id:%d not valid",
 				io_cfg->resource_type);
@@ -852,8 +852,9 @@ static int cam_isp_add_io_buffers_util(
 	struct cam_hw_fence_map_entry      *out_map_entry = NULL;
 	struct cam_smmu_buffer_tracker     *old_head_entry, *new_head_entry;
 	uint32_t                            kmd_buf_remain_size;
-	uint32_t                            plane_id;
-	int                                 num_entries;
+	uint32_t                            plane_id;	
+	uint32_t                            num_entries;
+
 	dma_addr_t                         *image_buf_addr;
 	uint32_t                           *image_buf_offset;
 	size_t                              size;
@@ -1013,6 +1014,7 @@ static int cam_isp_add_io_buffers_util(
 			num_entries = buf_info->prepare->num_out_map_entries - 1;
 			out_map_entry =
 				&buf_info->prepare->out_map_entries[num_entries];
+			
 			if (!out_map_entry) {
 				CAM_ERR(CAM_ISP, "out_map_entry is NULL");
 				rc = -EINVAL;
@@ -1124,7 +1126,7 @@ int cam_isp_add_io_buffers(struct cam_isp_io_buf_info   *io_info)
 	int                                 rc = 0;
 	struct cam_buf_io_cfg              *io_cfg = NULL;
 	struct cam_isp_hw_mgr_res          *hw_mgr_res = NULL;
-	uint32_t                            i, j;
+	uint32_t                            i;
 	uint32_t                            curr_used_bytes = 0;
 	uint32_t                            bytes_updated = 0;
 	struct cam_isp_resource_node       *res = NULL;
@@ -1133,8 +1135,6 @@ int cam_isp_add_io_buffers(struct cam_isp_io_buf_info   *io_info)
 	uint8_t                             max_out_res = 0;
 	uint64_t                           *mc_cfg = NULL;
 	uint32_t                            major_version = 0;
-	struct cam_isp_prepare_hw_update_data   *prepare_hw_data;
-	uint64_t                                 cfg_io_mask = 0, disabled_wm_mask = 0;
 
 	io_cfg = (struct cam_buf_io_cfg *) ((uint8_t *)
 			&io_info->prepare->packet->payload +
@@ -1161,7 +1161,6 @@ int cam_isp_add_io_buffers(struct cam_isp_io_buf_info   *io_info)
 		}
 	}
 
-	prepare_hw_data = (struct cam_isp_prepare_hw_update_data  *) io_info->prepare->priv;
 	for (i = 0; i < io_info->prepare->packet->num_io_configs; i++) {
 
 		if (major_version == 3) {
@@ -1196,8 +1195,6 @@ int cam_isp_add_io_buffers(struct cam_isp_io_buf_info   *io_info)
 			if (!res)
 				continue;
 
-			cfg_io_mask |= (1 << (res->res_id & 0xFF));
-
 			rc = cam_isp_add_io_buffers_util(io_info, &io_cfg[i], res);
 			if (rc) {
 				CAM_ERR(CAM_ISP, "io_cfg[%d] add buf failed rc %d", i, rc);
@@ -1220,26 +1217,9 @@ int cam_isp_add_io_buffers(struct cam_isp_io_buf_info   *io_info)
 		vfree(mc_cfg);
 	}
 
-	disabled_wm_mask = (prepare_hw_data->wm_bitmask ^ cfg_io_mask);
-
-	if ((io_info->base->hw_type == CAM_ISP_HW_TYPE_TFE) && disabled_wm_mask) {
-		for (j = 0; j < io_info->out_max; j++) {
-			rc = cam_isp_add_disable_wm_update(io_info->prepare,
-					&io_info->res_list_isp_out[io_info->out_map[j]],
-					io_info->base->idx, io_info->kmd_buf_info,
-					&disabled_wm_mask,
-					io_info);
-			if (rc) {
-				CAM_ERR_RATE_LIMIT(CAM_ISP, "Disable out res %d failed",
-						j, rc);
-				return rc;
-			}
-		}
-	}
-
 	bytes_updated = io_info->kmd_buf_info->used_bytes - curr_used_bytes;
-	CAM_DBG(CAM_ISP, "io_cfg_used_bytes %d, fill_fence %d  acuired mask %x cfg mask %x",
-		bytes_updated, io_info->fill_fence, prepare_hw_data->wm_bitmask, cfg_io_mask);
+	CAM_DBG(CAM_ISP, "io_cfg_used_bytes %d, fill_fence %d",
+		bytes_updated, io_info->fill_fence);
 
 	if (bytes_updated) {
 		/**
@@ -1260,82 +1240,17 @@ err:
 	return rc;
 }
 
-int cam_isp_add_disable_wm_update(
-	struct cam_hw_prepare_update_args    *prepare,
-	struct cam_isp_hw_mgr_res            *isp_hw_res,
-	uint32_t                              base_idx,
-	struct cam_kmd_buf_info              *kmd_buf_info,
-	uint64_t                              *wm_mask,
-	struct cam_isp_io_buf_info *io_info)
-{
-	int rc = 0;
-	struct cam_hw_intf                 *hw_intf;
-	struct cam_isp_resource_node       *res;
-	struct cam_isp_hw_get_cmd_update    wm_update;
-	uint32_t kmd_buf_remain_size, i;
-
-	if (prepare->packet->header.request_id == 0)
-		return 0;
-	for (i = 0; i < CAM_ISP_HW_SPLIT_MAX; i++) {
-		if (!isp_hw_res->hw_res[i])
-			continue;
-		hw_intf = isp_hw_res->hw_res[i]->hw_intf;
-		res = isp_hw_res->hw_res[i];
-		if (res->hw_intf->hw_idx != base_idx)
-			continue;
-		if (!(*wm_mask & (1 << res->res_id))) {
-			CAM_DBG(CAM_ISP, "No need to disable out res %d", res->res_id);
-			continue;
-		}
-
-		*wm_mask &= ~BIT(res->res_id);
-
-		if (kmd_buf_info->used_bytes < kmd_buf_info->size) {
-			kmd_buf_remain_size = kmd_buf_info->size - kmd_buf_info->used_bytes;
-		} else {
-			CAM_ERR(CAM_ISP,
-				"no free kmd memory for base=%d bytes_used=%u buf_size=%u",
-				base_idx, kmd_buf_info->used_bytes, kmd_buf_info->size);
-				rc = -EINVAL;
-				return rc;
-		}
-
-		wm_update.cmd.cmd_buf_addr = kmd_buf_info->cpu_addr +
-			kmd_buf_info->used_bytes/4;
-		wm_update.cmd.size = kmd_buf_remain_size;
-		wm_update.cmd_type = CAM_ISP_HW_CMD_BUS_WM_DISABLE;
-		wm_update.res = res;
-		rc = res->hw_intf->hw_ops.process_cmd(
-			res->hw_intf->hw_priv,
-			CAM_ISP_HW_CMD_BUS_WM_DISABLE, &wm_update,
-			sizeof(struct cam_isp_hw_get_cmd_update));
-		if (rc) {
-			CAM_ERR(CAM_ISP, "Diaable res %d failed split %d",
-				res->res_id, i);
-			return rc;
-		}
-		CAM_DBG(CAM_ISP,
-			"Out res %d disable update added hw_id %d cdm_idx %d split id: %d",
-			res->res_id, res->hw_intf->hw_idx, base_idx, i);
-
-		io_info->kmd_buf_info->used_bytes += wm_update.cmd.used_bytes;
-		io_info->kmd_buf_info->offset += wm_update.cmd.used_bytes;
-	}
-	return rc;
-}
-
 int cam_isp_add_reg_update(
 	struct cam_hw_prepare_update_args    *prepare,
 	struct list_head                     *res_list_isp_src,
 	uint32_t                              base_idx,
 	struct cam_kmd_buf_info              *kmd_buf_info,
-	bool                                  combine,
-	void                                 *priv_data)
+	bool                                  combine)
 {
 	int rc = -EINVAL;
-	struct cam_isp_resource_node            *res;
-	struct cam_isp_hw_mgr_res               *hw_mgr_res;
-	struct cam_isp_hw_get_cmd_update         get_regup;
+	struct cam_isp_resource_node         *res;
+	struct cam_isp_hw_mgr_res            *hw_mgr_res;
+	struct cam_isp_hw_get_cmd_update      get_regup;
 	uint32_t kmd_buf_remain_size, i, reg_update_size;
 
 	/* Max one hw entries required for each base */
@@ -1381,8 +1296,6 @@ int cam_isp_add_reg_update(
 			get_regup.cmd_type = CAM_ISP_HW_CMD_GET_REG_UPDATE;
 			get_regup.res = res;
 
-			get_regup.data = priv_data;
-
 			rc = res->hw_intf->hw_ops.process_cmd(
 				res->hw_intf->hw_priv,
 				CAM_ISP_HW_CMD_GET_REG_UPDATE, &get_regup,

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/hw_utils/include/cam_isp_packet_parser.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_ISP_HW_PARSER_H_
@@ -278,27 +278,6 @@ int cam_isp_add_command_buffers(
  */
 int cam_isp_add_io_buffers(struct cam_isp_io_buf_info   *io_info);
 
-/*
- * cam_isp_add_disable_wm_update()
- *
- * @brief                  Add disable wm command
- *
- * @prepare:               Contain the  packet and HW update variables
- * @isp_hw_res:            Resource list for IFE/VFE out resource
- * @base_idx:              Base or dev index of the IFE/VFE HW instance
- * @kmd_buf_info:          Kmd buffer to store the change base command
- * @wm_mask                Bit mask of unconfigured resource
- * @io_info                IO buf info
- *
- */
-int cam_isp_add_disable_wm_update(
-	struct cam_hw_prepare_update_args    *prepare,
-	struct cam_isp_hw_mgr_res            *isp_hw_res,
-	uint32_t                              base_idx,
-	struct cam_kmd_buf_info              *kmd_buf_info,
-	uint64_t                              *wm_mask,
-	struct cam_isp_io_buf_info *io_info);
-
 /*
  * cam_isp_add_reg_update()
  *
@@ -311,7 +290,6 @@ int cam_isp_add_disable_wm_update(
  * @base_idx:              Base or dev index of the IFE/VFE HW instance
  * @kmd_buf_info:          Kmd buffer to store the change base command
  * @combine:               Indicate whether combine with prev update entry
- * @priv_data:             private data for HW driver
  * @return:                0 for success
  *                         -EINVAL for Fail
  */
@@ -320,8 +298,7 @@ int cam_isp_add_reg_update(
 	struct list_head                     *res_list_isp_src,
 	uint32_t                              base_idx,
 	struct cam_kmd_buf_info              *kmd_buf_info,
-	bool                                  combine,
-	void                                 *priv_data);
+	bool                                  combine);
 
 /*
  * cam_isp_add_comp_wait()

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h

@@ -24,7 +24,7 @@
 #define CAM_ISP_BW_CONFIG_V1             1
 #define CAM_ISP_BW_CONFIG_V2             2
 #define CAM_ISP_BW_CONFIG_V3             3
-#define CAM_TFE_HW_NUM_MAX               4
+#define CAM_TFE_HW_NUM_MAX               3
 #define CAM_TFE_RDI_NUM_MAX              3
 #define CAM_IFE_SCRATCH_NUM_MAX          2
 #define CAM_IFE_BUS_COMP_NUM_MAX         18
@@ -33,7 +33,7 @@
 #define CAM_TFE_BUS_COMP_NUM_MAX         18
 
 /* maximum context numbers for TFE */
-#define CAM_TFE_CTX_MAX      6
+#define CAM_TFE_CTX_MAX      4
 
 /* maximum context numbers for IFE */
 #define CAM_IFE_CTX_MAX      8
@@ -49,8 +49,6 @@
 #define CAM_IFE_CTX_SFE_EN             BIT(4)
 #define CAM_IFE_CTX_AEB_EN             BIT(5)
 #define CAM_IFE_CTX_DYNAMIC_SWITCH_EN  BIT(6)
-#define CAM_IFE_CTX_SHDR_EN            BIT(7)
-#define CAM_IFE_CTX_SHDR_IS_MASTER     BIT(8)
 
 /*
  * Maximum configuration entry size  - This is based on the
@@ -348,7 +346,6 @@ struct cam_isp_fcg_config_info {
  * @packet:                CSL packet from user mode driver
  * @mup_val:               MUP value if configured
  * @num_exp:               Num of exposures
- * @wm_bitmask:            Bitmask of acquired out resource
  * @mup_en:                Flag if dynamic sensor switch is enabled
  * @fcg_info:              Track FCG config for further usage in config stage
  *
@@ -371,7 +368,7 @@ struct cam_isp_prepare_hw_update_data {
 	struct cam_kmd_buf_info               kmd_cmd_buff_info;
 	uint32_t                              mup_val;
 	uint32_t                              num_exp;
-	uint64_t                              wm_bitmask;
+	uint32_t                              configured_rup_aup;
 	bool                                  mup_en;
 	struct cam_isp_fcg_config_info        fcg_info;
 };
@@ -480,8 +477,8 @@ enum cam_isp_hw_mgr_command {
 	CAM_ISP_HW_MGR_GET_SOF_TS,
 	CAM_ISP_HW_MGR_DUMP_STREAM_INFO,
 	CAM_ISP_HW_MGR_GET_BUS_COMP_GROUP,
-	CAM_ISP_HW_MGR_CMD_UPDATE_CLOCK,
 	CAM_ISP_HW_MGR_GET_LAST_CONSUMED_ADDR,
+	CAM_ISP_HW_MGR_GET_PATH_SOF_TS,
 	CAM_ISP_HW_MGR_CMD_MAX,
 };
 
@@ -550,21 +547,6 @@ struct cam_isp_lcr_rdi_cfg_args {
 	bool                           is_init;
 };
 
-
-/**
- * struct cam_isp_mode_switch_data - isp hardware mode update arguments
- *
- * @mup                 Mup value
- * @num_expoures        Number of exposures
- * @mup_en              Flag to indicate if mup is enable
- *
- */
-struct cam_isp_mode_switch_data {
-	uint32_t                      mup;
-	uint32_t                      num_expoures;
-	bool                          mup_en;
-};
-
 /**
  * cam_isp_hw_mgr_init()
  *

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid860.h

@@ -1,90 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CAM_IFE_CSID_860_H_
-#define _CAM_IFE_CSID_860_H_
-
-#include <linux/module.h>
-#include "cam_ife_csid_dev.h"
-#include "camera_main.h"
-#include "cam_ife_csid_common.h"
-#include "cam_ife_csid_hw_ver2.h"
-#include "cam_irq_controller.h"
-#include "cam_isp_hw_mgr_intf.h"
-#include "cam_ife_csid880.h"
-
-#define CAM_CSID_VERSION_V860                 0x80060000
-
-static struct cam_ife_csid_ver2_reg_info cam_ife_csid_860_reg_info = {
-	.top_irq_reg_info      = cam_ife_csid_880_top_irq_reg_info,
-	.rx_irq_reg_info       = cam_ife_csid_880_rx_irq_reg_info,
-	.path_irq_reg_info     = {
-		&cam_ife_csid_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_0],
-		&cam_ife_csid_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_1],
-		&cam_ife_csid_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_2],
-		&cam_ife_csid_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_3],
-		&cam_ife_csid_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_4],
-		&cam_ife_csid_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_IPP],
-		&cam_ife_csid_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_PPP],
-	},
-	.buf_done_irq_reg_info = &cam_ife_csid_880_buf_done_irq_reg_info,
-	.cmn_reg                              = &cam_ife_csid_880_cmn_reg_info,
-	.csi2_reg                             = &cam_ife_csid_880_csi2_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_IPP]   = &cam_ife_csid_880_ipp_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_PPP]   = &cam_ife_csid_880_ppp_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_0] = &cam_ife_csid_880_rdi_0_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_1] = &cam_ife_csid_880_rdi_1_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_2] = &cam_ife_csid_880_rdi_2_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_3] = &cam_ife_csid_880_rdi_3_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_4] = &cam_ife_csid_880_rdi_4_reg_info,
-	.top_reg                              = &cam_ife_csid_880_top_reg_info,
-	.input_core_sel = {
-		{
-			0x0,
-			0x1,
-			0x2,
-			0x3,
-			-1,
-			-1,
-			-1,
-			-1,
-		},
-		{
-			0x0,
-			0x1,
-			0x2,
-			0x3,
-			-1,
-			-1,
-			-1,
-			-1,
-		},
-		{
-			0x0,
-			0x1,
-			0x2,
-			0x3,
-			-1,
-			-1,
-			-1,
-			-1,
-		},
-	},
-	.need_top_cfg = 0x1,
-	.top_irq_desc       = &cam_ife_csid_880_top_irq_desc,
-	.rx_irq_desc        = &cam_ife_csid_880_rx_irq_desc,
-	.path_irq_desc      = cam_ife_csid_880_path_irq_desc,
-	.num_top_err_irqs   = cam_ife_csid_880_num_top_irq_desc,
-	.num_rx_err_irqs    = cam_ife_csid_880_num_rx_irq_desc,
-	.num_path_err_irqs  = ARRAY_SIZE(cam_ife_csid_880_path_irq_desc),
-	.num_top_regs       = 1,
-	.num_rx_regs        = 1,
-	.width_fuse_max_val = 1,
-	.fused_max_dualife_width = {7296, 5344, UINT_MAX},
-	.fused_max_width = {7296, 7296, UINT_MAX},
-	.is_ife_sfe_mapped = true,
-};
-
-#endif /*_CAM_IFE_CSID_860_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid880.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_IFE_CSID_880_H_
@@ -1508,6 +1508,5 @@ static struct cam_ife_csid_ver2_reg_info cam_ife_csid_880_reg_info = {
 	.num_path_err_irqs  = ARRAY_SIZE(cam_ife_csid_880_path_irq_desc),
 	.num_top_regs       = 1,
 	.num_rx_regs        = 1,
-	.is_ife_sfe_mapped  = true,
 };
 #endif /*_CAM_IFE_CSID_880_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_common.c

@@ -684,12 +684,6 @@ int cam_ife_csid_get_base(struct cam_hw_soc_info *soc_info,
 	}
 
 	mem_base = CAM_SOC_GET_REG_MAP_CAM_BASE(soc_info, base_id);
-	if (mem_base == -1) {
-		CAM_ERR(CAM_ISP, "failed to get mem_base, index: %d num_reg_map: %u",
-				base_id, soc_info->num_reg_map);
-		return -EINVAL;
-	}
-
 	if (cdm_args->cdm_id == CAM_CDM_RT) {
 		if (!soc_private->rt_wrapper_base) {
 			CAM_ERR(CAM_ISP, "rt_wrapper_base_addr is null");

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_dev.c

@@ -116,12 +116,6 @@ static void cam_ife_csid_component_unbind(struct device *dev,
 	const struct of_device_id      *match_dev = NULL;
 
 	hw_intf = (struct cam_hw_intf *)platform_get_drvdata(pdev);
-
-	if (!hw_intf) {
-		CAM_ERR(CAM_ISP, "Error No data in hw_intf");
-		return;
-	}
-
 	hw_info = hw_intf->hw_priv;
 
 	CAM_DBG(CAM_ISP, "CSID:%d component unbind",

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver1.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/iopoll.h>
@@ -721,8 +721,9 @@ static int cam_ife_csid_ver1_deinit_rdi_path(
 	if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW ||
 			res->res_id > CAM_IFE_PIX_PATH_RES_RDI_4) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -781,8 +782,9 @@ static int cam_ife_csid_ver1_deinit_udi_path(
 			(res->res_id < CAM_IFE_PIX_PATH_RES_UDI_0 ||
 			 res->res_id > CAM_IFE_PIX_PATH_RES_UDI_2)) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -839,8 +841,9 @@ static int cam_ife_csid_ver1_deinit_pxl_path(
 
 	if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -900,8 +903,9 @@ static int cam_ife_csid_ver1_stop_pxl_path(
 
 	if (res->res_state != CAM_ISP_RESOURCE_STATE_STREAMING) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -983,8 +987,9 @@ static int cam_ife_csid_ver1_stop_rdi_path(
 
 	if (res->res_state != CAM_ISP_RESOURCE_STATE_STREAMING) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -1040,8 +1045,9 @@ static int cam_ife_csid_ver1_stop_udi_path(
 
 	if (res->res_state != CAM_ISP_RESOURCE_STATE_STREAMING) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -1821,14 +1827,6 @@ int cam_ife_csid_ver1_release(void *hw_priv,
 		csid_hw->hw_intf->hw_idx, res->res_type, res->res_id);
 
 	path_cfg = (struct cam_ife_csid_ver1_path_cfg *)res->res_priv;
-
-	if (path_cfg->cid >= CAM_IFE_CSID_CID_MAX) {
-		CAM_ERR(CAM_ISP, "CSID:%d Invalid cid:%d",
-				csid_hw->hw_intf->hw_idx, path_cfg->cid);
-		rc = -EINVAL;
-		goto end;
-	}
-
 	cam_ife_csid_cid_release(&csid_hw->cid_data[path_cfg->cid],
 		csid_hw->hw_intf->hw_idx,
 		path_cfg->cid);
@@ -1871,8 +1869,9 @@ static int cam_ife_csid_ver1_start_rdi_path(
 	if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW ||
 		res->res_id > CAM_IFE_PIX_PATH_RES_RDI_4) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -1922,8 +1921,9 @@ static int cam_ife_csid_ver1_start_udi_path(
 		(res->res_id < CAM_IFE_PIX_PATH_RES_UDI_0 ||
 		 res->res_id > CAM_IFE_PIX_PATH_RES_UDI_2)) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -1974,8 +1974,9 @@ static int cam_ife_csid_ver1_start_pix_path(
 
 	if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW) {
 		CAM_ERR(CAM_ISP,
-			"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
-			csid_hw->hw_intf->hw_idx, res->res_name,
+			"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
+			csid_hw->hw_intf->hw_idx,
+			res->res_name,
 			res->res_type, res->res_id, res->res_state);
 		return -EINVAL;
 	}
@@ -2719,6 +2720,7 @@ static int cam_ife_csid_ver1_enable_hw(struct cam_ife_csid_ver1_hw *csid_hw)
 	csid_hw->flags.fatal_err_detected = false;
 	csid_hw->flags.device_enabled = true;
 	spin_unlock_irqrestore(&csid_hw->lock_state, flags);
+	cam_tasklet_start(csid_hw->tasklet);
 
 	return rc;
 
@@ -2740,6 +2742,8 @@ int cam_ife_csid_ver1_init_hw(void *hw_priv,
 	struct cam_hw_info *hw_info;
 	int rc = 0;
 
+	
+
 	if (!hw_priv || !init_args ||
 		(arg_size != sizeof(struct cam_isp_resource_node))) {
 		CAM_ERR(CAM_ISP, "CSID: Invalid args");
@@ -2748,7 +2752,7 @@ int cam_ife_csid_ver1_init_hw(void *hw_priv,
 
 	hw_info = (struct cam_hw_info *)hw_priv;
 	csid_hw = (struct cam_ife_csid_ver1_hw *)hw_info->core_info;
-
+	
 	rc = cam_ife_csid_ver1_enable_hw(csid_hw);
 
 	if (rc) {
@@ -2897,6 +2901,7 @@ static int cam_ife_csid_ver1_disable_hw(
 	cam_io_w_mb(0, soc_info->reg_map[0].mem_base +
 		csid_reg->cmn_reg->top_irq_mask_addr);
 
+	cam_tasklet_stop(csid_hw->tasklet);
 	rc = cam_ife_csid_disable_soc_resources(soc_info);
 	if (rc)
 		CAM_ERR(CAM_ISP, "CSID:%d Disable CSID SOC failed",
@@ -3797,6 +3802,9 @@ static int cam_ife_csid_ver1_process_cmd(void *hw_priv,
 	case CAM_ISP_HW_CMD_CSID_DUMP_CROP_REG:
 		/* Not supported in V1*/
 		break;
+	case CAM_IFE_CSID_CMD_GET_PATH_TIME_STAMP:
+		/* Not supported in V1*/
+		break;
 	default:
 		CAM_ERR(CAM_ISP, "CSID:%d unsupported cmd:%d",
 			csid_hw->hw_intf->hw_idx, cmd_type);

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/iopoll.h>
@@ -1327,6 +1327,9 @@ static inline uint32_t cam_ife_csid_ver2_input_core_to_hw_idx(int core_sel)
 	}
 }
 
+static int cam_ife_csid_ver2_dump_frame_stats(
+	struct cam_ife_csid_ver2_hw  *csid_hw);
+
 static int cam_ife_csid_ver2_handle_event_err(
 	struct cam_ife_csid_ver2_hw  *csid_hw,
 	uint32_t                      irq_status,
@@ -1379,6 +1382,7 @@ static int cam_ife_csid_ver2_handle_event_err(
 		cam_ife_csid_ver2_input_core_to_hw_idx(csid_hw->top_cfg.input_core_type);
 
 	cam_ife_csid_ver2_print_camif_timestamps(csid_hw);
+	cam_ife_csid_ver2_dump_frame_stats(csid_hw);
 
 	csid_hw->event_cb(csid_hw->token, CAM_ISP_HW_EVENT_ERROR, (void *)&evt);
 
@@ -1663,7 +1667,7 @@ void cam_ife_csid_hw_ver2_drv_err_handler(void *csid)
 void cam_ife_csid_hw_ver2_mup_mismatch_handler(
 	void *csid, void *resource)
 {
-	uint32_t                           idx = 0;
+	uint32_t                           idx = 0, val;
 	struct timespec64                  current_ts;
 	struct cam_ife_csid_ver2_hw       *csid_hw = csid;
 	struct cam_isp_resource_node      *res = resource;
@@ -1690,16 +1694,16 @@ void cam_ife_csid_hw_ver2_mup_mismatch_handler(
 		if (path_cfg->ts_comb_vcdt_en) {
 			ktime_get_boottime_ts64(&current_ts);
 
-			idx = cam_io_r_mb(soc_info->reg_map[0].mem_base +
-				path_reg->timestamp_curr0_sof_addr) &
-				csid_reg->cmn_reg->ts_comb_vcdt_mask;
+			val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
+				path_reg->timestamp_curr0_sof_addr);
+			idx = val & csid_reg->cmn_reg->ts_comb_vcdt_mask;
 
 			if (idx < CAM_IFE_CSID_MULTI_VC_DT_GRP_MAX)
 				CAM_INFO(CAM_ISP,
-					"CSID:%d Received frame with vc:%d on [id: %d name: %s] timestamp: %lld.%09lld",
+					"CSID:%d Received frame with vc:%d on [id: %d name: %s] timestamp: %lld.%09lld register value: 0x%x",
 					csid_hw->hw_intf->hw_idx, cid_data->vc_dt[idx].vc,
 					res->res_id, res->res_name, current_ts.tv_sec,
-					current_ts.tv_nsec);
+					current_ts.tv_nsec, val);
 			else
 				CAM_ERR(CAM_ISP,
 					"CSID:%d Get invalid vc index: %d on [id: %d name: %s] timestamp: %lld.%09lld",
@@ -1745,8 +1749,7 @@ void cam_ife_csid_ver2_print_illegal_programming_irq_status(
 	cfg1 = cam_io_r_mb(base + path_reg->cfg1_addr);
 	vcdt_cfg0 = cam_io_r_mb(base + path_reg->multi_vcdt_cfg0_addr);
 
-	CAM_INFO(CAM_ISP, "cfg0 = %x cfg1 = %x vcdt_cfg0 = %x vcrop %x", cfg0, cfg1, vcdt_cfg0,
-		cam_io_r_mb(base + path_reg->vcrop_addr));
+	CAM_INFO(CAM_ISP, "cfg0 = %x cfg1 = %x vcdt_cfg0 = %x ", cfg0, cfg1, vcdt_cfg0);
 
 	if (cid_data->vc_dt[CAM_IFE_CSID_MULTI_VC_DT_GRP_1].valid) {
 		decode_fmt = ((cfg0 >>
@@ -1959,6 +1962,7 @@ static int cam_ife_csid_ver2_parse_path_irq_status(
 		if ((irq_status & IFE_CSID_VER2_PATH_INFO_INPUT_SOF))
 			csid_hw->counters.irq_debug_cnt++;
 
+
 		if (csid_hw->counters.irq_debug_cnt >=
 			CAM_CSID_IRQ_SOF_DEBUG_CNT_MAX) {
 			cam_ife_csid_ver2_sof_irq_debug(csid_hw,
@@ -2470,8 +2474,9 @@ static int cam_ife_csid_ver2_rdi_bottom_half(
 		/* Only notify if secondary event is subscribed for */
 		if ((path_cfg->sec_evt_config.en_secondary_evt) &&
 			(path_cfg->sec_evt_config.evt_type &
-			CAM_IFE_CSID_EVT_SENSOR_SYNC_FRAME_DROP))
-			do_notify = true;
+			CAM_IFE_CSID_EVT_SENSOR_SYNC_FRAME_DROP)) {
+				do_notify = true;
+		}
 
 		/* Validate error threshold for primary RDI (master) */
 		if (res->is_rdi_primary_res) {
@@ -2556,7 +2561,6 @@ int cam_ife_csid_ver2_get_hw_caps(void *hw_priv,
 	hw_caps->is_lite = soc_private->is_ife_csid_lite;
 	hw_caps->sfe_ipp_input_rdi_res = csid_reg->cmn_reg->sfe_ipp_input_rdi_res;
 	hw_caps->camif_irq_support = csid_reg->cmn_reg->camif_irq_support;
-	hw_caps->is_ife_sfe_mapped = csid_reg->is_ife_sfe_mapped;
 
 	CAM_DBG(CAM_ISP,
 		"CSID:%u num-rdis:%d, num-pix:%d, major:%d minor:%d ver:%d",
@@ -2674,7 +2678,7 @@ static int cam_ife_csid_ver2_reset_irq_top_half(uint32_t    evt_id,
 }
 
 static int cam_ife_csid_ver2_internal_reset(
-	struct cam_ife_csid_ver2_hw *csid_hw,
+	struct cam_ife_csid_ver2_hw *csid_hw, bool power_on_rst,
 	uint32_t rst_cmd, uint32_t rst_location, uint32_t rst_mode)
 {
 	uint32_t val = 0;
@@ -2703,9 +2707,18 @@ static int cam_ife_csid_ver2_internal_reset(
 		cam_io_w_mb(0x0, mem_base + csi2_reg->cfg1_addr);
 	}
 
-	if (csid_hw->sync_mode == CAM_ISP_HW_SYNC_SLAVE)
+	/*
+	 * After power on once the connection has been established
+	 * between master and slave CSIDs, issuing a reset to master
+	 * will also reset the slave. Reset to the slave is only needed
+	 * when powering on the cores since at this point the master-slave
+	 * connection is not established yet
+	 */
+	if ((csid_hw->sync_mode == CAM_ISP_HW_SYNC_SLAVE) && (!power_on_rst))
 		goto wait_only;
 
+	CAM_DBG(CAM_ISP, "CSID[%u] issuing reset", csid_hw->hw_intf->hw_idx);
+
 	reinit_completion(&csid_hw->hw_info->hw_complete);
 
 	/* Program the reset location */
@@ -2766,14 +2779,16 @@ int cam_ife_csid_ver2_reset(void *hw_priv,
 
 	switch (reset->reset_type) {
 	case CAM_IFE_CSID_RESET_GLOBAL:
-		rc = cam_ife_csid_ver2_internal_reset(csid_hw,
+		rc = cam_ife_csid_ver2_internal_reset(
+			csid_hw, reset->power_on_reset,
 			CAM_IFE_CSID_RESET_CMD_SW_RST,
 			CAM_IFE_CSID_RESET_LOC_COMPLETE,
 			CAM_CSID_HALT_IMMEDIATELY);
 		break;
 
 	case CAM_IFE_CSID_RESET_PATH:
-		rc = cam_ife_csid_ver2_internal_reset(csid_hw,
+		rc = cam_ife_csid_ver2_internal_reset(
+			csid_hw, reset->power_on_reset,
 			CAM_IFE_CSID_RESET_CMD_HW_RST,
 			CAM_IFE_CSID_RESET_LOC_PATH_ONLY,
 			CAM_CSID_HALT_IMMEDIATELY);
@@ -3347,82 +3362,6 @@ end:
 	return rc;
 }
 
-static bool cam_ife_csid_ver2_is_width_valid_by_fuse(
-	struct cam_csid_hw_reserve_resource_args  *reserve,
-	struct cam_ife_csid_ver2_hw *csid_hw,
-	uint32_t width)
-{
-	struct cam_ife_csid_ver2_reg_info *csid_reg;
-	uint32_t fuse_val = UINT_MAX;
-
-	csid_reg = (struct cam_ife_csid_ver2_reg_info *)
-		csid_hw->core_info->csid_reg;
-
-	cam_cpas_is_feature_supported(CAM_CPAS_MP_LIMIT_FUSE, CAM_CPAS_HW_IDX_ANY, &fuse_val);
-	if (fuse_val == UINT_MAX) {
-		CAM_DBG(CAM_ISP, "CSID[%u] MP limit fuse not present",
-			csid_hw->hw_intf->hw_idx);
-		return true;
-	}
-
-	if ((fuse_val > csid_reg->width_fuse_max_val) ||
-		(fuse_val >= CAM_IFE_CSID_WIDTH_FUSE_VAL_MAX)) {
-		CAM_ERR(CAM_ISP, "Invalid fuse value %u", fuse_val);
-		return false;
-	}
-
-	if (((reserve->sync_mode == CAM_ISP_HW_SYNC_SLAVE) ||
-		(reserve->sync_mode == CAM_ISP_HW_SYNC_MASTER)) &&
-		(width > csid_reg->fused_max_dualife_width[fuse_val])) {
-		CAM_ERR(CAM_ISP,
-			"CSID[%u] Resolution not supported required_width dualife: %d max_supported_width: %d",
-			csid_hw->hw_intf->hw_idx,
-			width, csid_reg->fused_max_dualife_width[fuse_val]);
-		return false;
-
-	} else if (width > csid_reg->fused_max_width[fuse_val]) {
-		CAM_ERR(CAM_ISP,
-			"CSID[%u] Resolution not supported required_width: %d max_supported_width: %d",
-			csid_hw->hw_intf->hw_idx,
-			width, csid_reg->fused_max_width[fuse_val]);
-		return false;
-	}
-
-	return true;
-}
-
-bool cam_ife_csid_ver2_is_width_valid(
-	struct cam_csid_hw_reserve_resource_args  *reserve,
-	struct cam_ife_csid_ver2_hw *csid_hw)
-{
-	uint32_t width = 0;
-	struct cam_csid_soc_private *soc_private;
-
-	soc_private = (struct cam_csid_soc_private *)csid_hw->hw_info->soc_info.soc_private;
-
-	if ((reserve->res_id != CAM_IFE_PIX_PATH_RES_IPP) || soc_private->is_ife_csid_lite)
-		return true;
-
-	if (reserve->sync_mode == CAM_ISP_HW_SYNC_MASTER ||
-		reserve->sync_mode == CAM_ISP_HW_SYNC_NONE)
-		width = reserve->in_port->left_stop -
-			reserve->in_port->left_start + 1;
-	else if (reserve->sync_mode == CAM_ISP_HW_SYNC_SLAVE)
-		width = reserve->in_port->right_stop -
-			reserve->in_port->right_start + 1;
-
-	if (reserve->in_port->horizontal_bin || reserve->in_port->qcfa_bin)
-		width /= 2;
-
-	if (!cam_ife_csid_ver2_is_width_valid_by_fuse(reserve, csid_hw, width)) {
-		CAM_ERR(CAM_ISP, "CSID[%u] width limited by fuse",
-			csid_hw->hw_intf->hw_idx);
-		return false;
-	}
-
-	return true;
-}
-
 static int cam_ife_csid_ver2_in_port_validate(
 	struct cam_csid_hw_reserve_resource_args  *reserve,
 	struct cam_ife_csid_ver2_hw     *csid_hw)
@@ -3437,9 +3376,6 @@ static int cam_ife_csid_ver2_in_port_validate(
 			goto err;
 	}
 
-	if (!cam_ife_csid_ver2_is_width_valid(reserve, csid_hw))
-		goto err;
-
 	if (csid_hw->counters.csi2_reserve_cnt) {
 
 		if (csid_hw->token != reserve->cb_priv) {
@@ -3637,13 +3573,6 @@ int cam_ife_csid_ver2_release(void *hw_priv,
 
 	path_cfg = (struct cam_ife_csid_ver2_path_cfg *)res->res_priv;
 
-	if (path_cfg->cid >= CAM_IFE_CSID_CID_MAX) {
-		CAM_ERR(CAM_ISP, "CSID:%d Invalid cid:%d",
-				csid_hw->hw_intf->hw_idx, path_cfg->cid);
-		rc = -EINVAL;
-		goto end;
-	}
-
 	cam_ife_csid_cid_release(&csid_hw->cid_data[path_cfg->cid],
 		csid_hw->hw_intf->hw_idx,
 		path_cfg->cid);
@@ -3884,8 +3813,7 @@ static int cam_ife_csid_ver2_init_config_rdi_path(
 		 res->res_id == CAM_IFE_PIX_PATH_RES_RDI_0))
 		cam_ife_csid_ver2_res_master_slave_cfg(csid_hw, res->res_id);
 
-	if (csid_hw->debug_info.debug_val &
-		CAM_IFE_CSID_DEBUG_ENABLE_HBI_VBI_INFO) {
+	if (1) {
 		val = cam_io_r_mb(mem_base +
 			path_reg->format_measure_cfg0_addr);
 		val |= cmn_reg->measure_en_hbi_vbi_cnt_mask;
@@ -4058,8 +3986,7 @@ static int cam_ife_csid_ver2_init_config_pxl_path(
 		cam_io_w_mb(val, mem_base + path_reg->err_recovery_cfg0_addr);
 	}
 
-	if (csid_hw->debug_info.debug_val &
-		CAM_IFE_CSID_DEBUG_ENABLE_HBI_VBI_INFO) {
+	if (1) {
 		val = cam_io_r_mb(mem_base +
 			path_reg->format_measure_cfg0_addr);
 		val |= csid_reg->cmn_reg->measure_en_hbi_vbi_cnt_mask;
@@ -4168,8 +4095,7 @@ static int cam_ife_csid_ver2_path_irq_subscribe(
 	struct cam_isp_resource_node *res,
 	uint32_t irq_mask, uint32_t err_irq_mask)
 {
-	uint32_t num_register = 0;
-	uint32_t *top_irq_mask = NULL;
+	uint32_t top_irq_mask[CAM_IFE_CSID_IRQ_REGISTERS_MAX] = {0};
 	struct cam_ife_csid_ver2_path_cfg *path_cfg = res->res_priv;
 	struct cam_ife_csid_ver2_reg_info *csid_reg = csid_hw->core_info->csid_reg;
 	int i, rc;
@@ -4188,14 +4114,8 @@ static int cam_ife_csid_ver2_path_irq_subscribe(
 		return -EINVAL;
 	}
 
-	num_register = csid_reg->top_irq_reg_info[top_index].num_registers;
-	top_irq_mask = vmalloc(sizeof(uint32_t) * num_register);
-	if (!top_irq_mask) {
-		CAM_ERR(CAM_ISP, "csid top_irq_mask allocation failed");
-		return -ENOMEM;
-	}
-
-	top_irq_mask[0] = csid_reg->path_reg[res->res_id]->top_irq_mask[top_index];
+	top_irq_mask[CAM_IFE_CSID_IRQ_TOP_REG_STATUS0] =
+		csid_reg->path_reg[res->res_id]->top_irq_mask[top_index];
 
 	if (csid_reg->path_reg[res->res_id]->capabilities & CAM_IFE_CSID_CAP_MULTI_CTXT) {
 		rc = cam_ife_csid_ver2_mc_irq_subscribe(csid_hw, res, top_index);
@@ -4262,7 +4182,7 @@ static int cam_ife_csid_ver2_path_irq_subscribe(
 		rc = -EINVAL;
 		goto unsub_path;
 	}
-	vfree(top_irq_mask);
+
 	return 0;
 
 unsub_path:
@@ -4281,7 +4201,6 @@ unsub_mc:
 		csid_hw->top_mc_irq_handle);
 	csid_hw->top_mc_irq_handle = 0;
 end:
-	vfree(top_irq_mask);
 	return rc;
 }
 
@@ -4724,8 +4643,7 @@ static int cam_ife_csid_ver2_csi2_irq_subscribe(struct cam_ife_csid_ver2_hw *csi
 	uint32_t irq_mask, uint32_t err_irq_mask)
 {
 	struct cam_ife_csid_ver2_reg_info *csid_reg = csid_hw->core_info->csid_reg;
-	uint32_t num_register = 0;
-	uint32_t *top_irq_mask = NULL;
+	uint32_t top_irq_mask[CAM_IFE_CSID_IRQ_REGISTERS_MAX] = {0};
 	int top_index = -1;
 	int i, rc;
 
@@ -4743,14 +4661,8 @@ static int cam_ife_csid_ver2_csi2_irq_subscribe(struct cam_ife_csid_ver2_hw *csi
 		return rc;
 	}
 
-	num_register = csid_reg->top_irq_reg_info[top_index].num_registers;
-	top_irq_mask = vmalloc(sizeof(uint32_t) * num_register);
-	if (!top_irq_mask) {
-		CAM_ERR(CAM_ISP, "csid top_irq_mask allocation failed");
-		return -ENOMEM;
-	}
-
-	top_irq_mask[0] = csid_reg->csi2_reg->top_irq_mask[top_index];
+	top_irq_mask[CAM_IFE_CSID_IRQ_TOP_REG_STATUS0] =
+		csid_reg->csi2_reg->top_irq_mask[top_index];
 
 	csid_hw->rx_cfg.top_irq_handle = cam_irq_controller_subscribe_irq(
 		csid_hw->top_irq_controller[top_index],
@@ -4814,7 +4726,7 @@ static int cam_ife_csid_ver2_csi2_irq_subscribe(struct cam_ife_csid_ver2_hw *csi
 		rc = -EINVAL;
 		goto unsub_rx;
 	}
-	vfree(top_irq_mask);
+
 	return 0;
 
 unsub_rx:
@@ -4831,7 +4743,6 @@ unsub_top:
 			csid_hw->rx_cfg.top_irq_handle);
 	csid_hw->rx_cfg.top_irq_handle = 0;
 err:
-	vfree(top_irq_mask);
 	return rc;
 }
 
@@ -5144,9 +5055,8 @@ static int cam_ife_csid_ver2_enable_hw(
 	int i, rc;
 	void __iomem *mem_base;
 	const struct cam_ife_csid_ver2_path_reg_info *path_reg = NULL;
-	uint32_t num_register = 0;
 	uint32_t top_err_irq_mask = 0;
-	uint32_t *buf_done_irq_mask = NULL;
+	uint32_t buf_done_irq_mask[CAM_IFE_CSID_IRQ_REGISTERS_MAX] = {0};
 	uint32_t top_info_irq_mask = 0;
 
 	if (csid_hw->flags.device_enabled) {
@@ -5187,16 +5097,12 @@ static int cam_ife_csid_ver2_enable_hw(
 	/* Read hw version */
 	val = cam_io_r_mb(mem_base + csid_reg->cmn_reg->hw_version_addr);
 
-	num_register = csid_reg->top_irq_reg_info[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0].num_registers;
-	buf_done_irq_mask = vmalloc(sizeof(uint32_t) * num_register);
-	if (!buf_done_irq_mask) {
-		CAM_ERR(CAM_ISP, "csid buf_done_irq_mask allocation failed");
-		return -ENOMEM;
-	}
-	buf_done_irq_mask[0] = csid_reg->cmn_reg->top_buf_done_irq_mask;
+	buf_done_irq_mask[CAM_IFE_CSID_IRQ_TOP_REG_STATUS0] =
+		csid_reg->cmn_reg->top_buf_done_irq_mask;
 
 	if (csid_reg->ipp_mc_reg)
-		buf_done_irq_mask[0] |= csid_reg->ipp_mc_reg->comp_subgrp0_mask |
+		buf_done_irq_mask[CAM_IFE_CSID_IRQ_TOP_REG_STATUS0] |=
+			csid_reg->ipp_mc_reg->comp_subgrp0_mask |
 			csid_reg->ipp_mc_reg->comp_subgrp2_mask;
 
 	csid_hw->buf_done_irq_handle = cam_irq_controller_subscribe_irq(
@@ -5214,8 +5120,7 @@ static int cam_ife_csid_ver2_enable_hw(
 	if (csid_hw->buf_done_irq_handle < 1) {
 		CAM_ERR(CAM_ISP, "CSID[%u] buf done irq subscribe fail",
 			csid_hw->hw_intf->hw_idx);
-		rc = -EINVAL;
-		goto free_buf_done_mask;
+		return -EINVAL;
 	}
 
 	top_err_irq_mask = csid_reg->cmn_reg->top_err_irq_mask[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0];
@@ -5277,7 +5182,6 @@ static int cam_ife_csid_ver2_enable_hw(
 	csid_hw->flags.fatal_err_detected = false;
 	CAM_DBG(CAM_ISP, "CSID:%u CSID HW version: 0x%x",
 		csid_hw->hw_intf->hw_idx, val);
-	vfree(buf_done_irq_mask);
 	return 0;
 
 
@@ -5292,8 +5196,6 @@ unsubscribe_buf_done:
 		csid_hw->top_irq_controller[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0],
 		csid_hw->buf_done_irq_handle);
 	csid_hw->buf_done_irq_handle = 0;
-free_buf_done_mask:
-	vfree(buf_done_irq_mask);
 	return rc;
 }
 
@@ -5747,7 +5649,7 @@ int cam_ife_csid_ver2_start(void *hw_priv, void *args,
 		}
 	}
 
-	CAM_DBG(CAM_ISP, "CSID:%u RUP:0x%x AUP: 0x%x MUP:0x%x at start updated: %s",
+	CAM_INFO(CAM_ISP, "CSID:%u RUP:0x%x AUP: 0x%x MUP:0x%x at start updated: %s",
 		csid_hw->hw_intf->hw_idx, rup_aup_mask.rup_mask, rup_aup_mask.aup_mask,
 		rup_aup_mask.rup_aup_set_mask, CAM_BOOL_TO_YESNO(!start_args->is_internal_start));
 
@@ -5929,6 +5831,7 @@ int cam_ife_csid_ver2_stop(void *hw_priv,
 
 	/* Issue a halt & reset to ensure there is no HW activity post the halt block */
 	reset.reset_type = CAM_IFE_CSID_RESET_PATH;
+	reset.power_on_reset = false;
 	cam_ife_csid_ver2_reset(hw_priv, &reset,
 		sizeof(struct cam_csid_reset_cfg_args));
 
@@ -6279,7 +6182,7 @@ static int cam_ife_csid_ver2_reg_update(
 
 	if (rup_args->mup_en) {
 		csid_hw->rx_cfg.mup = rup_args->mup_val;
-		CAM_DBG(CAM_ISP, "CSID[%u] MUP %u",
+		CAM_INFO(CAM_ISP, "CSID[%u] MUP %u",
 			csid_hw->hw_intf->hw_idx, csid_hw->rx_cfg.mup);
 	}
 
@@ -6288,6 +6191,7 @@ static int cam_ife_csid_ver2_reg_update(
 	else
 		cam_ife_csid_ver2_get_sc_reg_val_pair(csid_hw, reg_val_pair, rup_args);
 
+    rup_args->value = reg_val_pair[1];
 	if (rup_args->reg_write) {
 		for (i = 0; i < (2 * num_reg_val_pairs); i = i + 2)
 			cam_io_w_mb(reg_val_pair[i + 1], csid_clc_membase + reg_val_pair[i]);
@@ -6643,6 +6547,72 @@ static int cam_ife_csid_ver2_update_frame_stats(
 	return 0;
 }
 
+static int cam_ife_csid_ver2_dump_frame_stats(
+	struct cam_ife_csid_ver2_hw  *csid_hw)
+{
+	int i, j;
+	uint32_t index, num_entries, oldest_entry, val0, val1;
+	struct   cam_isp_resource_node *res;
+	const struct cam_ife_csid_ver2_reg_info *csid_reg;
+	const struct cam_ife_csid_ver2_path_reg_info *path_reg;
+	struct cam_ife_csid_ver2_path_cfg *path_cfg;
+	struct cam_hw_soc_info            *soc_info;
+	struct cam_ife_csid_cid_data *cid_data;
+	int64_t state_head = 0;
+
+	csid_reg = (struct cam_ife_csid_ver2_reg_info *)
+		csid_hw->core_info->csid_reg;
+	soc_info = &csid_hw->hw_info->soc_info;
+	for (i = 0; i < CAM_IFE_PIX_PATH_RES_MAX; i++) {
+		res = &csid_hw->path_res[i];
+		if (res->res_state != CAM_ISP_RESOURCE_STATE_STREAMING)
+			continue;
+
+		path_cfg = (struct cam_ife_csid_ver2_path_cfg *)res->res_priv;
+		cid_data = &csid_hw->cid_data[path_cfg->cid];
+		path_reg = csid_reg->path_reg[res->res_id];
+		state_head = atomic64_read(&path_cfg->frame_stats_cntr);
+		val0 = cam_io_r_mb(soc_info->reg_map[0].mem_base +
+				path_reg->format_measure1_addr);
+		val1 = cam_io_r_mb(soc_info->reg_map[0].mem_base +
+				path_reg->format_measure2_addr);
+		CAM_INFO(CAM_ISP,
+			"PATH: %s current hbi_min: %u hbi_max: %u vblank: %u",
+			res->res_name, (val0 & 0xFFF), ((val0 >> 0x10) & 0xFFF), val1);
+		CAM_INFO(CAM_ISP, "vc0: %u dt0: %u vc1: %u dt1: %u vc1_valid: %u",
+			cid_data->vc_dt[CAM_IFE_CSID_MULTI_VC_DT_GRP_0].vc,
+			cid_data->vc_dt[CAM_IFE_CSID_MULTI_VC_DT_GRP_0].dt,
+			cid_data->vc_dt[CAM_IFE_CSID_MULTI_VC_DT_GRP_1].vc,
+			cid_data->vc_dt[CAM_IFE_CSID_MULTI_VC_DT_GRP_1].dt,
+			cid_data->vc_dt[CAM_IFE_CSID_MULTI_VC_DT_GRP_1].valid);
+
+		if (state_head == -1)
+			continue;
+
+		if (state_head < CAM_CSID_MAX_FRAME_STATS_CNTR) {
+			num_entries = state_head + 1;
+			oldest_entry = 0;
+		} else {
+			num_entries = CAM_CSID_MAX_FRAME_STATS_CNTR;
+			div_u64_rem(state_head + 1, CAM_CSID_MAX_FRAME_STATS_CNTR,
+				&oldest_entry);
+		}
+
+		index = oldest_entry;
+		for (j = 0; j < num_entries; j++) {
+			CAM_INFO(CAM_ISP,
+				"PATH: %s Index: %u hbi_min: %u hbi_max: %u vblank: %u",
+				res->res_name, index, (path_cfg->frame_stats[index].hbi & 0xFFF),
+				((path_cfg->frame_stats[index].hbi >> 0x10) & 0xFFF),
+				path_cfg->frame_stats[index].vbi);
+
+			index = (index + 1) % CAM_CSID_MAX_FRAME_STATS_CNTR;
+		}
+	}
+
+	return 0;
+}
+
 static int cam_ife_csid_ver2_set_dynamic_switch_config(
 	struct cam_ife_csid_ver2_hw *csid_hw,
 	void                        *cmd_args)
@@ -6661,7 +6631,7 @@ static int cam_ife_csid_ver2_set_dynamic_switch_config(
 
 	if (switch_update->mup_args.use_mup) {
 		csid_hw->rx_cfg.mup = switch_update->mup_args.mup_val;
-		CAM_DBG(CAM_ISP, "CSID[%u] MUP %u",
+		CAM_INFO(CAM_ISP, "CSID[%u] MUP %u",
 			csid_hw->hw_intf->hw_idx, csid_hw->rx_cfg.mup);
 	}
 

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_IFE_CSID_HW_VER2_H_
@@ -752,12 +752,6 @@ struct cam_ife_csid_ver2_reg_info {
 	const uint32_t                                    num_path_err_irqs;
 	const uint32_t                                    num_top_regs;
 	const uint32_t                                    num_rx_regs;
-	const uint32_t                                    fused_max_dualife_width[
-		   CAM_IFE_CSID_WIDTH_FUSE_VAL_MAX];
-	const uint32_t                                    fused_max_width[
-		   CAM_IFE_CSID_WIDTH_FUSE_VAL_MAX];
-	const uint32_t                                    width_fuse_max_val;
-	bool                                              is_ife_sfe_mapped;
 };
 
 /*

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite860.h

@@ -1,48 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CAM_IFE_CSID_LITE_860_H_
-#define _CAM_IFE_CSID_LITE_860_H_
-
-#include "cam_ife_csid_common.h"
-#include "cam_ife_csid_dev.h"
-#include "cam_ife_csid_hw_ver2.h"
-#include "cam_irq_controller.h"
-#include "cam_isp_hw_mgr_intf.h"
-#include "cam_ife_csid_lite880.h"
-
-static struct cam_ife_csid_ver2_reg_info cam_ife_csid_lite_860_reg_info = {
-	.top_irq_reg_info      = &cam_ife_csid_lite_880_top_irq_reg_info,
-	.rx_irq_reg_info       = &cam_ife_csid_lite_880_rx_irq_reg_info,
-	.path_irq_reg_info     = {
-		&cam_ife_csid_lite_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_0],
-		&cam_ife_csid_lite_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_1],
-		&cam_ife_csid_lite_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_2],
-		&cam_ife_csid_lite_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_RDI_3],
-		NULL,
-		&cam_ife_csid_lite_880_path_irq_reg_info[CAM_IFE_PIX_PATH_RES_IPP],
-		},
-	.buf_done_irq_reg_info = &cam_ife_csid_lite_880_buf_done_irq_reg_info,
-	.cmn_reg               = &cam_ife_csid_lite_880_cmn_reg_info,
-	.csi2_reg              = &cam_ife_csid_lite_880_csi2_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_IPP]   = &cam_ife_csid_lite_880_ipp_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_PPP]   = NULL,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_0] = &cam_ife_csid_lite_880_rdi_0_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_1] = &cam_ife_csid_lite_880_rdi_1_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_2] = &cam_ife_csid_lite_880_rdi_2_reg_info,
-	.path_reg[CAM_IFE_PIX_PATH_RES_RDI_3] = &cam_ife_csid_lite_880_rdi_3_reg_info,
-	.need_top_cfg = 0,
-	.top_irq_desc       = &cam_ife_csid_lite_880_top_irq_desc,
-	.rx_irq_desc        = &cam_ife_csid_lite_880_rx_irq_desc,
-	.path_irq_desc      = cam_ife_csid_lite_880_path_irq_desc,
-	.num_top_err_irqs   = cam_ife_csid_lite_880_num_top_irq_desc,
-	.num_rx_err_irqs    = cam_ife_csid_lite_880_num_rx_irq_desc,
-	.num_path_err_irqs  = ARRAY_SIZE(cam_ife_csid_lite_880_path_irq_desc),
-	.num_top_regs       = 1,
-	.num_rx_regs        = 1,
-	.is_ife_sfe_mapped  = true,
-};
-
-#endif /* _CAM_IFE_CSID_LITE_860_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite880.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_IFE_CSID_LITE_880_H_
@@ -1067,6 +1067,5 @@ static struct cam_ife_csid_ver2_reg_info cam_ife_csid_lite_880_reg_info = {
 	.num_path_err_irqs  = ARRAY_SIZE(cam_ife_csid_lite_880_path_irq_desc),
 	.num_top_regs       = 1,
 	.num_rx_regs        = 1,
-	.is_ife_sfe_mapped  = true,
 };
 #endif /* _CAM_IFE_CSID_LITE_780_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite_mod.c

@@ -13,7 +13,6 @@
 #include "cam_ife_csid_lite480.h"
 #include "cam_ife_csid_lite680.h"
 #include "cam_ife_csid_lite780.h"
-#include "cam_ife_csid_lite860.h"
 #include "cam_ife_csid_lite880.h"
 
 #define CAM_CSID_LITE_DRV_NAME                    "csid_lite"
@@ -38,11 +37,6 @@ static struct cam_ife_csid_core_info cam_ife_csid_lite_780_hw_info = {
 	.sw_version  = CAM_IFE_CSID_VER_2_0,
 };
 
-static struct cam_ife_csid_core_info cam_ife_csid_lite_860_hw_info = {
-	.csid_reg = &cam_ife_csid_lite_860_reg_info,
-	.sw_version  = CAM_IFE_CSID_VER_2_0,
-};
-
 static struct cam_ife_csid_core_info cam_ife_csid_lite_880_hw_info = {
 	.csid_reg = &cam_ife_csid_lite_880_reg_info,
 	.sw_version  = CAM_IFE_CSID_VER_2_0,
@@ -85,10 +79,6 @@ static const struct of_device_id cam_ife_csid_lite_dt_match[] = {
 		.compatible = "qcom,csid-lite780",
 		.data = &cam_ife_csid_lite_780_hw_info,
 	},
-	{
-		.compatible = "qcom,csid-lite860",
-		.data = &cam_ife_csid_lite_860_hw_info,
-	},
 	{
 		.compatible = "qcom,csid-lite880",
 		.data = &cam_ife_csid_lite_880_hw_info,

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_mod.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -20,7 +20,6 @@
 #include "cam_ife_csid680.h"
 #include "cam_ife_csid680_110.h"
 #include "cam_ife_csid780.h"
-#include "cam_ife_csid860.h"
 #include "cam_ife_csid880.h"
 #include "cam_ife_csid980.h"
 
@@ -81,11 +80,6 @@ static struct cam_ife_csid_core_info cam_ife_csid780_hw_info = {
 	.sw_version  = CAM_IFE_CSID_VER_2_0,
 };
 
-static struct cam_ife_csid_core_info cam_ife_csid860_hw_info = {
-	.csid_reg = &cam_ife_csid_860_reg_info,
-	.sw_version  = CAM_IFE_CSID_VER_2_0,
-};
-
 static struct cam_ife_csid_core_info cam_ife_csid880_hw_info = {
 	.csid_reg = &cam_ife_csid_880_reg_info,
 	.sw_version  = CAM_IFE_CSID_VER_2_0,
@@ -142,10 +136,6 @@ static const struct of_device_id cam_ife_csid_dt_match[] = {
 		.compatible = "qcom,csid780",
 		.data = &cam_ife_csid780_hw_info,
 	},
-	{
-		.compatible = "qcom,csid860",
-		.data = &cam_ife_csid860_hw_info,
-	},
 	{
 		.compatible = "qcom,csid880",
 		.data = &cam_ife_csid880_hw_info,

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_ife_csid_hw_intf.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_CSID_HW_INTF_H_
@@ -16,6 +16,7 @@
 #define RT_BASE_IDX                                    2
 #define CAM_ISP_MAX_PATHS                              8
 
+
 /**
  * enum cam_ife_csid_hw_irq_regs - Specify the top irq reg
  */
@@ -108,7 +109,6 @@ enum cam_ife_csid_secondary_evt_type {
  * @rup_en:                flag to indicate if rup is on csid side
  * @only_master_rup:       flag to indicate if only master RUP
  * @camif_irq_support:     flag to indicate if CSID supports CAMIF irq
- * @is_ife_sfe_mapped:     flag to indicate if IFE & SFE are one-one mapped
  */
 struct cam_ife_csid_hw_caps {
 	uint32_t      num_rdis;
@@ -123,7 +123,6 @@ struct cam_ife_csid_hw_caps {
 	bool          rup_en;
 	bool          only_master_rup;
 	bool          camif_irq_support;
-	bool          is_ife_sfe_mapped;
 };
 
 struct cam_isp_out_port_generic_info {
@@ -483,6 +482,7 @@ struct cam_isp_csid_reg_update_args {
 	bool                              reg_write;
 	uint32_t                          mup_val;
 	uint32_t                          mup_en;
+	uint32_t                          value;
 };
 
 /*

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_isp_hw.h

@@ -214,7 +214,6 @@ enum cam_isp_hw_cmd_type {
 	CAM_ISP_HW_CMD_FE_TRIGGER_CMD,
 	CAM_ISP_HW_CMD_UNMASK_BUS_WR_IRQ,
 	CAM_ISP_HW_CMD_IS_CONSUMED_ADDR_SUPPORT,
-	CAM_ISP_HW_CMD_GET_LAST_CONSUMED_ADDR,
 	CAM_ISP_HW_CMD_GET_RES_FOR_MID,
 	CAM_ISP_HW_CMD_BLANKING_UPDATE,
 	CAM_ISP_HW_CMD_CSID_CLOCK_DUMP,
@@ -259,10 +258,7 @@ enum cam_isp_hw_cmd_type {
 #if defined(CONFIG_SAMSUNG_DEBUG_SENSOR_TIMING)
 	CAM_IFE_CSID_SOF_IRQ_DEBUG_FOR_MODESWITCH,
 #endif
-	CAM_ISP_HW_CMD_DYNAMIC_CLOCK_UPDATE,
-	CAM_ISP_HW_CMD_SET_SYNC_HW_IDX,
-	CAM_ISP_HW_CMD_BUS_WM_DISABLE,
-	CAM_ISP_HW_CMD_BUFFER_ALIGNMENT_UPDATE,
+	CAM_ISP_HW_CMD_GET_LAST_CONSUMED_ADDR,
 	CAM_IFE_CSID_CMD_GET_PATH_TIME_STAMP,
 	CAM_ISP_HW_CMD_MAX,
 };
@@ -445,13 +441,11 @@ struct cam_isp_hw_get_wm_update {
  * @Brief:           Get the out resource id for given mid
  *
  * @mid:             Mid number of hw outport numb
- * @pid:             Pid number associated with mid
  * @out_res_id:      Out resource id
  *
  */
 struct cam_isp_hw_get_res_for_mid {
 	uint32_t                       mid;
-	uint32_t                       pid;
 	uint32_t                       out_res_id;
 };
 
@@ -524,7 +518,6 @@ struct cam_isp_hw_fcg_cmd {
  * @cmd:             Command buffer information
  * @use_scratch_cfg: To indicate if it's scratch buffer config
  * @trigger_cdm_en:  Flag to indicate if cdm is trigger
- * @reg_write:        if set use AHB to config rup/aup
  *
  */
 struct cam_isp_hw_get_cmd_update {
@@ -539,7 +532,6 @@ struct cam_isp_hw_get_cmd_update {
 		struct cam_isp_hw_get_wm_update      *rm_update;
 	};
 	bool trigger_cdm_en;
-	bool reg_write;
 };
 
 /*
@@ -595,20 +587,6 @@ struct cam_isp_hw_dump_header {
 	uint32_t  word_size;
 };
 
-/**
- * struct cam_isp_session_data - Session data
- *
- * @Brief:          ISP session or usecase data
- *
- * @link_hdl:       Link handle
- * @is_shdr:        Indicate is usecase is shdr
- *
- */
-struct cam_isp_session_data {
-	int32_t   link_hdl;
-	bool      is_shdr;
-};
-
 /**
  * struct cam_isp_hw_intf_data - ISP hw intf data
  *

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_tfe_csid_hw_intf.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_TFE_CSID_HW_INTF_H_
@@ -12,7 +12,7 @@
 #include "cam_tfe.h"
 
 /* MAX TFE CSID instance */
-#define CAM_TFE_CSID_HW_NUM_MAX                        4
+#define CAM_TFE_CSID_HW_NUM_MAX                        3
 #define CAM_TFE_CSID_RDI_MAX                           3
 
 /**
@@ -23,7 +23,6 @@ enum cam_tfe_csid_path_res_id {
 	CAM_TFE_CSID_PATH_RES_RDI_1,
 	CAM_TFE_CSID_PATH_RES_RDI_2,
 	CAM_TFE_CSID_PATH_RES_IPP,
-	CAM_TFE_CSID_PATH_RES_PPP,
 	CAM_TFE_CSID_PATH_RES_MAX,
 };
 
@@ -37,7 +36,6 @@ enum cam_tfe_csid_irq_reg {
 	TFE_CSID_IRQ_REG_TOP,
 	TFE_CSID_IRQ_REG_RX,
 	TFE_CSID_IRQ_REG_IPP,
-	TFE_CSID_IRQ_REG_PPP,
 	TFE_CSID_IRQ_REG_MAX,
 };
 
@@ -91,9 +89,6 @@ struct cam_isp_tfe_in_port_generic_info {
 	uint32_t                        ipp_count;
 	uint32_t                        rdi_count;
 	uint32_t                        secure_mode;
-	bool                            shdr_en;
-	bool                            is_shdr_master;
-	bool                            epd_supported;
 	struct cam_isp_tfe_out_port_generic_info    *data;
 };
 
@@ -101,23 +96,17 @@ struct cam_isp_tfe_in_port_generic_info {
  * struct cam_tfe_csid_hw_caps- get the CSID hw capability
  * @num_rdis:       number of rdis supported by CSID HW device
  * @num_pix:        number of pxl paths supported by CSID HW device
- * @num_ppp:        number of ppp paths supported by CSID HW device
  * @major_version : major version
  * @minor_version:  minor version
  * @version_incr:   version increment
- * @sync_clk:       sync clocks such that freq(TFE)>freq(CSID)>freq(CSIPHY)
- * @is_lite:        Indicate if it is CSID Lite
  *
  */
 struct cam_tfe_csid_hw_caps {
 	uint32_t      num_rdis;
 	uint32_t      num_pix;
-	uint32_t      num_ppp;
 	uint32_t      major_version;
 	uint32_t      minor_version;
 	uint32_t      version_incr;
-	bool          sync_clk;
-	bool          is_lite;
 };
 
 /**
@@ -135,7 +124,6 @@ struct cam_tfe_csid_hw_caps {
  * @event_cb_prv: Context data
  * @event_cb:     Callback function to hw mgr in case of hw events
  * @node_res :    Reserved resource structure pointer
- * @crop_enable : Flag to indicate CSID crop enable
  *
  */
 struct cam_tfe_csid_hw_reserve_resource_args {
@@ -149,7 +137,6 @@ struct cam_tfe_csid_hw_reserve_resource_args {
 	void                                     *event_cb_prv;
 	cam_hw_mgr_event_cb_func                  event_cb;
 	struct cam_isp_resource_node             *node_res;
-	bool                                      crop_enable;
 };
 
 /**
@@ -274,15 +261,5 @@ struct cam_tfe_csid_clock_update_args {
 	uint64_t                           clk_rate;
 };
 
-/*
- * struct cam_tfe_csid_discard_init_frame_args:
- *
- * @num_frames: Num frames to discard
- * @res: Node res for this path
- */
-struct cam_tfe_csid_discard_init_frame_args {
-	uint32_t                          num_frames;
-	struct cam_isp_resource_node     *res;
-};
 
 #endif /* _CAM_TFE_CSID_HW_INTF_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_tfe_hw_intf.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_TFE_HW_INTF_H_
@@ -10,7 +10,7 @@
 #include "cam_isp_hw.h"
 #include "cam_cpas_api.h"
 
-#define CAM_TFE_HW_NUM_MAX            4
+#define CAM_TFE_HW_NUM_MAX            3
 #define TFE_CORE_BASE_IDX             0
 
 
@@ -19,7 +19,6 @@ enum cam_isp_hw_tfe_in {
 	CAM_ISP_HW_TFE_IN_RDI0        = 1,
 	CAM_ISP_HW_TFE_IN_RDI1        = 2,
 	CAM_ISP_HW_TFE_IN_RDI2        = 3,
-	CAM_ISP_HW_TFE_IN_PDLIB       = 4,
 	CAM_ISP_HW_TFE_IN_MAX,
 };
 
@@ -36,7 +35,6 @@ enum cam_tfe_hw_irq_status {
 	CAM_TFE_IRQ_STATUS_OVERFLOW,
 	CAM_TFE_IRQ_STATUS_P2I_ERROR,
 	CAM_TFE_IRQ_STATUS_VIOLATION,
-	CAM_TFE_IRQ_STATUS_OUT_OF_SYNC,
 	CAM_TFE_IRQ_STATUS_MAX,
 };
 
@@ -122,7 +120,6 @@ struct cam_tfe_hw_tfe_out_acquire_args {
  * @in_port:                 Input port details to acquire
  * @camif_pd_enable          Camif pd enable or disable
  * @dual_tfe_sync_sel_idx    Dual tfe master hardware index
- * @lcr_enable               LCR enable field
  */
 struct cam_tfe_hw_tfe_in_acquire_args {
 	struct cam_isp_resource_node            *rsrc_node;
@@ -132,7 +129,6 @@ struct cam_tfe_hw_tfe_in_acquire_args {
 	enum cam_isp_hw_sync_mode                sync_mode;
 	bool                                     camif_pd_enable;
 	uint32_t                                 dual_tfe_sync_sel_idx;
-	bool                                     lcr_enable;
 };
 
 /*
@@ -248,24 +244,6 @@ struct cam_tfe_irq_evt_payload {
 	uint32_t                   last_consumed_addr;
 };
 
-/*
- * cam_tfe_get_num_tfe_hws()
- *
- * @brief:         Gets number of TFEs
- *
- * @num_tfes:      Fills number of TFES in the address passed
- */
-void cam_tfe_get_num_tfe_hws(uint32_t *num_tfes);
-
-/*
- * cam_tfe_get_num_tfe_lite_hws()
- *
- * @brief:         Gets number of TFE-LITEs
- *
- * @num_tfe_lites: Fills number of TFE-LITEs in the address passed
- */
-void cam_tfe_get_num_tfe_lite_hws(uint32_t *num_tfe_lites);
-
 /*
  * cam_tfe_hw_init()
  *

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi_dev.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/slab.h>
@@ -109,12 +108,6 @@ static void cam_ppi_component_unbind(struct device *dev,
 	struct platform_device *pdev = to_platform_device(dev);
 
 	ppi_dev = (struct cam_csid_ppi_hw *)platform_get_drvdata(pdev);
-
-	if (!ppi_dev) {
-		CAM_ERR(CAM_ISP, "Error No data in ppi_dev");
-		return;
-	}
-
 	ppi_hw_intf = ppi_dev->hw_intf;
 	ppi_hw_info = ppi_dev->hw_info;
 

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe860.h

@@ -1,149 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CAM_SFE860_H_
-#define _CAM_SFE860_H_
-#include "cam_sfe_core.h"
-#include "cam_sfe_bus.h"
-#include "cam_sfe_bus_rd.h"
-#include "cam_sfe_bus_wr.h"
-#include "cam_sfe880.h"
-
-static struct cam_sfe_top_common_reg_offset  sfe860_top_commong_reg  = {
-	.hw_version                    = 0x00000000,
-	.hw_capability                 = 0x00000004,
-	.stats_feature                 = 0x00000008,
-	.core_cgc_ctrl                 = 0x00000010,
-	.ahb_clk_ovd                   = 0x00000014,
-	.core_cfg                      = 0x000000CC,
-	.ipp_violation_status          = 0x00000030,
-	.diag_config                   = 0x00000034,
-	.diag_sensor_status_0          = 0x00000038,
-	.diag_sensor_status_1          = 0x0000003C,
-	.diag_sensor_frame_cnt_status0 = 0x00000040,
-	.diag_sensor_frame_cnt_status1 = 0x00000044,
-	.stats_ch2_throttle_cfg        = 0x000000B0,
-	.stats_ch1_throttle_cfg        = 0x000000B4,
-	.stats_ch0_throttle_cfg        = 0x000000B8,
-	.hdr_throttle_cfg              = 0x000000C0,
-	.sfe_op_throttle_cfg           = 0x000000C4,
-	.irc_throttle_cfg              = 0x000000C8,
-	.sfe_single_dual_cfg           = 0x000000D0,
-	.bus_overflow_status           = 0x00000868,
-	.num_perf_counters             = 2,
-	.perf_count_reg = {
-		{
-			.perf_count_cfg        = 0x00000080,
-			.perf_pix_count        = 0x00000084,
-			.perf_line_count       = 0x00000088,
-			.perf_stall_count      = 0x0000008C,
-			.perf_always_count     = 0x00000090,
-			.perf_count_status     = 0x00000094,
-		},
-		{
-			.perf_count_cfg        = 0x00000098,
-			.perf_pix_count        = 0x0000009C,
-			.perf_line_count       = 0x000000A0,
-			.perf_stall_count      = 0x000000A4,
-			.perf_always_count     = 0x000000A8,
-			.perf_count_status     = 0x000000AC,
-		},
-	},
-	.top_debug_cfg                  = 0x0000007C,
-	.top_cc_test_bus_ctrl           = 0x000001F0,
-	.lcr_supported                  = false,
-	.ir_supported                   = true,
-	.qcfa_only                      = false,
-	.num_sfe_mode                   = ARRAY_SIZE(sfe_880_mode),
-	.sfe_mode                       = sfe_880_mode,
-	.ipp_violation_mask             = 0x4000,
-	.top_debug_testbus_reg          = 13,
-	.top_debug_nonccif_regstart_idx = 12,
-	.top_cc_test_bus_supported      = true,
-	.num_debug_registers            = 20,
-	.top_debug = {
-		0x0000004C,
-		0x00000050,
-		0x00000054,
-		0x00000058,
-		0x0000005C,
-		0x00000060,
-		0x00000064,
-		0x00000068,
-		0x0000006C,
-		0x00000070,
-		0x00000074,
-		0x00000078,
-		0x000000EC,
-		0x000000F0,
-		0x000000F4,
-		0x000000F8,
-		0x000000FC,
-		0x00000100,
-		0x00000104,
-		0x00000108,
-	},
-};
-
-static struct cam_sfe_top_hw_info sfe860_top_hw_info = {
-	.common_reg = &sfe860_top_commong_reg,
-	.modules_hw_info = &sfe880_modules_common_reg,
-	.common_reg_data = &sfe_880_top_common_reg_data,
-	.ipp_module_desc =  sfe_880_mod_desc,
-	.wr_client_desc  =  sfe_880_wr_client_desc,
-	.pix_reg_data    = &sfe_880_pix_reg_data,
-	.rdi_reg_data[0] = &sfe_880_rdi0_reg_data,
-	.rdi_reg_data[1] = &sfe_880_rdi1_reg_data,
-	.rdi_reg_data[2] = &sfe_880_rdi2_reg_data,
-	.rdi_reg_data[3] = &sfe_880_rdi3_reg_data,
-	.rdi_reg_data[4] = &sfe_880_rdi4_reg_data,
-	.num_inputs = 6,
-	.input_type = {
-		CAM_SFE_PIX_VER_1_0,
-		CAM_SFE_RDI_VER_1_0,
-		CAM_SFE_RDI_VER_1_0,
-		CAM_SFE_RDI_VER_1_0,
-		CAM_SFE_RDI_VER_1_0,
-		CAM_SFE_RDI_VER_1_0,
-	},
-	.num_top_errors  = ARRAY_SIZE(sfe_880_top_irq_err_desc),
-	.top_err_desc    = sfe_880_top_irq_err_desc,
-	.num_clc_module  = 12,
-	.clc_dbg_mod_info = &sfe880_clc_dbg_module_info,
-	.num_of_testbus = 2,
-	.test_bus_info = {
-		/* TEST BUS 1 INFO */
-		{
-			.debugfs_val  = SFE_DEBUG_ENABLE_TESTBUS1,
-			.enable       = false,
-			.value        = 0x1,
-			.size         = ARRAY_SIZE(sfe880_testbus1_info),
-			.testbus      = sfe880_testbus1_info,
-		},
-		/* TEST BUS 2 INFO */
-		{
-			.debugfs_val  = SFE_DEBUG_ENABLE_TESTBUS2,
-			.enable       = false,
-			.value        = 0x3,
-			.size         = ARRAY_SIZE(sfe880_testbus2_info),
-			.testbus      = sfe880_testbus2_info,
-		},
-	},
-};
-
-struct cam_sfe_hw_info cam_sfe860_hw_info = {
-	.irq_reg_info                  = &sfe880_top_irq_reg_info,
-
-	.bus_wr_version                = CAM_SFE_BUS_WR_VER_1_0,
-	.bus_wr_hw_info                = &sfe880_bus_wr_hw_info,
-
-	.bus_rd_version                = CAM_SFE_BUS_RD_VER_1_0,
-	.bus_rd_hw_info                = &sfe880_bus_rd_hw_info,
-
-	.top_version                   = CAM_SFE_TOP_VER_1_0,
-	.top_hw_info                   = &sfe860_top_hw_info,
-};
-
-#endif /* _CAM_SFE860_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_dev.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/slab.h>
@@ -14,7 +14,6 @@
 #include "cam_sfe_soc.h"
 #include "cam_sfe680.h"
 #include "cam_sfe780.h"
-#include "cam_sfe860.h"
 #include "cam_sfe880.h"
 #include "cam_debug_util.h"
 #include "camera_main.h"
@@ -262,10 +261,6 @@ static const struct of_device_id cam_sfe_dt_match[] = {
 		.compatible = "qcom,sfe780",
 		.data = &cam_sfe780_hw_info,
 	},
-	{
-		.compatible = "qcom,sfe860",
-		.data = &cam_sfe860_hw_info,
-	},
 	{
 		.compatible = "qcom,sfe880",
 		.data = &cam_sfe880_hw_info,

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_top/cam_sfe_top.c

@@ -780,11 +780,6 @@ static int cam_sfe_top_get_base(
 	mem_base = CAM_SOC_GET_REG_MAP_CAM_BASE(
 		top_priv->common_data.soc_info,
 		SFE_CORE_BASE_IDX);
-	if (mem_base == -1) {
-		CAM_ERR(CAM_SFE, "failed to get mem_base, index: %d num_reg_map: %u",
-				SFE_CORE_BASE_IDX, top_priv->common_data.soc_info->num_reg_map);
-		return -EINVAL;
-	}
 
 	if (cdm_args->cdm_id == CAM_CDM_RT) {
 		if (!soc_private->rt_wrapper_base) {
@@ -1195,7 +1190,6 @@ static int cam_sfe_top_apply_fcg_update(
 	}
 
 	fcg_index_shift = fcg_module_info->fcg_index_shift;
-
 	for (i = 0, j = 0; i < fcg_config->num_ch_ctx; i++) {
 		if (j >= fcg_module_info->max_reg_val_pair_size) {
 			CAM_ERR(CAM_SFE, "reg_val_pair %d exceeds the array limit %u",
@@ -1842,7 +1836,7 @@ static int cam_sfe_top_handle_irq_bottom_half(
 	void *handler_priv, void *evt_payload_priv)
 {
 	int i;
-	uint32_t val0, val1, frame_cnt, offset0, offset1;
+	uint32_t val0, val1, frame_cnt = 0, offset0, offset1;
 	uint32_t irq_status[CAM_SFE_IRQ_REGISTERS_MAX] = {0};
 	enum cam_sfe_hw_irq_status          ret = CAM_SFE_IRQ_STATUS_MAX;
 	struct cam_isp_resource_node       *res = handler_priv;

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 
@@ -9,9 +8,6 @@
 #include "cam_tfe_csid_core.h"
 #include "cam_tfe_csid530.h"
 #include "cam_tfe_csid640.h"
-#include "cam_tfe_csid640_210.h"
-#include "cam_tfe_csid770.h"
-#include "cam_tfe_csid665.h"
 #include "cam_tfe_csid_dev.h"
 #include "camera_main.h"
 
@@ -26,22 +22,6 @@ static const struct of_device_id cam_tfe_csid_dt_match[] = {
 		.compatible = "qcom,csid640",
 		.data = &cam_tfe_csid640_hw_info,
 	},
-	{
-		.compatible = "qcom,csid640_210",
-		.data = &cam_tfe_csid640_210_hw_info,
-	},
-	{
-		.compatible = "qcom,csid770",
-		.data = &cam_tfe_csid770_hw_info,
-	},
-	{
-		.compatible = "qcom,csid-lite770",
-		.data = &cam_tfe_csid770_hw_info,
-	},
-	{
-		.compatible = "qcom,csid665",
-		.data = &cam_tfe_csid665_hw_info,
-	},
 	{}
 };
 

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.h

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_TFE_CSID_530_H_
@@ -179,7 +178,6 @@ static struct cam_tfe_csid_csi2_rx_reg_offset
 	.csi2_rx_long_pkt_hdr_rst_stb_shift           = 0x1,
 	.csi2_rx_short_pkt_hdr_rst_stb_shift          = 0x2,
 	.csi2_rx_cphy_pkt_hdr_rst_stb_shift           = 0x3,
-	.need_to_sel_tpg_mux                          = false,
 };
 
 static struct cam_tfe_csid_common_reg_offset

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid640.h

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_TFE_CSID_640_H_
@@ -200,7 +199,7 @@ static struct cam_tfe_csid_csi2_rx_reg_offset
 	.csid_csi2_rx_stats_ecc_addr                  = 0x164,
 	.csid_csi2_rx_total_crc_err_addr              = 0x168,
 
-	.phy_tpg_base_id                              = 1,
+	.phy_tpg_base_id                              = 0,
 	.csi2_rst_srb_all                             = 0x3FFF,
 	.csi2_rst_done_shift_val                      = 27,
 	.csi2_irq_mask_all                            = 0xFFFFFFF,
@@ -217,7 +216,6 @@ static struct cam_tfe_csid_csi2_rx_reg_offset
 	.csi2_rx_long_pkt_hdr_rst_stb_shift           = 0x1,
 	.csi2_rx_short_pkt_hdr_rst_stb_shift          = 0x2,
 	.csi2_rx_cphy_pkt_hdr_rst_stb_shift           = 0x3,
-	.need_to_sel_tpg_mux                          = true,
 };
 
 static struct cam_tfe_csid_common_reg_offset
@@ -266,7 +264,6 @@ static struct cam_tfe_csid_common_reg_offset
 	.format_measure_height_shift_val              = 16,
 	.format_measure_height_mask_val               = 0xe,
 	.format_measure_width_mask_val                = 0x10,
-	.sync_clk                                     = true,
 };
 
 static struct cam_tfe_csid_reg_offset cam_tfe_csid_640_reg_offset = {

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid640_210.h

@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CAM_TFE_CSID_640_210_H_
-#define _CAM_TFE_CSID_640_210_H_
-
-#include "cam_tfe_csid_core.h"
-#include "cam_tfe_csid640.h"
-
-#define CAM_TFE_CSID_VERSION_V640_210               0x60040000
-
-static struct cam_tfe_csid_hw_info cam_tfe_csid640_210_hw_info = {
-	.csid_reg = &cam_tfe_csid_640_reg_offset,
-	.hw_dts_version = CAM_TFE_CSID_VERSION_V640_210,
-};
-
-#endif /*_CAM_TFE_CSID_640_210_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid665.h

@@ -1,373 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CAM_TFE_CSID_665_H_
-#define _CAM_TFE_CSID_665_H_
-
-#include "cam_tfe_csid_core.h"
-
-#define CAM_TFE_CSID_VERSION_V665                 0x70065000
-
-static struct cam_tfe_csid_pxl_reg_offset  cam_tfe_csid_665_ipp_reg_offset = {
-	.csid_pxl_irq_status_addr            = 0x30,
-	.csid_pxl_irq_mask_addr              = 0x34,
-	.csid_pxl_irq_clear_addr             = 0x38,
-	.csid_pxl_irq_set_addr               = 0x3c,
-
-	.csid_pxl_cfg0_addr                  = 0x200,
-	.csid_pxl_cfg1_addr                  = 0x204,
-	.csid_pxl_ctrl_addr                  = 0x208,
-	.csid_pxl_frame_drop_pattern         = 0x20c,
-	.csid_pxl_frame_drop_period          = 0x210,
-	.csid_pxl_irq_subsample_pattern      = 0x214,
-	.csid_pxl_irq_subsample_period       = 0x218,
-	.csid_pxl_hcrop_addr                 = 0x21c,
-	.csid_pxl_vcrop_addr                 = 0x220,
-	.csid_pxl_rst_strobes_addr           = 0x240,
-	.csid_pxl_status_addr                = 0x254,
-	.csid_pxl_misr_val_addr              = 0x258,
-	.csid_pxl_format_measure_cfg0_addr   = 0x270,
-	.csid_pxl_format_measure_cfg1_addr   = 0x274,
-	.csid_pxl_format_measure0_addr       = 0x278,
-	.csid_pxl_format_measure1_addr       = 0x27c,
-	.csid_pxl_format_measure2_addr       = 0x280,
-	.csid_pxl_timestamp_curr0_sof_addr   = 0x290,
-	.csid_pxl_timestamp_curr1_sof_addr   = 0x294,
-	.csid_pxl_timestamp_perv0_sof_addr   = 0x298,
-	.csid_pxl_timestamp_perv1_sof_addr   = 0x29c,
-	.csid_pxl_timestamp_curr0_eof_addr   = 0x2a0,
-	.csid_pxl_timestamp_curr1_eof_addr   = 0x2a4,
-	.csid_pxl_timestamp_perv0_eof_addr   = 0x2a8,
-	.csid_pxl_timestamp_perv1_eof_addr   = 0x2ac,
-	.csid_pxl_err_recovery_cfg0_addr     = 0x2d0,
-	.csid_pxl_err_recovery_cfg1_addr     = 0x2d4,
-	.csid_pxl_err_recovery_cfg2_addr     = 0x2d8,
-	.csid_pxl_multi_vcdt_cfg0_addr       = 0x2dc,
-
-	/* configurations */
-	.pix_store_en_shift_val              = 7,
-	.early_eof_en_shift_val              = 29,
-	.halt_master_sel_shift               = 4,
-	.halt_mode_shift                     = 2,
-	.halt_mode_mask                      = 3,
-	.halt_master_sel_master_val          = 1,
-	.halt_master_sel_slave_val           = 0,
-	.binning_supported                   = 3,
-	.bin_qcfa_en_shift_val               = 30,
-	.bin_en_shift_val                    = 2,
-	.is_multi_vc_dt_supported            = true,
-	.format_measure_en_shift_val         = 0,
-	.measure_en_hbi_vbi_cnt_val          = 0xc,
-	.cgc_mode_en_shift_val               = 9,
-};
-
-static struct cam_tfe_csid_pxl_reg_offset  cam_tfe_csid_665_ppp_reg_offset = {
-	.csid_pxl_irq_status_addr            = 0xA0,
-	.csid_pxl_irq_mask_addr              = 0xA4,
-	.csid_pxl_irq_clear_addr             = 0xA8,
-	.csid_pxl_irq_set_addr               = 0xAc,
-
-	.csid_pxl_cfg0_addr                  = 0x700,
-	.csid_pxl_cfg1_addr                  = 0x704,
-	.csid_pxl_ctrl_addr                  = 0x708,
-	.csid_pxl_frame_drop_pattern         = 0x70c,
-	.csid_pxl_frame_drop_period          = 0x710,
-	.csid_pxl_irq_subsample_pattern      = 0x714,
-	.csid_pxl_irq_subsample_period       = 0x718,
-	.csid_pxl_hcrop_addr                 = 0x71c,
-	.csid_pxl_vcrop_addr                 = 0x720,
-	.csid_pxl_rst_strobes_addr           = 0x740,
-	.csid_pxl_status_addr                = 0x754,
-	.csid_pxl_misr_val_addr              = 0x758,
-	.csid_pxl_format_measure_cfg0_addr   = 0x770,
-	.csid_pxl_format_measure_cfg1_addr   = 0x774,
-	.csid_pxl_format_measure0_addr       = 0x778,
-	.csid_pxl_format_measure1_addr       = 0x77c,
-	.csid_pxl_format_measure2_addr       = 0x780,
-	.csid_pxl_timestamp_curr0_sof_addr   = 0x790,
-	.csid_pxl_timestamp_curr1_sof_addr   = 0x794,
-	.csid_pxl_timestamp_perv0_sof_addr   = 0x798,
-	.csid_pxl_timestamp_perv1_sof_addr   = 0x79c,
-	.csid_pxl_timestamp_curr0_eof_addr   = 0x7a0,
-	.csid_pxl_timestamp_curr1_eof_addr   = 0x7a4,
-	.csid_pxl_timestamp_perv0_eof_addr   = 0x7a8,
-	.csid_pxl_timestamp_perv1_eof_addr   = 0x7ac,
-	.csid_pxl_ppp_sparse_pd_ext_cfg0     = 0x7c0,
-	.csid_pxl_err_recovery_cfg0_addr     = 0x7d0,
-	.csid_pxl_err_recovery_cfg1_addr     = 0x7d4,
-	.csid_pxl_err_recovery_cfg2_addr     = 0x7d8,
-	.csid_pxl_multi_vcdt_cfg0_addr       = 0x7dc,
-
-	/* configurations */
-	.pix_store_en_shift_val              = 7,
-	.early_eof_en_shift_val              = 29,
-	.halt_master_sel_shift               = 4,
-	.halt_mode_shift                     = 2,
-	.halt_mode_mask                      = 3,
-	.halt_master_sel_master_val          = 3,
-	.halt_master_sel_slave_val           = 2,
-	.binning_supported                   = 0,
-	.bin_qcfa_en_shift_val               = 30,
-	.bin_en_shift_val                    = 2,
-	.is_multi_vc_dt_supported            = true,
-	.format_measure_en_shift_val         = 0,
-	.measure_en_hbi_vbi_cnt_val          = 0xc,
-	.cgc_mode_en_shift_val               = 9,
-};
-
-static struct cam_tfe_csid_rdi_reg_offset cam_tfe_csid_665_rdi_0_reg_offset = {
-	.csid_rdi_irq_status_addr                 = 0x40,
-	.csid_rdi_irq_mask_addr                   = 0x44,
-	.csid_rdi_irq_clear_addr                  = 0x48,
-	.csid_rdi_irq_set_addr                    = 0x4c,
-
-	.csid_rdi_cfg0_addr                       = 0x300,
-	.csid_rdi_cfg1_addr                       = 0x304,
-	.csid_rdi_ctrl_addr                       = 0x308,
-	.csid_rdi_frame_drop_pattern              = 0x30c,
-	.csid_rdi_frame_drop_period               = 0x310,
-	.csid_rdi_irq_subsample_pattern           = 0x314,
-	.csid_rdi_irq_subsample_period            = 0x318,
-	.csid_rdi_rst_strobes_addr                = 0x340,
-	.csid_rdi_status_addr                     = 0x350,
-	.csid_rdi_misr_val0_addr                  = 0x354,
-	.csid_rdi_misr_val1_addr                  = 0x358,
-	.csid_rdi_misr_val2_addr                  = 0x35c,
-	.csid_rdi_misr_val3_addr                  = 0x360,
-	.csid_rdi_format_measure_cfg0_addr        = 0x370,
-	.csid_rdi_format_measure_cfg1_addr        = 0x374,
-	.csid_rdi_format_measure0_addr            = 0x378,
-	.csid_rdi_format_measure1_addr            = 0x37c,
-	.csid_rdi_format_measure2_addr            = 0x380,
-	.csid_rdi_timestamp_curr0_sof_addr        = 0x390,
-	.csid_rdi_timestamp_curr1_sof_addr        = 0x394,
-	.csid_rdi_timestamp_prev0_sof_addr        = 0x398,
-	.csid_rdi_timestamp_prev1_sof_addr        = 0x39c,
-	.csid_rdi_timestamp_curr0_eof_addr        = 0x3a0,
-	.csid_rdi_timestamp_curr1_eof_addr        = 0x3a4,
-	.csid_rdi_timestamp_prev0_eof_addr        = 0x3a8,
-	.csid_rdi_timestamp_prev1_eof_addr        = 0x3ac,
-	.csid_rdi_err_recovery_cfg0_addr          = 0x3b0,
-	.csid_rdi_err_recovery_cfg1_addr          = 0x3b4,
-	.csid_rdi_err_recovery_cfg2_addr          = 0x3b8,
-	.csid_rdi_byte_cntr_ping_addr             = 0x3e0,
-	.csid_rdi_byte_cntr_pong_addr             = 0x3e4,
-	.csid_rdi_multi_vcdt_cfg0_addr            = 0x3bc,
-
-	/* configurations */
-	.is_multi_vc_dt_supported                 = true,
-	.format_measure_en_shift_val              = 0,
-	.measure_en_hbi_vbi_cnt_val               = 0xc,
-	.cgc_mode_en_shift_val                    = 8,
-};
-
-static struct cam_tfe_csid_rdi_reg_offset cam_tfe_csid_665_rdi_1_reg_offset = {
-	.csid_rdi_irq_status_addr                 = 0x50,
-	.csid_rdi_irq_mask_addr                   = 0x54,
-	.csid_rdi_irq_clear_addr                  = 0x58,
-	.csid_rdi_irq_set_addr                    = 0x5c,
-
-	.csid_rdi_cfg0_addr                       = 0x400,
-	.csid_rdi_cfg1_addr                       = 0x404,
-	.csid_rdi_ctrl_addr                       = 0x408,
-	.csid_rdi_frame_drop_pattern              = 0x40c,
-	.csid_rdi_frame_drop_period               = 0x410,
-	.csid_rdi_irq_subsample_pattern           = 0x414,
-	.csid_rdi_irq_subsample_period            = 0x418,
-	.csid_rdi_rst_strobes_addr                = 0x440,
-	.csid_rdi_status_addr                     = 0x450,
-	.csid_rdi_misr_val0_addr                  = 0x454,
-	.csid_rdi_misr_val1_addr                  = 0x458,
-	.csid_rdi_misr_val2_addr                  = 0x45c,
-	.csid_rdi_misr_val3_addr                  = 0x460,
-	.csid_rdi_format_measure_cfg0_addr        = 0x470,
-	.csid_rdi_format_measure_cfg1_addr        = 0x474,
-	.csid_rdi_format_measure0_addr            = 0x478,
-	.csid_rdi_format_measure1_addr            = 0x47c,
-	.csid_rdi_format_measure2_addr            = 0x480,
-	.csid_rdi_timestamp_curr0_sof_addr        = 0x490,
-	.csid_rdi_timestamp_curr1_sof_addr        = 0x494,
-	.csid_rdi_timestamp_prev0_sof_addr        = 0x498,
-	.csid_rdi_timestamp_prev1_sof_addr        = 0x49c,
-	.csid_rdi_timestamp_curr0_eof_addr        = 0x4a0,
-	.csid_rdi_timestamp_curr1_eof_addr        = 0x4a4,
-	.csid_rdi_timestamp_prev0_eof_addr        = 0x4a8,
-	.csid_rdi_timestamp_prev1_eof_addr        = 0x4ac,
-	.csid_rdi_err_recovery_cfg0_addr          = 0x4b0,
-	.csid_rdi_err_recovery_cfg1_addr          = 0x4b4,
-	.csid_rdi_err_recovery_cfg2_addr          = 0x4b8,
-	.csid_rdi_byte_cntr_ping_addr             = 0x4e0,
-	.csid_rdi_byte_cntr_pong_addr             = 0x4e4,
-	.csid_rdi_multi_vcdt_cfg0_addr            = 0x4bc,
-
-	/* configurations */
-	.is_multi_vc_dt_supported                 = true,
-	.format_measure_en_shift_val              = 0,
-	.measure_en_hbi_vbi_cnt_val               = 0xc,
-	.cgc_mode_en_shift_val                    = 8,
-};
-
-static struct cam_tfe_csid_rdi_reg_offset cam_tfe_csid_665_rdi_2_reg_offset = {
-	.csid_rdi_irq_status_addr                 = 0x60,
-	.csid_rdi_irq_mask_addr                   = 0x64,
-	.csid_rdi_irq_clear_addr                  = 0x68,
-	.csid_rdi_irq_set_addr                    = 0x6c,
-
-	.csid_rdi_cfg0_addr                       = 0x500,
-	.csid_rdi_cfg1_addr                       = 0x504,
-	.csid_rdi_ctrl_addr                       = 0x508,
-	.csid_rdi_frame_drop_pattern              = 0x50c,
-	.csid_rdi_frame_drop_period               = 0x510,
-	.csid_rdi_irq_subsample_pattern           = 0x514,
-	.csid_rdi_irq_subsample_period            = 0x518,
-	.csid_rdi_rst_strobes_addr                = 0x540,
-	.csid_rdi_status_addr                     = 0x550,
-	.csid_rdi_misr_val0_addr                  = 0x554,
-	.csid_rdi_misr_val1_addr                  = 0x558,
-	.csid_rdi_misr_val2_addr                  = 0x55c,
-	.csid_rdi_misr_val3_addr                  = 0x560,
-	.csid_rdi_format_measure_cfg0_addr        = 0x570,
-	.csid_rdi_format_measure_cfg1_addr        = 0x574,
-	.csid_rdi_format_measure0_addr            = 0x578,
-	.csid_rdi_format_measure1_addr            = 0x57c,
-	.csid_rdi_format_measure2_addr            = 0x580,
-	.csid_rdi_timestamp_curr0_sof_addr        = 0x590,
-	.csid_rdi_timestamp_curr1_sof_addr        = 0x594,
-	.csid_rdi_timestamp_prev0_sof_addr        = 0x598,
-	.csid_rdi_timestamp_prev1_sof_addr        = 0x59c,
-	.csid_rdi_timestamp_curr0_eof_addr        = 0x5a0,
-	.csid_rdi_timestamp_curr1_eof_addr        = 0x5a4,
-	.csid_rdi_timestamp_prev0_eof_addr        = 0x5a8,
-	.csid_rdi_timestamp_prev1_eof_addr        = 0x5ac,
-	.csid_rdi_err_recovery_cfg0_addr          = 0x5b0,
-	.csid_rdi_err_recovery_cfg1_addr          = 0x5b4,
-	.csid_rdi_err_recovery_cfg2_addr          = 0x5b8,
-	.csid_rdi_byte_cntr_ping_addr             = 0x5e0,
-	.csid_rdi_byte_cntr_pong_addr             = 0x5e4,
-	.csid_rdi_multi_vcdt_cfg0_addr            = 0x5bc,
-
-	/* configurations */
-	.is_multi_vc_dt_supported                 = true,
-	.format_measure_en_shift_val              = 0,
-	.measure_en_hbi_vbi_cnt_val               = 0xc,
-	.cgc_mode_en_shift_val                    = 8,
-};
-
-static struct cam_tfe_csid_csi2_rx_reg_offset
-	cam_tfe_csid_665_csi2_reg_offset = {
-	.csid_csi2_rx_irq_status_addr                 = 0x20,
-	.csid_csi2_rx_irq_mask_addr                   = 0x24,
-	.csid_csi2_rx_irq_clear_addr                  = 0x28,
-	.csid_csi2_rx_irq_set_addr                    = 0x2c,
-
-	/*CSI2 rx control */
-	.phy_sel_base                                 = 1,
-	.csid_csi2_rx_cfg0_addr                       = 0x100,
-	.csid_csi2_rx_cfg1_addr                       = 0x104,
-	.csid_csi2_rx_capture_ctrl_addr               = 0x108,
-	.csid_csi2_rx_rst_strobes_addr                = 0x110,
-	.csid_csi2_rx_cap_unmap_long_pkt_hdr_0_addr   = 0x120,
-	.csid_csi2_rx_cap_unmap_long_pkt_hdr_1_addr   = 0x124,
-	.csid_csi2_rx_captured_short_pkt_0_addr       = 0x128,
-	.csid_csi2_rx_captured_short_pkt_1_addr       = 0x12c,
-	.csid_csi2_rx_captured_long_pkt_0_addr        = 0x130,
-	.csid_csi2_rx_captured_long_pkt_1_addr        = 0x134,
-	.csid_csi2_rx_captured_long_pkt_ftr_addr      = 0x138,
-	.csid_csi2_rx_captured_cphy_pkt_hdr_addr      = 0x13c,
-	.csid_csi2_rx_total_pkts_rcvd_addr            = 0x160,
-	.csid_csi2_rx_stats_ecc_addr                  = 0x164,
-	.csid_csi2_rx_total_crc_err_addr              = 0x168,
-
-	.phy_tpg_base_id                              = 3,
-	.csi2_rst_srb_all                             = 0x3FFF,
-	.csi2_rst_done_shift_val                      = 27,
-	.csi2_irq_mask_all                            = 0xFFFFFFF,
-	.csi2_misr_enable_shift_val                   = 6,
-	.csi2_vc_mode_shift_val                       = 2,
-	.csi2_capture_long_pkt_en_shift               = 0,
-	.csi2_capture_short_pkt_en_shift              = 1,
-	.csi2_capture_cphy_pkt_en_shift               = 2,
-	.csi2_capture_long_pkt_dt_shift               = 4,
-	.csi2_capture_long_pkt_vc_shift               = 10,
-	.csi2_capture_short_pkt_vc_shift              = 12,
-	.csi2_capture_cphy_pkt_dt_shift               = 14,
-	.csi2_capture_cphy_pkt_vc_shift               = 20,
-	.csi2_rx_phy_num_mask                         = 0x7,
-	.csi2_rx_long_pkt_hdr_rst_stb_shift           = 0x1,
-	.csi2_rx_short_pkt_hdr_rst_stb_shift          = 0x2,
-	.csi2_rx_cphy_pkt_hdr_rst_stb_shift           = 0x3,
-	.need_to_sel_tpg_mux                          = true,
-};
-
-static struct cam_tfe_csid_common_reg_offset
-	cam_tfe_csid_665_cmn_reg_offset = {
-	.csid_hw_version_addr                         = 0x0,
-	.csid_cfg0_addr                               = 0x4,
-	.csid_ctrl_addr                               = 0x8,
-	.csid_rst_strobes_addr                        = 0x10,
-
-	.csid_test_bus_ctrl_addr                      = 0x14,
-	.csid_top_irq_status_addr                     = 0x70,
-	.csid_top_irq_mask_addr                       = 0x74,
-	.csid_top_irq_clear_addr                      = 0x78,
-	.csid_top_irq_set_addr                        = 0x7c,
-	.csid_irq_cmd_addr                            = 0x80,
-
-	/*configurations */
-	.major_version                                = 5,
-	.minor_version                                = 3,
-	.version_incr                                 = 0,
-	.num_rdis                                     = 3,
-	.num_pix                                      = 1,
-	.num_ppp                                      = 1,
-	.csid_reg_rst_stb                             = 1,
-	.csid_rst_stb                                 = 0x1e,
-	.csid_rst_stb_sw_all                          = 0x1f,
-	.ipp_path_rst_stb_all                         = 0x17,
-	.ppp_path_rst_stb_all                         = 0x17,
-	.rdi_path_rst_stb_all                         = 0x97,
-	.path_rst_done_shift_val                      = 1,
-	.path_en_shift_val                            = 31,
-	.dt_id_shift_val                              = 27,
-	.vc_shift_val                                 = 22,
-	.dt_shift_val                                 = 16,
-	.vc1_shift_val                                = 2,
-	.dt1_shift_val                                = 7,
-	.multi_vc_dt_en_shift_val                     = 0,
-	.fmt_shift_val                                = 12,
-	.plain_fmt_shit_val                           = 10,
-	.crop_v_en_shift_val                          = 6,
-	.crop_h_en_shift_val                          = 5,
-	.crop_shift                                   = 16,
-	.ipp_irq_mask_all                             = 0x3FFFF,
-	.ppp_irq_mask_all                             = 0x3FFFF,
-	.rdi_irq_mask_all                             = 0x3FFFF,
-	.top_tfe2_pix_pipe_fuse_reg                   = 0xFE4,
-	.top_tfe2_fuse_reg                            = 0xFE8,
-	.format_measure_support                       = true,
-	.format_measure_height_shift_val              = 16,
-	.format_measure_height_mask_val               = 0xFFFF,
-	.format_measure_width_mask_val                = 0xFFFF,
-	.sync_clk                                     = true,
-};
-
-static struct cam_tfe_csid_reg_offset cam_tfe_csid_665_reg_offset = {
-	.cmn_reg          = &cam_tfe_csid_665_cmn_reg_offset,
-	.csi2_reg         = &cam_tfe_csid_665_csi2_reg_offset,
-	.ipp_reg          = &cam_tfe_csid_665_ipp_reg_offset,
-	.ppp_reg          = &cam_tfe_csid_665_ppp_reg_offset,
-	.rdi_reg = {
-		&cam_tfe_csid_665_rdi_0_reg_offset,
-		&cam_tfe_csid_665_rdi_1_reg_offset,
-		&cam_tfe_csid_665_rdi_2_reg_offset,
-		},
-};
-
-static struct cam_tfe_csid_hw_info cam_tfe_csid665_hw_info = {
-	.csid_reg = &cam_tfe_csid_665_reg_offset,
-	.hw_dts_version = CAM_TFE_CSID_VERSION_V665,
-};
-
-#endif /*_CAM_TFE_CSID_665_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid770.h

@@ -1,374 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#ifndef _CAM_TFE_CSID_770_H_
-#define _CAM_TFE_CSID_770_H_
-
-#include "cam_tfe_csid_core.h"
-
-#define CAM_TFE_CSID_VERSION_V770                 0x70070000
-
-static struct cam_tfe_csid_pxl_reg_offset  cam_tfe_csid_770_ipp_reg_offset = {
-	.csid_pxl_irq_status_addr            = 0x30,
-	.csid_pxl_irq_mask_addr              = 0x34,
-	.csid_pxl_irq_clear_addr             = 0x38,
-	.csid_pxl_irq_set_addr               = 0x3c,
-
-	.csid_pxl_cfg0_addr                  = 0x200,
-	.csid_pxl_cfg1_addr                  = 0x204,
-	.csid_pxl_ctrl_addr                  = 0x208,
-	.csid_pxl_frame_drop_pattern         = 0x20c,
-	.csid_pxl_frame_drop_period          = 0x210,
-	.csid_pxl_irq_subsample_pattern      = 0x214,
-	.csid_pxl_irq_subsample_period       = 0x218,
-	.csid_pxl_hcrop_addr                 = 0x21c,
-	.csid_pxl_vcrop_addr                 = 0x220,
-	.csid_pxl_rst_strobes_addr           = 0x240,
-	.csid_pxl_status_addr                = 0x254,
-	.csid_pxl_misr_val_addr              = 0x258,
-	.csid_pxl_format_measure_cfg0_addr   = 0x270,
-	.csid_pxl_format_measure_cfg1_addr   = 0x274,
-	.csid_pxl_format_measure0_addr       = 0x278,
-	.csid_pxl_format_measure1_addr       = 0x27c,
-	.csid_pxl_format_measure2_addr       = 0x280,
-	.csid_pxl_timestamp_curr0_sof_addr   = 0x290,
-	.csid_pxl_timestamp_curr1_sof_addr   = 0x294,
-	.csid_pxl_timestamp_perv0_sof_addr   = 0x298,
-	.csid_pxl_timestamp_perv1_sof_addr   = 0x29c,
-	.csid_pxl_timestamp_curr0_eof_addr   = 0x2a0,
-	.csid_pxl_timestamp_curr1_eof_addr   = 0x2a4,
-	.csid_pxl_timestamp_perv0_eof_addr   = 0x2a8,
-	.csid_pxl_timestamp_perv1_eof_addr   = 0x2ac,
-	.csid_pxl_err_recovery_cfg0_addr     = 0x2d0,
-	.csid_pxl_err_recovery_cfg1_addr     = 0x2d4,
-	.csid_pxl_err_recovery_cfg2_addr     = 0x2d8,
-	.csid_pxl_multi_vcdt_cfg0_addr       = 0x2dc,
-
-	/* configurations */
-	.pix_store_en_shift_val              = 7,
-	.early_eof_en_shift_val              = 29,
-	.halt_master_sel_shift               = 4,
-	.halt_mode_shift                     = 2,
-	.halt_mode_mask                      = 3,
-	.halt_master_sel_master_val          = 1,
-	.halt_master_sel_slave_val           = 0,
-	.binning_supported                   = 3,
-	.bin_qcfa_en_shift_val               = 30,
-	.bin_en_shift_val                    = 2,
-	.is_multi_vc_dt_supported            = true,
-	.format_measure_en_shift_val         = 0,
-	.measure_en_hbi_vbi_cnt_val          = 0xc,
-	.cgc_mode_en_shift_val               = 9,
-};
-
-static struct cam_tfe_csid_pxl_reg_offset  cam_tfe_csid_770_ppp_reg_offset = {
-	.csid_pxl_irq_status_addr            = 0xA0,
-	.csid_pxl_irq_mask_addr              = 0xA4,
-	.csid_pxl_irq_clear_addr             = 0xA8,
-	.csid_pxl_irq_set_addr               = 0xAc,
-
-	.csid_pxl_cfg0_addr                  = 0x700,
-	.csid_pxl_cfg1_addr                  = 0x704,
-	.csid_pxl_ctrl_addr                  = 0x708,
-	.csid_pxl_frame_drop_pattern         = 0x70c,
-	.csid_pxl_frame_drop_period          = 0x710,
-	.csid_pxl_irq_subsample_pattern      = 0x714,
-	.csid_pxl_irq_subsample_period       = 0x718,
-	.csid_pxl_hcrop_addr                 = 0x71c,
-	.csid_pxl_vcrop_addr                 = 0x720,
-	.csid_pxl_rst_strobes_addr           = 0x740,
-	.csid_pxl_status_addr                = 0x754,
-	.csid_pxl_misr_val_addr              = 0x758,
-	.csid_pxl_format_measure_cfg0_addr   = 0x770,
-	.csid_pxl_format_measure_cfg1_addr   = 0x774,
-	.csid_pxl_format_measure0_addr       = 0x778,
-	.csid_pxl_format_measure1_addr       = 0x77c,
-	.csid_pxl_format_measure2_addr       = 0x780,
-	.csid_pxl_timestamp_curr0_sof_addr   = 0x790,
-	.csid_pxl_timestamp_curr1_sof_addr   = 0x794,
-	.csid_pxl_timestamp_perv0_sof_addr   = 0x798,
-	.csid_pxl_timestamp_perv1_sof_addr   = 0x79c,
-	.csid_pxl_timestamp_curr0_eof_addr   = 0x7a0,
-	.csid_pxl_timestamp_curr1_eof_addr   = 0x7a4,
-	.csid_pxl_timestamp_perv0_eof_addr   = 0x7a8,
-	.csid_pxl_timestamp_perv1_eof_addr   = 0x7ac,
-	.csid_pxl_ppp_sparse_pd_ext_cfg0     = 0x7c0,
-	.csid_pxl_err_recovery_cfg0_addr     = 0x7d0,
-	.csid_pxl_err_recovery_cfg1_addr     = 0x7d4,
-	.csid_pxl_err_recovery_cfg2_addr     = 0x7d8,
-	.csid_pxl_multi_vcdt_cfg0_addr       = 0x7dc,
-
-	/* configurations */
-	.pix_store_en_shift_val              = 7,
-	.early_eof_en_shift_val              = 29,
-	.halt_master_sel_shift               = 4,
-	.halt_mode_shift                     = 2,
-	.halt_mode_mask                      = 3,
-	.halt_master_sel_master_val          = 3,
-	.halt_master_sel_slave_val           = 2,
-	.binning_supported                   = 0,
-	.bin_qcfa_en_shift_val               = 30,
-	.bin_en_shift_val                    = 2,
-	.is_multi_vc_dt_supported            = true,
-	.format_measure_en_shift_val         = 0,
-	.measure_en_hbi_vbi_cnt_val          = 0xc,
-	.cgc_mode_en_shift_val               = 9,
-};
-
-static struct cam_tfe_csid_rdi_reg_offset cam_tfe_csid_770_rdi_0_reg_offset = {
-	.csid_rdi_irq_status_addr                 = 0x40,
-	.csid_rdi_irq_mask_addr                   = 0x44,
-	.csid_rdi_irq_clear_addr                  = 0x48,
-	.csid_rdi_irq_set_addr                    = 0x4c,
-
-	.csid_rdi_cfg0_addr                       = 0x300,
-	.csid_rdi_cfg1_addr                       = 0x304,
-	.csid_rdi_ctrl_addr                       = 0x308,
-	.csid_rdi_frame_drop_pattern              = 0x30c,
-	.csid_rdi_frame_drop_period               = 0x310,
-	.csid_rdi_irq_subsample_pattern           = 0x314,
-	.csid_rdi_irq_subsample_period            = 0x318,
-	.csid_rdi_rst_strobes_addr                = 0x340,
-	.csid_rdi_status_addr                     = 0x350,
-	.csid_rdi_misr_val0_addr                  = 0x354,
-	.csid_rdi_misr_val1_addr                  = 0x358,
-	.csid_rdi_misr_val2_addr                  = 0x35c,
-	.csid_rdi_misr_val3_addr                  = 0x360,
-	.csid_rdi_format_measure_cfg0_addr        = 0x370,
-	.csid_rdi_format_measure_cfg1_addr        = 0x374,
-	.csid_rdi_format_measure0_addr            = 0x378,
-	.csid_rdi_format_measure1_addr            = 0x37c,
-	.csid_rdi_format_measure2_addr            = 0x380,
-	.csid_rdi_timestamp_curr0_sof_addr        = 0x390,
-	.csid_rdi_timestamp_curr1_sof_addr        = 0x394,
-	.csid_rdi_timestamp_prev0_sof_addr        = 0x398,
-	.csid_rdi_timestamp_prev1_sof_addr        = 0x39c,
-	.csid_rdi_timestamp_curr0_eof_addr        = 0x3a0,
-	.csid_rdi_timestamp_curr1_eof_addr        = 0x3a4,
-	.csid_rdi_timestamp_prev0_eof_addr        = 0x3a8,
-	.csid_rdi_timestamp_prev1_eof_addr        = 0x3ac,
-	.csid_rdi_err_recovery_cfg0_addr          = 0x3b0,
-	.csid_rdi_err_recovery_cfg1_addr          = 0x3b4,
-	.csid_rdi_err_recovery_cfg2_addr          = 0x3b8,
-	.csid_rdi_byte_cntr_ping_addr             = 0x3e0,
-	.csid_rdi_byte_cntr_pong_addr             = 0x3e4,
-	.csid_rdi_multi_vcdt_cfg0_addr            = 0x3bc,
-
-	/* configurations */
-	.is_multi_vc_dt_supported                 = true,
-	.format_measure_en_shift_val              = 0,
-	.measure_en_hbi_vbi_cnt_val               = 0xc,
-	.cgc_mode_en_shift_val                    = 8,
-};
-
-static struct cam_tfe_csid_rdi_reg_offset cam_tfe_csid_770_rdi_1_reg_offset = {
-	.csid_rdi_irq_status_addr                 = 0x50,
-	.csid_rdi_irq_mask_addr                   = 0x54,
-	.csid_rdi_irq_clear_addr                  = 0x58,
-	.csid_rdi_irq_set_addr                    = 0x5c,
-
-	.csid_rdi_cfg0_addr                       = 0x400,
-	.csid_rdi_cfg1_addr                       = 0x404,
-	.csid_rdi_ctrl_addr                       = 0x408,
-	.csid_rdi_frame_drop_pattern              = 0x40c,
-	.csid_rdi_frame_drop_period               = 0x410,
-	.csid_rdi_irq_subsample_pattern           = 0x414,
-	.csid_rdi_irq_subsample_period            = 0x418,
-	.csid_rdi_rst_strobes_addr                = 0x440,
-	.csid_rdi_status_addr                     = 0x450,
-	.csid_rdi_misr_val0_addr                  = 0x454,
-	.csid_rdi_misr_val1_addr                  = 0x458,
-	.csid_rdi_misr_val2_addr                  = 0x45c,
-	.csid_rdi_misr_val3_addr                  = 0x460,
-	.csid_rdi_format_measure_cfg0_addr        = 0x470,
-	.csid_rdi_format_measure_cfg1_addr        = 0x474,
-	.csid_rdi_format_measure0_addr            = 0x478,
-	.csid_rdi_format_measure1_addr            = 0x47c,
-	.csid_rdi_format_measure2_addr            = 0x480,
-	.csid_rdi_timestamp_curr0_sof_addr        = 0x490,
-	.csid_rdi_timestamp_curr1_sof_addr        = 0x494,
-	.csid_rdi_timestamp_prev0_sof_addr        = 0x498,
-	.csid_rdi_timestamp_prev1_sof_addr        = 0x49c,
-	.csid_rdi_timestamp_curr0_eof_addr        = 0x4a0,
-	.csid_rdi_timestamp_curr1_eof_addr        = 0x4a4,
-	.csid_rdi_timestamp_prev0_eof_addr        = 0x4a8,
-	.csid_rdi_timestamp_prev1_eof_addr        = 0x4ac,
-	.csid_rdi_err_recovery_cfg0_addr          = 0x4b0,
-	.csid_rdi_err_recovery_cfg1_addr          = 0x4b4,
-	.csid_rdi_err_recovery_cfg2_addr          = 0x4b8,
-	.csid_rdi_byte_cntr_ping_addr             = 0x4e0,
-	.csid_rdi_byte_cntr_pong_addr             = 0x4e4,
-	.csid_rdi_multi_vcdt_cfg0_addr            = 0x4bc,
-
-	/* configurations */
-	.is_multi_vc_dt_supported                 = true,
-	.format_measure_en_shift_val              = 0,
-	.measure_en_hbi_vbi_cnt_val               = 0xc,
-	.cgc_mode_en_shift_val                    = 8,
-};
-
-static struct cam_tfe_csid_rdi_reg_offset cam_tfe_csid_770_rdi_2_reg_offset = {
-	.csid_rdi_irq_status_addr                 = 0x60,
-	.csid_rdi_irq_mask_addr                   = 0x64,
-	.csid_rdi_irq_clear_addr                  = 0x68,
-	.csid_rdi_irq_set_addr                    = 0x6c,
-
-	.csid_rdi_cfg0_addr                       = 0x500,
-	.csid_rdi_cfg1_addr                       = 0x504,
-	.csid_rdi_ctrl_addr                       = 0x508,
-	.csid_rdi_frame_drop_pattern              = 0x50c,
-	.csid_rdi_frame_drop_period               = 0x510,
-	.csid_rdi_irq_subsample_pattern           = 0x514,
-	.csid_rdi_irq_subsample_period            = 0x518,
-	.csid_rdi_rst_strobes_addr                = 0x540,
-	.csid_rdi_status_addr                     = 0x550,
-	.csid_rdi_misr_val0_addr                  = 0x554,
-	.csid_rdi_misr_val1_addr                  = 0x558,
-	.csid_rdi_misr_val2_addr                  = 0x55c,
-	.csid_rdi_misr_val3_addr                  = 0x560,
-	.csid_rdi_format_measure_cfg0_addr        = 0x570,
-	.csid_rdi_format_measure_cfg1_addr        = 0x574,
-	.csid_rdi_format_measure0_addr            = 0x578,
-	.csid_rdi_format_measure1_addr            = 0x57c,
-	.csid_rdi_format_measure2_addr            = 0x580,
-	.csid_rdi_timestamp_curr0_sof_addr        = 0x590,
-	.csid_rdi_timestamp_curr1_sof_addr        = 0x594,
-	.csid_rdi_timestamp_prev0_sof_addr        = 0x598,
-	.csid_rdi_timestamp_prev1_sof_addr        = 0x59c,
-	.csid_rdi_timestamp_curr0_eof_addr        = 0x5a0,
-	.csid_rdi_timestamp_curr1_eof_addr        = 0x5a4,
-	.csid_rdi_timestamp_prev0_eof_addr        = 0x5a8,
-	.csid_rdi_timestamp_prev1_eof_addr        = 0x5ac,
-	.csid_rdi_err_recovery_cfg0_addr          = 0x5b0,
-	.csid_rdi_err_recovery_cfg1_addr          = 0x5b4,
-	.csid_rdi_err_recovery_cfg2_addr          = 0x5b8,
-	.csid_rdi_byte_cntr_ping_addr             = 0x5e0,
-	.csid_rdi_byte_cntr_pong_addr             = 0x5e4,
-	.csid_rdi_multi_vcdt_cfg0_addr            = 0x5bc,
-
-	/* configurations */
-	.is_multi_vc_dt_supported                 = true,
-	.format_measure_en_shift_val              = 0,
-	.measure_en_hbi_vbi_cnt_val               = 0xc,
-	.cgc_mode_en_shift_val                    = 8,
-};
-
-static struct cam_tfe_csid_csi2_rx_reg_offset
-	cam_tfe_csid_770_csi2_reg_offset = {
-	.csid_csi2_rx_irq_status_addr                 = 0x20,
-	.csid_csi2_rx_irq_mask_addr                   = 0x24,
-	.csid_csi2_rx_irq_clear_addr                  = 0x28,
-	.csid_csi2_rx_irq_set_addr                    = 0x2c,
-
-	/*CSI2 rx control */
-	.phy_sel_base                                 = 1,
-	.csid_csi2_rx_cfg0_addr                       = 0x100,
-	.csid_csi2_rx_cfg1_addr                       = 0x104,
-	.csid_csi2_rx_capture_ctrl_addr               = 0x108,
-	.csid_csi2_rx_rst_strobes_addr                = 0x110,
-	.csid_csi2_rx_cap_unmap_long_pkt_hdr_0_addr   = 0x120,
-	.csid_csi2_rx_cap_unmap_long_pkt_hdr_1_addr   = 0x124,
-	.csid_csi2_rx_captured_short_pkt_0_addr       = 0x128,
-	.csid_csi2_rx_captured_short_pkt_1_addr       = 0x12c,
-	.csid_csi2_rx_captured_long_pkt_0_addr        = 0x130,
-	.csid_csi2_rx_captured_long_pkt_1_addr        = 0x134,
-	.csid_csi2_rx_captured_long_pkt_ftr_addr      = 0x138,
-	.csid_csi2_rx_captured_cphy_pkt_hdr_addr      = 0x13c,
-	.csid_csi2_rx_total_pkts_rcvd_addr            = 0x160,
-	.csid_csi2_rx_stats_ecc_addr                  = 0x164,
-	.csid_csi2_rx_total_crc_err_addr              = 0x168,
-
-	.phy_tpg_base_id                              = 3,
-	.csi2_rst_srb_all                             = 0x3FFF,
-	.csi2_rst_done_shift_val                      = 27,
-	.csi2_irq_mask_all                            = 0xFFFFFFF,
-	.csi2_misr_enable_shift_val                   = 6,
-	.csi2_vc_mode_shift_val                       = 2,
-	.csi2_rx_epd_mode_shift_en                    = 8,
-	.csi2_capture_long_pkt_en_shift               = 0,
-	.csi2_capture_short_pkt_en_shift              = 1,
-	.csi2_capture_cphy_pkt_en_shift               = 2,
-	.csi2_capture_long_pkt_dt_shift               = 4,
-	.csi2_capture_long_pkt_vc_shift               = 10,
-	.csi2_capture_short_pkt_vc_shift              = 12,
-	.csi2_capture_cphy_pkt_dt_shift               = 14,
-	.csi2_capture_cphy_pkt_vc_shift               = 20,
-	.csi2_rx_phy_num_mask                         = 0x7,
-	.csi2_rx_long_pkt_hdr_rst_stb_shift           = 0x1,
-	.csi2_rx_short_pkt_hdr_rst_stb_shift          = 0x2,
-	.csi2_rx_cphy_pkt_hdr_rst_stb_shift           = 0x3,
-	.need_to_sel_tpg_mux                          = true,
-};
-
-static struct cam_tfe_csid_common_reg_offset
-	cam_tfe_csid_770_cmn_reg_offset = {
-	.csid_hw_version_addr                         = 0x0,
-	.csid_cfg0_addr                               = 0x4,
-	.csid_ctrl_addr                               = 0x8,
-	.csid_rst_strobes_addr                        = 0x10,
-
-	.csid_test_bus_ctrl_addr                      = 0x14,
-	.csid_top_irq_status_addr                     = 0x70,
-	.csid_top_irq_mask_addr                       = 0x74,
-	.csid_top_irq_clear_addr                      = 0x78,
-	.csid_top_irq_set_addr                        = 0x7c,
-	.csid_irq_cmd_addr                            = 0x80,
-
-	/*configurations */
-	.major_version                                = 5,
-	.minor_version                                = 3,
-	.version_incr                                 = 0,
-	.num_rdis                                     = 3,
-	.num_pix                                      = 1,
-	.num_ppp                                      = 1,
-	.csid_reg_rst_stb                             = 1,
-	.csid_rst_stb                                 = 0x1e,
-	.csid_rst_stb_sw_all                          = 0x1f,
-	.ipp_path_rst_stb_all                         = 0x17,
-	.ppp_path_rst_stb_all                         = 0x17,
-	.rdi_path_rst_stb_all                         = 0x97,
-	.path_rst_done_shift_val                      = 1,
-	.path_en_shift_val                            = 31,
-	.dt_id_shift_val                              = 27,
-	.vc_shift_val                                 = 22,
-	.dt_shift_val                                 = 16,
-	.vc1_shift_val                                = 2,
-	.dt1_shift_val                                = 7,
-	.multi_vc_dt_en_shift_val                     = 0,
-	.fmt_shift_val                                = 12,
-	.plain_fmt_shit_val                           = 10,
-	.crop_v_en_shift_val                          = 6,
-	.crop_h_en_shift_val                          = 5,
-	.crop_shift                                   = 16,
-	.ipp_irq_mask_all                             = 0x3FFFF,
-	.ppp_irq_mask_all                             = 0x3FFFF,
-	.rdi_irq_mask_all                             = 0x3FFFF,
-	.top_tfe2_pix_pipe_fuse_reg                   = 0xFE4,
-	.top_tfe2_fuse_reg                            = 0xFE8,
-	.format_measure_support                       = true,
-	.format_measure_height_shift_val              = 16,
-	.format_measure_height_mask_val               = 0xFFFF,
-	.format_measure_width_mask_val                = 0xFFFF,
-	.sync_clk                                     = true,
-};
-
-static struct cam_tfe_csid_reg_offset cam_tfe_csid_770_reg_offset = {
-	.cmn_reg          = &cam_tfe_csid_770_cmn_reg_offset,
-	.csi2_reg         = &cam_tfe_csid_770_csi2_reg_offset,
-	.ipp_reg          = &cam_tfe_csid_770_ipp_reg_offset,
-	.ppp_reg          = &cam_tfe_csid_770_ppp_reg_offset,
-	.rdi_reg = {
-		&cam_tfe_csid_770_rdi_0_reg_offset,
-		&cam_tfe_csid_770_rdi_1_reg_offset,
-		&cam_tfe_csid_770_rdi_2_reg_offset,
-		},
-};
-
-static struct cam_tfe_csid_hw_info cam_tfe_csid770_hw_info = {
-	.csid_reg = &cam_tfe_csid_770_reg_offset,
-	.hw_dts_version = CAM_TFE_CSID_VERSION_V770,
-};
-
-#endif /*_CAM_TFE_CSID_770_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.h

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_TFE_CSID_HW_H_
@@ -56,14 +55,11 @@
 #define TFE_CSID_PATH_ERROR_PIX_COUNT                 BIT(13)
 #define TFE_CSID_PATH_ERROR_LINE_COUNT                BIT(14)
 #define TFE_CSID_PATH_IPP_ERROR_CCIF_VIOLATION        BIT(15)
-#define TFE_CSID_PATH_IPP_FRAME_DROP                  BIT(16)
-#define TFE_CSID_PATH_IPP_OVERFLOW_IRQ                BIT(17)
-#define TFE_CSID_PATH_PPP_ERROR_CCIF_VIOLATION        BIT(15)
-#define TFE_CSID_PATH_PPP_FRAME_DROP                  BIT(16)
-#define TFE_CSID_PATH_PPP_OVERFLOW_IRQ                BIT(17)
-#define TFE_CSID_PATH_RDI_ERROR_CCIF_VIOLATION        BIT(15)
+#define TFE_CSID_PATH_IPP_OVERFLOW_IRQ                BIT(16)
+#define TFE_CSID_PATH_IPP_FRAME_DROP                  BIT(17)
 #define TFE_CSID_PATH_RDI_FRAME_DROP                  BIT(16)
 #define TFE_CSID_PATH_RDI_OVERFLOW_IRQ                BIT(17)
+#define TFE_CSID_PATH_RDI_ERROR_CCIF_VIOLATION        BIT(18)
 
 /*
  * Debug values enable the corresponding interrupts and debug logs provide
@@ -98,14 +94,6 @@ enum cam_tfe_csid_path_halt_mode {
 	TFE_CSID_HALT_MODE_SLAVE,
 };
 
-/* enum cam_csid_path_halt_master select the path halt master control */
-enum cam_tfe_csid_path_halt_master_sel {
-	TFE_CSID_HALT_CMD_SOURCE_EXTERNAL,
-	TFE_CSID_HALT_CMD_SOURCE_NONE,
-	TFE_CSID_HALT_CMD_SOURCE_INTERNAL2,
-	TFE_CSID_HALT_CMD_SOURCE_INTERNAL1,
-};
-
 /**
  *enum cam_csid_path_timestamp_stb_sel - select the sof/eof strobes used to
  *        capture the timestamp
@@ -127,20 +115,11 @@ struct cam_tfe_csid_pxl_reg_offset {
 	uint32_t csid_pxl_cfg0_addr;
 	uint32_t csid_pxl_cfg1_addr;
 	uint32_t csid_pxl_ctrl_addr;
-	uint32_t csid_pxl_frame_drop_pattern;
-	uint32_t csid_pxl_frame_drop_period;
-	uint32_t csid_pxl_irq_subsample_pattern;
-	uint32_t csid_pxl_irq_subsample_period;
 	uint32_t csid_pxl_hcrop_addr;
 	uint32_t csid_pxl_vcrop_addr;
 	uint32_t csid_pxl_rst_strobes_addr;
 	uint32_t csid_pxl_status_addr;
 	uint32_t csid_pxl_misr_val_addr;
-	uint32_t csid_pxl_format_measure_cfg0_addr;
-	uint32_t csid_pxl_format_measure_cfg1_addr;
-	uint32_t csid_pxl_format_measure0_addr;
-	uint32_t csid_pxl_format_measure1_addr;
-	uint32_t csid_pxl_format_measure2_addr;
 	uint32_t csid_pxl_timestamp_curr0_sof_addr;
 	uint32_t csid_pxl_timestamp_curr1_sof_addr;
 	uint32_t csid_pxl_timestamp_perv0_sof_addr;
@@ -149,19 +128,21 @@ struct cam_tfe_csid_pxl_reg_offset {
 	uint32_t csid_pxl_timestamp_curr1_eof_addr;
 	uint32_t csid_pxl_timestamp_perv0_eof_addr;
 	uint32_t csid_pxl_timestamp_perv1_eof_addr;
-	uint32_t csid_pxl_ppp_sparse_pd_ext_cfg0;
 	uint32_t csid_pxl_err_recovery_cfg0_addr;
 	uint32_t csid_pxl_err_recovery_cfg1_addr;
 	uint32_t csid_pxl_err_recovery_cfg2_addr;
 	uint32_t csid_pxl_multi_vcdt_cfg0_addr;
+	uint32_t csid_pxl_format_measure_cfg0_addr;
+	uint32_t csid_pxl_format_measure_cfg1_addr;
+	uint32_t csid_pxl_format_measure0_addr;
+	uint32_t csid_pxl_format_measure1_addr;
+	uint32_t csid_pxl_format_measure2_addr;
 
 	/* configuration */
 	uint32_t pix_store_en_shift_val;
 	uint32_t early_eof_en_shift_val;
 	uint32_t halt_master_sel_shift;
 	uint32_t halt_mode_shift;
-	uint32_t halt_mode_mask;
-	uint32_t halt_cmd_shift;
 	uint32_t halt_master_sel_master_val;
 	uint32_t halt_master_sel_slave_val;
 	uint32_t binning_supported;
@@ -170,7 +151,6 @@ struct cam_tfe_csid_pxl_reg_offset {
 	uint32_t format_measure_en_shift_val;
 	uint32_t measure_en_hbi_vbi_cnt_val;
 	bool     is_multi_vc_dt_supported;
-	uint32_t cgc_mode_en_shift_val;
 };
 
 struct cam_tfe_csid_rdi_reg_offset {
@@ -183,21 +163,10 @@ struct cam_tfe_csid_rdi_reg_offset {
 	uint32_t csid_rdi_cfg0_addr;
 	uint32_t csid_rdi_cfg1_addr;
 	uint32_t csid_rdi_ctrl_addr;
-	uint32_t csid_rdi_frame_drop_pattern;
-	uint32_t csid_rdi_frame_drop_period;
-	uint32_t csid_rdi_irq_subsample_pattern;
-	uint32_t csid_rdi_irq_subsample_period;
 	uint32_t csid_rdi_rst_strobes_addr;
 	uint32_t csid_rdi_status_addr;
 	uint32_t csid_rdi_misr_val0_addr;
 	uint32_t csid_rdi_misr_val1_addr;
-	uint32_t csid_rdi_misr_val2_addr;
-	uint32_t csid_rdi_misr_val3_addr;
-	uint32_t csid_rdi_format_measure_cfg0_addr;
-	uint32_t csid_rdi_format_measure_cfg1_addr;
-	uint32_t csid_rdi_format_measure0_addr;
-	uint32_t csid_rdi_format_measure1_addr;
-	uint32_t csid_rdi_format_measure2_addr;
 	uint32_t csid_rdi_timestamp_curr0_sof_addr;
 	uint32_t csid_rdi_timestamp_curr1_sof_addr;
 	uint32_t csid_rdi_timestamp_prev0_sof_addr;
@@ -212,13 +181,17 @@ struct cam_tfe_csid_rdi_reg_offset {
 	uint32_t csid_rdi_byte_cntr_ping_addr;
 	uint32_t csid_rdi_byte_cntr_pong_addr;
 	uint32_t csid_rdi_multi_vcdt_cfg0_addr;
+	uint32_t csid_rdi_format_measure_cfg0_addr;
+	uint32_t csid_rdi_format_measure_cfg1_addr;
+	uint32_t csid_rdi_format_measure0_addr;
+	uint32_t csid_rdi_format_measure1_addr;
+	uint32_t csid_rdi_format_measure2_addr;
 
 	/* configuration */
 	uint32_t packing_format;
 	uint32_t format_measure_en_shift_val;
 	uint32_t measure_en_hbi_vbi_cnt_val;
 	bool     is_multi_vc_dt_supported;
-	uint32_t cgc_mode_en_shift_val;
 };
 
 struct cam_tfe_csid_csi2_rx_reg_offset {
@@ -250,7 +223,6 @@ struct cam_tfe_csid_csi2_rx_reg_offset {
 	uint32_t csi2_irq_mask_all;
 	uint32_t csi2_misr_enable_shift_val;
 	uint32_t csi2_vc_mode_shift_val;
-	uint32_t csi2_rx_epd_mode_shift_en;
 	uint32_t csi2_capture_long_pkt_en_shift;
 	uint32_t csi2_capture_short_pkt_en_shift;
 	uint32_t csi2_capture_cphy_pkt_en_shift;
@@ -263,7 +235,6 @@ struct cam_tfe_csid_csi2_rx_reg_offset {
 	uint32_t csi2_rx_long_pkt_hdr_rst_stb_shift;
 	uint32_t csi2_rx_short_pkt_hdr_rst_stb_shift;
 	uint32_t csi2_rx_cphy_pkt_hdr_rst_stb_shift;
-	bool     need_to_sel_tpg_mux;
 };
 
 struct cam_tfe_csid_common_reg_offset {
@@ -286,12 +257,10 @@ struct cam_tfe_csid_common_reg_offset {
 	uint32_t version_incr;
 	uint32_t num_rdis;
 	uint32_t num_pix;
-	uint32_t num_ppp;
 	uint32_t csid_reg_rst_stb;
 	uint32_t csid_rst_stb;
 	uint32_t csid_rst_stb_sw_all;
 	uint32_t ipp_path_rst_stb_all;
-	uint32_t ppp_path_rst_stb_all;
 	uint32_t rdi_path_rst_stb_all;
 	uint32_t path_rst_done_shift_val;
 	uint32_t path_en_shift_val;
@@ -307,7 +276,6 @@ struct cam_tfe_csid_common_reg_offset {
 	uint32_t crop_h_en_shift_val;
 	uint32_t crop_shift;
 	uint32_t ipp_irq_mask_all;
-	uint32_t ppp_irq_mask_all;
 	uint32_t rdi_irq_mask_all;
 	uint32_t top_tfe2_pix_pipe_fuse_reg;
 	uint32_t top_tfe2_fuse_reg;
@@ -315,7 +283,6 @@ struct cam_tfe_csid_common_reg_offset {
 	uint32_t format_measure_height_mask_val;
 	uint32_t format_measure_width_mask_val;
 	bool     format_measure_support;
-	bool     sync_clk;
 };
 
 /**
@@ -331,37 +298,9 @@ struct cam_tfe_csid_reg_offset {
 	const struct cam_tfe_csid_common_reg_offset   *cmn_reg;
 	const struct cam_tfe_csid_csi2_rx_reg_offset  *csi2_reg;
 	const struct cam_tfe_csid_pxl_reg_offset      *ipp_reg;
-	const struct cam_tfe_csid_pxl_reg_offset      *ppp_reg;
 	const struct cam_tfe_csid_rdi_reg_offset *rdi_reg[CAM_TFE_CSID_RDI_MAX];
 };
 
-/**
- * struct cam_tfe_csid_secure_info: Contains all relevant info to be
- *                                  programmed for targets supporting
- *                                  this feature
- * @phy_sel:          Intermediate value for this mask. CSID passes
- *                    phy_sel.This variable's position at the top is to
- *                    be left unchanged, to have it be used correctly
- *                    in the cam_subdev_notify_message callback for
- *                    csiphy
- * @lane_cfg:         This value is similar to lane_assign in the PHY
- *                    driver, and is used to identify the particular
- *                    PHY instance with which this IFE session is
- *                    connected to.
- * @vc_mask:          Virtual channel masks (Unused for mobile usecase)
- * @csid_hw_idx_mask: Bit position denoting CSID(s) in use for secure
- *                    session
- * @cdm_hw_idx_mask:  Bit position denoting CDM in use for secure
- *                    session
- */
-struct cam_tfe_csid_secure_info {
-	uint32_t phy_sel;
-	uint32_t lane_cfg;
-	uint64_t vc_mask;
-	uint32_t csid_hw_idx_mask;
-	uint32_t cdm_hw_idx_mask;
-};
-
 /**
  * struct cam_tfe_csid_hw_info- CSID HW info
  *
@@ -378,11 +317,10 @@ struct cam_tfe_csid_hw_info {
 
 /**
  * struct cam_tfe_csid_csi2_rx_cfg- csid csi2 rx configuration data
- * @phy_sel:          input resource type for sensor only
- * @lane_type:        lane type: c-phy or d-phy
- * @lane_num :        active lane number
- * @lane_cfg:         lane configurations: 4 bits per lane
- * @epd_supported:    Flag to check if epd supported
+ * @phy_sel:     input resource type for sensor only
+ * @lane_type:   lane type: c-phy or d-phy
+ * @lane_num :   active lane number
+ * @lane_cfg:    lane configurations: 4 bits per lane
  *
  */
 struct cam_tfe_csid_csi2_rx_cfg  {
@@ -390,7 +328,6 @@ struct cam_tfe_csid_csi2_rx_cfg  {
 	uint32_t                        lane_type;
 	uint32_t                        lane_num;
 	uint32_t                        lane_cfg;
-	uint32_t                        epd_supported;
 };
 
 /**
@@ -455,8 +392,7 @@ struct cam_tfe_csid_cid_data {
  *                      one more frame than pix.
  * @res_sof_cnt         path resource sof count value. it used for initial
  *                      frame drop
- * @is_shdr_master      flag to indicate path to be shdr master
- * @is_shdr             flag to indicate if shdr mode is enabled
+ *
  */
 struct cam_tfe_csid_path_cfg {
 	struct vc_dt_data               vc_dt[CAM_ISP_TFE_VC_DT_CFG];
@@ -484,8 +420,6 @@ struct cam_tfe_csid_path_cfg {
 	uint32_t                        usage_type;
 	uint32_t                        init_frame_drop;
 	uint32_t                        res_sof_cnt;
-	bool                            is_shdr_master;
-	bool                            is_shdr;
 };
 
 /**
@@ -516,14 +450,13 @@ struct cam_csid_evt_payload {
  * @in_res_id:                csid in resource type
  * @csi2_rx_cfg:              csi2 rx decoder configuration for csid
  * @csi2_rx_reserve_cnt:      csi2 reservations count value
- * pxl_pipe_enable:           flag to specify if the hardware has IPP
  * @ipp_res:                  image pixel path resource
- * @ppp_res:                  PD pixel path resource
  * @rdi_res:                  raw dump image path resources
  * @cid_res:                  cid resources values
  * @csid_top_reset_complete:  csid top reset completion
  * @csid_csi2_reset_complete: csi2 reset completion
  * @csid_ipp_reset_complete:  ipp reset completion
+ * @csid_ppp_complete:        ppp reset completion
  * @csid_rdin_reset_complete: rdi n completion
  * @csid_debug:               csid debug information to enable the SOT, EOT,
  *                            SOF, EOF, measure etc in the csid hw
@@ -544,8 +477,6 @@ struct cam_csid_evt_payload {
  *                            or not
  * @prev_boot_timestamp       previous frame bootime stamp
  * @prev_qtimer_ts            previous frame qtimer csid timestamp
- * @sync_clk                  sync clocks such that freq(TFE)>freq(CSID)>freq(CSIPHY)
- * @is_secure                 Flag to denote secure operation
  *
  */
 struct cam_tfe_csid_hw {
@@ -560,13 +491,11 @@ struct cam_tfe_csid_hw {
 	uint32_t                            csi2_reserve_cnt;
 	uint32_t                            pxl_pipe_enable;
 	struct cam_isp_resource_node        ipp_res;
-	struct cam_isp_resource_node        ppp_res;
 	struct cam_isp_resource_node        rdi_res[CAM_TFE_CSID_RDI_MAX];
 	struct cam_tfe_csid_cid_data        cid_res[CAM_TFE_CSID_CID_MAX];
 	struct completion                   csid_top_complete;
 	struct completion                   csid_csi2_complete;
 	struct completion                   csid_ipp_complete;
-	struct completion                   csid_ppp_complete;
 	struct completion     csid_rdin_complete[CAM_TFE_CSID_RDI_MAX];
 	uint64_t                            csid_debug;
 	uint64_t                            clk_rate;
@@ -582,8 +511,6 @@ struct cam_tfe_csid_hw {
 	bool                                ppi_enable;
 	uint64_t                            prev_boot_timestamp;
 	uint64_t                            prev_qtimer_ts;
-	bool                                sync_clk;
-	bool                                is_secure;
 };
 
 int cam_tfe_csid_hw_probe_init(struct cam_hw_intf  *csid_hw_intf,

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_dev.c

@@ -1,19 +1,16 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/slab.h>
 #include <linux/mod_devicetable.h>
 #include <linux/of_device.h>
-#include <dt-bindings/msm-camera.h>
 #include "cam_tfe_csid_core.h"
 #include "cam_tfe_csid_dev.h"
 #include "cam_tfe_csid_hw_intf.h"
 #include "cam_debug_util.h"
 #include "camera_main.h"
-#include "cam_cpas_api.h"
 
 static struct cam_hw_intf *cam_tfe_csid_hw_list[CAM_TFE_CSID_HW_NUM_MAX] = {
 	0, 0, 0};
@@ -27,25 +24,12 @@ static int cam_tfe_csid_component_bind(struct device *dev,
 	struct cam_tfe_csid_hw         *csid_dev = NULL;
 	const struct of_device_id      *match_dev = NULL;
 	struct cam_tfe_csid_hw_info    *csid_hw_data = NULL;
-	uint32_t                        csid_dev_idx = 0;
+	uint32_t                        csid_dev_idx;
 	int                             rc = 0;
 	struct platform_device *pdev = to_platform_device(dev);
 
 	CAM_DBG(CAM_ISP, "probe called");
 
-	/* get tfe csid hw index */
-	rc = of_property_read_u32(pdev->dev.of_node, "cell-index", &csid_dev_idx);
-	if (rc) {
-		CAM_ERR(CAM_ISP, "Failed to read cell-index of TFE CSID HW, rc: %d", rc);
-		goto err;
-	}
-
-	if (!cam_cpas_is_feature_supported(CAM_CPAS_ISP_FUSE, BIT(csid_dev_idx), NULL) ||
-		!cam_cpas_is_feature_supported(CAM_CPAS_ISP_LITE_FUSE, BIT(csid_dev_idx), NULL)) {
-		CAM_DBG(CAM_ISP, "CSID[%d] not supported based on fuse", csid_dev_idx);
-		goto err;
-	}
-
 	csid_hw_intf = kzalloc(sizeof(*csid_hw_intf), GFP_KERNEL);
 	if (!csid_hw_intf) {
 		rc = -ENOMEM;
@@ -64,6 +48,8 @@ static int cam_tfe_csid_component_bind(struct device *dev,
 		goto free_hw_info;
 	}
 
+	/* get tfe csid hw index */
+	of_property_read_u32(pdev->dev.of_node, "cell-index", &csid_dev_idx);
 	/* get tfe csid hw information */
 	match_dev = of_match_device(pdev->dev.driver->of_match_table,
 		&pdev->dev);
@@ -121,12 +107,6 @@ void cam_tfe_csid_component_unbind(struct device *dev,
 	struct platform_device *pdev = to_platform_device(dev);
 
 	csid_dev = (struct cam_tfe_csid_hw *)platform_get_drvdata(pdev);
-
-	if (!csid_dev) {
-		CAM_ERR(CAM_ISP, "Error No data in csid_dev");
-		return;
-	}
-
 	csid_hw_intf = csid_dev->hw_intf;
 	csid_hw_info = csid_dev->hw_info;
 

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_soc.c

@@ -24,6 +24,7 @@ int cam_tfe_csid_init_soc_resources(struct cam_hw_soc_info *soc_info,
 
 	soc_info->soc_private = soc_private;
 
+
 	rc = cam_soc_util_get_dt_properties(soc_info);
 	if (rc < 0)
 		return rc;
@@ -31,10 +32,6 @@ int cam_tfe_csid_init_soc_resources(struct cam_hw_soc_info *soc_info,
 	for (i = 0; i < soc_info->irq_count; i++)
 		irq_data[i] = data;
 
-	soc_private->is_tfe_csid_lite = false;
-	if (strnstr(soc_info->compatible, "lite", strlen(soc_info->compatible)) != NULL)
-		soc_private->is_tfe_csid_lite = true;
-
 	/* Need to see if we want post process the clock list */
 	rc = cam_soc_util_request_platform_resource(soc_info, csid_irq_handler, &(irq_data[0]));
 	if (rc < 0) {

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_soc.h

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_TFE_CSID_SOC_H_
@@ -17,11 +16,9 @@
  * @cpas_handle:             Handle returned on registering with CPAS driver.
  *                           This handle is used for all further interface
  *                           with CPAS.
- * @is_tfe_csid_lite:        Flag to indicate if it is CSID lite HW
  */
 struct cam_tfe_csid_soc_private {
 	uint32_t cpas_handle;
-	bool     is_tfe_csid_lite;
 };
 
 /**

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe.c

@@ -1,16 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
 #include "cam_tfe530.h"
 #include "cam_tfe640.h"
-#include "cam_tfe640_210.h"
-#include "cam_tfe770.h"
-#include "cam_tfe_lite770.h"
-#include "cam_tfe665.h"
 #include "cam_tfe_hw_intf.h"
 #include "cam_tfe_core.h"
 #include "cam_tfe_dev.h"
@@ -25,22 +20,6 @@ static const struct of_device_id cam_tfe_dt_match[] = {
 		.compatible = "qcom,tfe640",
 		.data = &cam_tfe640,
 	},
-	{
-		.compatible = "qcom,tfe640_210",
-		.data = &cam_tfe640_210,
-	},
-	{
-		.compatible = "qcom,tfe770",
-		.data = &cam_tfe770,
-	},
-	{
-		.compatible = "qcom,tfe-lite770",
-		.data = &cam_tfe_lite770,
-	},
-	{
-		.compatible = "qcom,tfe665",
-		.data = &cam_tfe665,
-	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, cam_tfe_dt_match);

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe530.h

@@ -18,7 +18,7 @@ static struct cam_tfe_top_reg_offset_common  tfe530_top_commong_reg  = {
 	.stats_feature                          = 0x0000100C,
 	.zoom_feature                           = 0x00001010,
 	.global_reset_cmd                       = 0x00001014,
-	.core_cgc_ctrl_0                        = 0x00001018,
+	.core_cgc_ctrl                          = 0x00001018,
 	.ahb_cgc_ctrl                           = 0x0000101C,
 	.core_cfg_0                             = 0x00001024,
 	.core_cfg_1                             = 0x00001028,
@@ -53,24 +53,6 @@ static struct cam_tfe_top_reg_offset_common  tfe530_top_commong_reg  = {
 	.diag_neq_hbi_shift                     = 14,
 	.diag_sensor_hbi_mask                   = 0x3FFF,
 	.serializer_supported                   = false,
-	.pp_camif_violation_bit                 = BIT(0),
-	.pp_violation_bit                       = BIT(1),
-	.rdi0_camif_violation_bit               = BIT(2),
-	.rdi1_camif_violation_bit               = BIT(3),
-	.rdi2_camif_violation_bit               = BIT(4),
-	.diag_violation_bit                     = BIT(5),
-	.pp_frame_drop_bit                      = BIT(8),
-	.rdi0_frame_drop_bit                    = BIT(9),
-	.rdi1_frame_drop_bit                    = BIT(10),
-	.rdi2_frame_drop_bit                    = BIT(11),
-	.pp_overflow_bit                        = BIT(16),
-	.rdi0_overflow_bit                      = BIT(17),
-	.rdi1_overflow_bit                      = BIT(18),
-	.rdi2_overflow_bit                      = BIT(19),
-	.mup_shift_val                          = 0,
-	.mup_supported                          = false,
-	.height_shift                           = 16,
-	.epoch_shift_val                        = 16,
 };
 
 static struct cam_tfe_camif_reg  tfe530_camif_reg = {
@@ -238,6 +220,7 @@ static struct cam_tfe_rdi_reg_data tfe530_rdi2_reg_data = {
 	.enable_diagnostic_hw        = 0x1,
 	.diag_sensor_sel             = 0x3,
 	.diag_sensor_shift           = 0x1,
+
 };
 
 static struct cam_tfe_clc_hw_status  tfe530_clc_hw_info[CAM_TFE_MAX_CLC] = {
@@ -876,8 +859,6 @@ static struct cam_tfe_bus_hw_info  tfe530_bus_hw_info = {
 	.max_bw_counter_limit  = 0xFF,
 	.counter_limit_shift   = 1,
 	.counter_limit_mask    = 0xF,
-	.mode_cfg_shift = 16,
-	.height_shift = 16,
 };
 
 struct cam_tfe_hw_info cam_tfe530 = {

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe640.h

@@ -18,7 +18,7 @@ static struct cam_tfe_top_reg_offset_common  tfe640_top_commong_reg  = {
 	.stats_feature                          = 0x0000180C,
 	.zoom_feature                           = 0x00001810,
 	.global_reset_cmd                       = 0x00001814,
-	.core_cgc_ctrl_0                        = 0x00001818,
+	.core_cgc_ctrl                          = 0x00001818,
 	.ahb_cgc_ctrl                           = 0x0000181C,
 	.core_cfg_0                             = 0x00001824,
 	.reg_update_cmd                         = 0x0000182C,
@@ -66,24 +66,6 @@ static struct cam_tfe_top_reg_offset_common  tfe640_top_commong_reg  = {
 	.diag_neq_hbi_shift                     = 14,
 	.diag_sensor_hbi_mask                   = 0x3FFF,
 	.serializer_supported                   = true,
-	.pp_camif_violation_bit                 = BIT(0),
-	.pp_violation_bit                       = BIT(1),
-	.rdi0_camif_violation_bit               = BIT(2),
-	.rdi1_camif_violation_bit               = BIT(3),
-	.rdi2_camif_violation_bit               = BIT(4),
-	.diag_violation_bit                     = BIT(5),
-	.pp_frame_drop_bit                      = BIT(8),
-	.rdi0_frame_drop_bit                    = BIT(9),
-	.rdi1_frame_drop_bit                    = BIT(10),
-	.rdi2_frame_drop_bit                    = BIT(11),
-	.pp_overflow_bit                        = BIT(16),
-	.rdi0_overflow_bit                      = BIT(17),
-	.rdi1_overflow_bit                      = BIT(18),
-	.rdi2_overflow_bit                      = BIT(19),
-	.mup_shift_val                          = 0,
-	.mup_supported                          = false,
-	.height_shift                           = 16,
-	.epoch_shift_val                        = 16,
 };
 
 static struct cam_tfe_camif_reg  tfe640_camif_reg = {
@@ -253,6 +235,7 @@ static struct cam_tfe_rdi_reg_data tfe640_rdi2_reg_data = {
 	.enable_diagnostic_hw        = 0x1,
 	.diag_sensor_sel             = 0x3,
 	.diag_sensor_shift           = 0x1,
+
 };
 
 static struct cam_tfe_clc_hw_status  tfe640_clc_hw_info[CAM_TFE_MAX_CLC] = {
@@ -1192,8 +1175,6 @@ static struct cam_tfe_bus_hw_info  tfe640_bus_hw_info = {
 	.max_bw_counter_limit  = 0xFF,
 	.counter_limit_shift   = 1,
 	.counter_limit_mask    = 0xF,
-	.mode_cfg_shift = 16,
-	.height_shift = 16,
 };
 
 struct cam_tfe_hw_info cam_tfe640 = {

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe640_210.h

@@ -1,79 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-
-#ifndef _CAM_TFE640_210_H_
-#define _CAM_TFE640_210_H_
-#include "cam_tfe_core.h"
-#include "cam_tfe_bus.h"
-#include "cam_tfe640.h"
-
-struct cam_tfe_hw_info cam_tfe640_210 = {
-	.top_irq_mask = {
-		0x00001834,
-		0x00001838,
-		0x0000183C,
-	},
-	.top_irq_clear = {
-		0x00001840,
-		0x00001844,
-		0x00001848,
-	},
-	.top_irq_status = {
-		0x0000184C,
-		0x00001850,
-		0x00001854,
-	},
-	.top_irq_cmd                       = 0x00001830,
-	.global_clear_bitmask              = 0x00000001,
-	.bus_irq_mask = {
-		0x00003018,
-		0x0000301C,
-	},
-	.bus_irq_clear = {
-		0x00003020,
-		0x00003024,
-	},
-	.bus_irq_status = {
-		0x00003028,
-		0x0000302C,
-	},
-	.bus_irq_cmd = 0x00003030,
-	.bus_violation_reg = 0x00003064,
-	.bus_overflow_reg = 0x00003068,
-	.bus_image_size_vilation_reg = 0x3070,
-	.bus_overflow_clear_cmd = 0x3060,
-	.debug_status_top = 0x30D8,
-
-	.reset_irq_mask = {
-		0x00000001,
-		0x00000000,
-		0x00000000,
-	},
-	.error_irq_mask = {
-		0x000F0F00,
-		0x00000000,
-		0x0000003F,
-	},
-	.bus_reg_irq_mask = {
-		0x00000002,
-		0x00000000,
-	},
-	.bus_error_irq_mask = {
-		0xC0000000,
-		0x00000000,
-	},
-
-	.num_clc = 39,
-	.clc_hw_status_info            = tfe640_clc_hw_info,
-	.bus_version                   = CAM_TFE_BUS_1_0,
-	.bus_hw_info                   = &tfe640_bus_hw_info,
-
-	.top_version                   = CAM_TFE_TOP_1_0,
-	.top_hw_info                   = &tfe640_top_hw_info,
-};
-
-#endif /* _CAM_TFE640_210_H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe665.h

@@ -1,1476 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-
-#ifndef _CAM_TFE665_H_
-#define _CAM_TFE665_H_
-#include <media/cam_isp_tfe.h>
-#include "cam_tfe_core.h"
-#include "cam_tfe_bus.h"
-
-
-static struct cam_tfe_top_reg_offset_common  tfe665_top_commong_reg  = {
-	.hw_version                             = 0x00001800,
-	.hw_capability                          = 0x00001804,
-	.lens_feature                           = 0x00001808,
-	.stats_feature                          = 0x0000180C,
-	.zoom_feature                           = 0x00001810,
-	.global_reset_cmd                       = 0x00001814,
-	.core_cgc_ctrl_0                        = 0x00001818,
-	.core_cgc_ctrl_1                        = 0x0000181C,
-	.ahb_cgc_ctrl                           = 0x0000181C,
-	.core_cfg_0                             = 0x00001824,
-	.reg_update_cmd                         = 0x0000182C,
-	.diag_config                            = 0x00001860,
-	.diag_sensor_status_0                   = 0x00001864,
-	.diag_sensor_status_1                   = 0x00001868,
-	.diag_sensor_frame_cnt_status           = 0x0000186C,
-	.violation_status                       = 0x00001870,
-	.stats_throttle_cnt_cfg_0               = 0x00001874,
-	.stats_throttle_cnt_cfg_1               = 0x00001878,
-	.num_debug_reg                          = 12,
-	.debug_reg = {
-		0x000018A0,
-		0x000018A4,
-		0x000018A8,
-		0x000018AC,
-		0x000018B0,
-		0x000018B4,
-		0x000018B8,
-		0x000018BC,
-		0x000018C0,
-		0x000018C4,
-		0x000018C8,
-		0x000018CC,
-	},
-	.debug_cfg                              = 0x000018DC,
-	.num_perf_cfg                           = 2,
-	.perf_cfg = {
-		{
-			.perf_cnt_cfg           = 0x000018E0,
-			.perf_pixel_count       = 0x000018E4,
-			.perf_line_count        = 0x000018E8,
-			.perf_stall_count       = 0x000018EC,
-			.perf_always_count      = 0x000018F0,
-			.perf_count_status      = 0x000018F4,
-		},
-		{
-			.perf_cnt_cfg           = 0x000018F8,
-			.perf_pixel_count       = 0x000018FC,
-			.perf_line_count        = 0x00001900,
-			.perf_stall_count       = 0x00001904,
-			.perf_always_count      = 0x00001908,
-			.perf_count_status      = 0x0000190C,
-		},
-	},
-	.diag_sensor_frame_cnt_status_1         = 0x00001920,
-	.diag_min_hbi_error_shift               = 15,
-	.diag_neq_hbi_shift                     = 14,
-	.diag_sensor_hbi_mask                   = 0x3FFF,
-	.serializer_supported                   = true,
-	.pp_camif_violation_bit                 = BIT(0),
-	.pp_violation_bit                       = BIT(1),
-	.rdi0_camif_violation_bit               = BIT(2),
-	.rdi1_camif_violation_bit               = BIT(3),
-	.rdi2_camif_violation_bit               = BIT(4),
-	.diag_violation_bit                     = BIT(5),
-	.ppp_camif_violation_bit                = BIT(6),
-	.ppp_violation_bit                      = BIT(7),
-	.lcr_pd_timing_protocol_violation_bit   = BIT(8),
-	.dyamanic_switch_violation_bit          = BIT(9),
-	.pp_frame_drop_bit                      = BIT(8),
-	.rdi0_frame_drop_bit                    = BIT(9),
-	.rdi1_frame_drop_bit                    = BIT(10),
-	.rdi2_frame_drop_bit                    = BIT(11),
-	.ppp_frame_drop_bit                     = BIT(12),
-	.pp_overflow_bit                        = BIT(16),
-	.rdi0_overflow_bit                      = BIT(17),
-	.rdi1_overflow_bit                      = BIT(18),
-	.rdi2_overflow_bit                      = BIT(19),
-	.ppp_overflow_bit                       = BIT(20),
-	.out_of_sync_frame_drop_bit             = BIT(21),
-	.mup_shift_val                          = 8,
-	.mup_supported                          = true,
-	.height_shift                           = 16,
-	.epoch_shift_val                        = 16,
-};
-
-static struct cam_tfe_camif_reg  tfe665_camif_reg = {
-	.hw_version                   = 0x00001C00,
-	.hw_status                    = 0x00001C04,
-	.module_cfg                   = 0x00001C60,
-	.pdaf_raw_crop_width_cfg      = 0x00001C68,
-	.pdaf_raw_crop_height_cfg     = 0x00001C6C,
-	.line_skip_pattern            = 0x00001C70,
-	.pixel_skip_pattern           = 0x00001C74,
-	.period_cfg                   = 0x00001C78,
-	.irq_subsample_pattern        = 0x00001C7C,
-	.epoch_irq_cfg                = 0x00001C80,
-	.debug_1                      = 0x00001DF0,
-	.debug_0                      = 0x00001DF4,
-	.test_bus_ctrl                = 0x00001DF8,
-	.spare                        = 0x00001DFC,
-	.reg_update_cmd               = 0x0000182C,
-};
-
-static struct cam_tfe_camif_reg_data tfe665_camif_reg_data = {
-	.extern_reg_update_mask       = 0x00000001,
-	.dual_tfe_pix_en_shift        = 0x00000001,
-	.extern_reg_update_shift      = 0x0,
-	.dual_tfe_sync_sel_shift      = 18,
-	.delay_line_en_shift          = 8,
-	.pixel_pattern_shift          = 24,
-	.pixel_pattern_mask           = 0x7000000,
-	.module_enable_shift          = 0,
-	.pix_out_enable_shift         = 8,
-	.pdaf_output_enable_shift     = 9,
-	.dsp_mode_shift               = 0,
-	.dsp_mode_mask                = 0,
-	.dsp_en_shift                 = 0,
-	.dsp_en_mask                  = 0,
-	.reg_update_cmd_data          = 0x1,
-	.epoch_line_cfg               = 0x00140014,
-	.sof_irq_mask                 = 0x00000001,
-	.epoch0_irq_mask              = 0x00000004,
-	.epoch1_irq_mask              = 0x00000008,
-	.eof_irq_mask                 = 0x00000002,
-	.reg_update_irq_mask          = 0x00000001,
-	.error_irq_mask0              = 0x00210100,
-	.error_irq_mask2              = 0x00000223,
-	.subscribe_irq_mask           = {
-		0x00000000,
-		0x00000007,
-		0x00000000,
-	},
-	.enable_diagnostic_hw         = 0x1,
-	.perf_cnt_start_cmd_shift     = 0,
-	.perf_cnt_continuous_shift    = 2,
-	.perf_client_sel_shift        = 8,
-	.perf_window_start_shift      = 16,
-	.perf_window_end_shift        = 20,
-	.ai_c_srl_en_shift            = 11,
-	.ds16_c_srl_en_shift          = 10,
-	.ds4_c_srl_en_shift           = 9,
-	.shdr_mode_shift              = 21,
-	.extern_mup_shift             = 22,
-};
-
-static struct cam_tfe_rdi_reg  tfe665_rdi0_reg = {
-	.rdi_hw_version              = 0x00001E00,
-	.rdi_hw_status               = 0x00001E04,
-	.rdi_module_config           = 0x00001E60,
-	.rdi_skip_period             = 0x00001E68,
-	.rdi_irq_subsample_pattern   = 0x00001E6C,
-	.rdi_epoch_irq               = 0x00001E70,
-	.rdi_debug_1                 = 0x00001FF0,
-	.rdi_debug_0                 = 0x00001FF4,
-	.rdi_test_bus_ctrl           = 0x00001FF8,
-	.rdi_spare                   = 0x00001FFC,
-	.reg_update_cmd              = 0x0000182C,
-};
-
-static struct cam_tfe_rdi_reg_data tfe665_rdi0_reg_data = {
-	.reg_update_cmd_data         = 0x2,
-	.epoch_line_cfg              = 0x00140014,
-	.pixel_pattern_shift         = 24,
-	.pixel_pattern_mask          = 0x07000000,
-	.rdi_out_enable_shift        = 0,
-
-	.sof_irq_mask                = 0x00000010,
-	.epoch0_irq_mask             = 0x00000040,
-	.epoch1_irq_mask             = 0x00000080,
-	.eof_irq_mask                = 0x00000020,
-	.error_irq_mask0             = 0x00020200,
-	.error_irq_mask2             = 0x00000004,
-	.subscribe_irq_mask          = {
-		0x00000000,
-		0x00000030,
-		0x00000000,
-	},
-	.enable_diagnostic_hw        = 0x1,
-	.diag_sensor_sel             = 0x1,
-	.diag_sensor_shift           = 0x1,
-};
-
-static struct cam_tfe_rdi_reg  tfe665_rdi1_reg = {
-	.rdi_hw_version              = 0x00002000,
-	.rdi_hw_status               = 0x00002004,
-	.rdi_module_config           = 0x00002060,
-	.rdi_skip_period             = 0x00002068,
-	.rdi_irq_subsample_pattern   = 0x0000206C,
-	.rdi_epoch_irq               = 0x00002070,
-	.rdi_debug_1                 = 0x000021F0,
-	.rdi_debug_0                 = 0x000021F4,
-	.rdi_test_bus_ctrl           = 0x000021F8,
-	.rdi_spare                   = 0x000021FC,
-	.reg_update_cmd              = 0x0000182C,
-};
-
-static struct cam_tfe_rdi_reg_data tfe665_rdi1_reg_data = {
-	.reg_update_cmd_data         = 0x4,
-	.epoch_line_cfg              = 0x00140014,
-	.pixel_pattern_shift         = 24,
-	.pixel_pattern_mask          = 0x07000000,
-	.rdi_out_enable_shift        = 0,
-
-	.sof_irq_mask                = 0x00000100,
-	.epoch0_irq_mask             = 0x00000400,
-	.epoch1_irq_mask             = 0x00000800,
-	.eof_irq_mask                = 0x00000200,
-	.error_irq_mask0             = 0x00040400,
-	.error_irq_mask2             = 0x00000008,
-	.subscribe_irq_mask          = {
-		0x00000000,
-		0x00000300,
-		0x00000000,
-	},
-	.enable_diagnostic_hw        = 0x1,
-	.diag_sensor_sel             = 0x2,
-	.diag_sensor_shift           = 0x1,
-};
-
-static struct cam_tfe_rdi_reg  tfe665_rdi2_reg = {
-	.rdi_hw_version              = 0x00002200,
-	.rdi_hw_status               = 0x00002204,
-	.rdi_module_config           = 0x00002260,
-	.rdi_skip_period             = 0x00002268,
-	.rdi_irq_subsample_pattern   = 0x0000226C,
-	.rdi_epoch_irq               = 0x00002270,
-	.rdi_debug_1                 = 0x000023F0,
-	.rdi_debug_0                 = 0x000023F4,
-	.rdi_test_bus_ctrl           = 0x000023F8,
-	.rdi_spare                   = 0x000023FC,
-	.reg_update_cmd              = 0x0000182C,
-};
-
-static struct cam_tfe_rdi_reg_data tfe665_rdi2_reg_data = {
-	.reg_update_cmd_data         = 0x8,
-	.epoch_line_cfg              = 0x00140014,
-	.pixel_pattern_shift         = 24,
-	.pixel_pattern_mask          = 0x07000000,
-	.rdi_out_enable_shift        = 0,
-
-	.sof_irq_mask                = 0x00001000,
-	.epoch0_irq_mask             = 0x00004000,
-	.epoch1_irq_mask             = 0x00008000,
-	.eof_irq_mask                = 0x00002000,
-	.error_irq_mask0             = 0x00080800,
-	.error_irq_mask2             = 0x00000004,
-	.subscribe_irq_mask          = {
-		0x00000000,
-		0x00003000,
-		0x00000000,
-	},
-	.enable_diagnostic_hw        = 0x1,
-	.diag_sensor_sel             = 0x3,
-	.diag_sensor_shift           = 0x1,
-
-};
-
-static struct cam_tfe_ppp_reg  tfe665_ppp_reg = {
-	.ppp_hw_version              = 0x00002400,
-	.ppp_hw_status               = 0x00002404,
-	.ppp_module_config           = 0x00002460,
-	.ppp_skip_period             = 0x00002468,
-	.ppp_irq_subsample_pattern   = 0x0000246C,
-	.ppp_epoch_irq               = 0x00002470,
-	.ppp_debug_1                 = 0x000025F0,
-	.ppp_debug_0                 = 0x000025F4,
-	.ppp_test_bus_ctrl           = 0x000025F8,
-	.ppp_spare                   = 0x000025FC,
-	.reg_update_cmd              = 0x0000182C,
-};
-
-static struct cam_tfe_ppp_reg_data tfe665_ppp_reg_data = {
-	.sof_irq_mask                = 0x00000000,
-	.epoch0_irq_mask             = 0x00000000,
-	.epoch1_irq_mask             = 0x00000000,
-	.eof_irq_mask                = 0x00000000,
-	.subscribe_irq_mask          = {
-		0x00000000,
-		0x00000000,
-		0x00000000,
-	},
-	.enable_diagnostic_hw        = 0x1,
-	.diag_sensor_sel             = 0x4,
-	.diag_sensor_shift           = 0x1,
-	.pdaf_path_en_shift          = 24,
-	.lcr_dis_en_shift            = 23,
-};
-
-static struct cam_tfe_clc_hw_status  tfe665_clc_hw_info[CAM_TFE_MAX_CLC] = {
-	{
-		.name = "CLC_CAMIF",
-		.hw_status_reg = 0x1C04,
-	},
-	{
-		.name = "CLC_RDI0_CAMIF",
-		.hw_status_reg = 0x1E04,
-	},
-	{
-		.name = "CLC_RDI1_CAMIF",
-		.hw_status_reg = 0x2004,
-	},
-	{
-		.name = "CLC_RDI2_CAMIF",
-		.hw_status_reg = 0x2204,
-	},
-	{
-		.name = "CLC_PD_CAMIF",
-		.hw_status_reg = 0x2404,
-	},
-	{
-		.name = "CLC_PDAF_LITE",
-		.hw_status_reg = 0x2A04,
-	},
-	{
-		.name = "CLC_CHANNEL_GAIN",
-		.hw_status_reg = 0x6004,
-	},
-	{
-		.name = "CLC_BPC_PDPC",
-		.hw_status_reg = 0x6204,
-	},
-	{
-		.name = "CLC_LCS",
-		.hw_status_reg = 0x6404,
-	},
-	{
-		.name = "CLC_SHARED_LB",
-		.hw_status_reg = 0x6604,
-	},
-	{
-		.name = "CLC_WB_BDS",
-		.hw_status_reg = 0x6804,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_POST_BDS",
-		.hw_status_reg = 0x6A04,
-	},
-	{
-		.name = "CLC_BLS",
-		.hw_status_reg = 0x6C04,
-	},
-	{
-		.name = "CLC_BAYER_GLUT",
-		.hw_status_reg = 0x6E04,
-	},
-	{
-		.name = "CLC_BAYER_DS4",
-		.hw_status_reg = 0x7004,
-	},
-	{
-		.name = "CLC_COLOR_XFORM_DS4",
-		.hw_status_reg = 0x7204,
-	},
-	{
-		.name = "CLC_CHROMA_DS2",
-		.hw_status_reg = 0x7404,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_Y_DS4",
-		.hw_status_reg = 0x7604,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_C_DS4",
-		.hw_status_reg = 0x7804,
-	},
-	{
-		.name = "CLC_R2PD_DS4",
-		.hw_status_reg = 0x7A04,
-	},
-	{
-		.name = "CLC_DOWNSCALE_4TO1_Y",
-		.hw_status_reg = 0x7C04,
-	},
-	{
-		.name = "CLC_DOWNSCALE_4TO1_C",
-		.hw_status_reg = 0x7E04,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_Y_DS16",
-		.hw_status_reg = 0x8004,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_C_DS16",
-		.hw_status_reg = 0x8204,
-	},
-	{
-		.name = "CLC_R2PD_DS16",
-		.hw_status_reg = 0x8404,
-	},
-	{
-		.name = "CLC_WB_GAIN",
-		.hw_status_reg = 0x8604,
-	},
-	{
-		.name = "CLC_BAYER_DS2",
-		.hw_status_reg = 0x8804,
-	},
-	{
-		.name = "CLC_GTM",
-		.hw_status_reg = 0x8A04,
-	},
-	{
-		.name = "CLC_COLOR_XFORM_AI_DS",
-		.hw_status_reg = 0x8C04,
-	},
-	{
-		.name = "CLC_DOWNSCALE_MN_Y",
-		.hw_status_reg = 0x8E04,
-	},
-	{
-		.name = "CLC_DOWNSCALE_MN_C",
-		.hw_status_reg = 0x9004,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_Y_AI_DS",
-		.hw_status_reg = 0x9204,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_C_AI_DS",
-		.hw_status_reg = 0x9404,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_IDEAL_RAW",
-		.hw_status_reg = 0x9604,
-	},
-	{
-		.name = "CLC_ABF",
-		.hw_status_reg = 0x9804,
-	},
-	{
-		.name = "CLC_STATS_BG",
-		.hw_status_reg = 0x9A04,
-	},
-	{
-		.name = "CLC_STATS_BHIST",
-		.hw_status_reg = 0x9C04,
-	},
-	{
-		.name = "CLC_STATS_AWB_BG",
-		.hw_status_reg = 0x9E04,
-	},
-	{
-		.name = "CLC_STATS_AEC_BG",
-		.hw_status_reg = 0xA004,
-	},
-	{
-		.name = "CLC_STATS_BAF",
-		.hw_status_reg = 0xA204,
-	},
-	{
-		.name = "CLC_STATS_RS",
-		.hw_status_reg = 0xA404,
-	},
-};
-
-static struct  cam_tfe_top_hw_info tfe665_top_hw_info = {
-	.common_reg = &tfe665_top_commong_reg,
-	.camif_hw_info = {
-		.camif_reg = &tfe665_camif_reg,
-		.reg_data  = &tfe665_camif_reg_data,
-	},
-	.rdi_hw_info  = {
-		{
-			.rdi_reg  = &tfe665_rdi0_reg,
-			.reg_data = &tfe665_rdi0_reg_data,
-		},
-		{
-			.rdi_reg  = &tfe665_rdi1_reg,
-			.reg_data = &tfe665_rdi1_reg_data,
-		},
-		{
-			.rdi_reg  = &tfe665_rdi2_reg,
-			.reg_data = &tfe665_rdi2_reg_data,
-		},
-	},
-	.ppp_hw_info = {
-		.ppp_reg = &tfe665_ppp_reg,
-		.reg_data  = &tfe665_ppp_reg_data,
-	},
-	.in_port = {
-		CAM_TFE_CAMIF_VER_1_0,
-		CAM_TFE_RDI_VER_1_0,
-		CAM_TFE_RDI_VER_1_0,
-		CAM_TFE_RDI_VER_1_0,
-		CAM_TFE_PDLIB_VER_1_0
-	},
-	.reg_dump_data  = {
-		.num_reg_dump_entries    = 19,
-		.num_lut_dump_entries    = 0,
-		.bus_start_addr          = 0x2000,
-		.bus_write_top_end_addr  = 0x2120,
-		.bus_client_start_addr   = 0x2200,
-		.bus_client_offset       = 0x100,
-		.num_bus_clients         = 10,
-		.reg_entry = {
-			{
-				.start_offset = 0x1000,
-				.end_offset   = 0x10F4,
-			},
-			{
-				.start_offset = 0x1260,
-				.end_offset   = 0x1280,
-			},
-			{
-				.start_offset = 0x13F0,
-				.end_offset   = 0x13FC,
-			},
-			{
-				.start_offset = 0x1460,
-				.end_offset   = 0x1470,
-			},
-			{
-				.start_offset = 0x15F0,
-				.end_offset   = 0x15FC,
-			},
-			{
-				.start_offset = 0x1660,
-				.end_offset   = 0x1670,
-			},
-			{
-				.start_offset = 0x17F0,
-				.end_offset   = 0x17FC,
-			},
-			{
-				.start_offset = 0x1860,
-				.end_offset   = 0x1870,
-			},
-			{
-				.start_offset = 0x19F0,
-				.end_offset   = 0x19FC,
-			},
-			{
-				.start_offset = 0x2660,
-				.end_offset   = 0x2694,
-			},
-			{
-				.start_offset = 0x2860,
-				.end_offset   = 0x2884,
-			},
-			{
-				.start_offset = 0x2A60,
-				.end_offset   = 0X2B34,
-			},
-			{
-				.start_offset = 0x2C60,
-				.end_offset   = 0X2C80,
-			},
-			{
-				.start_offset = 0x2E60,
-				.end_offset   = 0X2E7C,
-			},
-			{
-				.start_offset = 0x3060,
-				.end_offset   = 0X3110,
-			},
-			{
-				.start_offset = 0x3260,
-				.end_offset   = 0X3278,
-			},
-			{
-				.start_offset = 0x3460,
-				.end_offset   = 0X3478,
-			},
-			{
-				.start_offset = 0x3660,
-				.end_offset   = 0X3684,
-			},
-			{
-				.start_offset = 0x3860,
-				.end_offset   = 0X3884,
-			},
-		},
-		.lut_entry = {
-			{
-				.lut_word_size = 1,
-				.lut_bank_sel  = 0x40,
-				.lut_addr_size = 180,
-				.dmi_reg_offset = 0x2800,
-			},
-			{
-				.lut_word_size = 1,
-				.lut_bank_sel  = 0x41,
-				.lut_addr_size = 180,
-				.dmi_reg_offset = 0x3000,
-			},
-		},
-	},
-	.num_path_port_map = 3,
-	.path_port_map = {
-		{CAM_ISP_HW_TFE_IN_PDLIB, CAM_ISP_TFE_OUT_RES_PD_LCR_STATS},
-		{CAM_ISP_HW_TFE_IN_PDLIB, CAM_ISP_TFE_OUT_RES_PD_PREPROCESSED},
-		{CAM_ISP_HW_TFE_IN_PDLIB, CAM_ISP_TFE_OUT_RES_PD_PARSED},
-	},
-};
-
-static struct cam_tfe_bus_hw_info  tfe665_bus_hw_info = {
-	.common_reg = {
-		.hw_version  = 0x00003000,
-		.cgc_ovd     = 0x00003008,
-		.comp_cfg_0  = 0x0000300C,
-		.comp_cfg_1  = 0x00003010,
-		.frameheader_cfg  = {
-			0x00003034,
-			0x00003038,
-			0x0000303C,
-			0x00003040,
-		},
-		.pwr_iso_cfg = 0x0000305C,
-		.overflow_status_clear = 0x00003060,
-		.ccif_violation_status = 0x00003064,
-		.overflow_status       = 0x00003068,
-		.image_size_violation_status = 0x00003070,
-		.perf_count_cfg = {
-			0x00003074,
-			0x00003078,
-			0x0000307C,
-			0x00003080,
-			0x00003084,
-			0x00003088,
-			0x0000308C,
-			0x00003090,
-		},
-		.perf_count_val = {
-			0x00003094,
-			0x00003098,
-			0x0000309C,
-			0x000030A0,
-			0x000030A4,
-			0x000030A8,
-			0x000030AC,
-			0x000030B0,
-		},
-		.perf_count_status = 0x000030B4,
-		.debug_status_top_cfg = 0x000030D4,
-		.debug_status_top = 0x000030D8,
-		.test_bus_ctrl = 0x000030DC,
-		.irq_mask = {
-			0x00003018,
-			0x0000301C,
-		},
-		.irq_clear = {
-			0x00003020,
-			0x00003024,
-		},
-		.irq_status = {
-			0x00003028,
-			0x0000302C,
-		},
-		.irq_cmd = 0x00003030,
-		.cons_violation_shift = 28,
-		.violation_shift  = 30,
-		.image_size_violation = 31,
-	},
-	.num_client = 19,
-	.bus_client_reg = {
-		/* BUS Client 0 BAYER */
-		{
-			.cfg                   = 0x00003200,
-			.image_addr            = 0x00003204,
-			.frame_incr            = 0x00003208,
-			.image_cfg_0           = 0x0000320C,
-			.image_cfg_1           = 0x00003210,
-			.image_cfg_2           = 0x00003214,
-			.packer_cfg            = 0x00003218,
-			.bw_limit              = 0x0000321C,
-			.frame_header_addr     = 0x00003220,
-			.frame_header_incr     = 0x00003224,
-			.frame_header_cfg      = 0x00003228,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003230,
-			.irq_subsample_pattern = 0x00003234,
-			.framedrop_period      = 0x00003238,
-			.framedrop_pattern     = 0x0000323C,
-			.system_cache_cfg      = 0x00003260,
-			.addr_status_0         = 0x00003268,
-			.addr_status_1         = 0x0000326C,
-			.addr_status_2         = 0x00003270,
-			.addr_status_3         = 0x00003274,
-			.debug_status_cfg      = 0x00003278,
-			.debug_status_0        = 0x0000327C,
-			.debug_status_1        = 0x00003280,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_0,
-			.client_name           = "BAYER",
-		},
-		/* BUS Client 1 IDEAL RAW*/
-		{
-			.cfg                   = 0x00003300,
-			.image_addr            = 0x00003304,
-			.frame_incr            = 0x00003308,
-			.image_cfg_0           = 0x0000330C,
-			.image_cfg_1           = 0x00003310,
-			.image_cfg_2           = 0x00003314,
-			.packer_cfg            = 0x00003318,
-			.bw_limit              = 0x0000331C,
-			.frame_header_addr     = 0x00003320,
-			.frame_header_incr     = 0x00003324,
-			.frame_header_cfg      = 0x00003328,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003330,
-			.irq_subsample_pattern = 0x00003334,
-			.framedrop_period      = 0x00003338,
-			.framedrop_pattern     = 0x0000333C,
-			.system_cache_cfg      = 0x00003360,
-			.addr_status_0         = 0x00003368,
-			.addr_status_1         = 0x0000336C,
-			.addr_status_2         = 0x00003370,
-			.addr_status_3         = 0x00003374,
-			.debug_status_cfg      = 0x00003378,
-			.debug_status_0        = 0x0000337C,
-			.debug_status_1        = 0x00003380,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_1,
-			.client_name           = "IDEAL_RAW",
-		},
-		/* BUS Client 2 Stats BE Tintless */
-		{
-			.cfg                   = 0x00003400,
-			.image_addr            = 0x00003404,
-			.frame_incr            = 0x00003408,
-			.image_cfg_0           = 0x0000340C,
-			.image_cfg_1           = 0x00003410,
-			.image_cfg_2           = 0x00003414,
-			.packer_cfg            = 0x00003418,
-			.bw_limit              = 0x0000341C,
-			.frame_header_addr     = 0x00003420,
-			.frame_header_incr     = 0x00003424,
-			.frame_header_cfg      = 0x00003428,
-			.line_done_cfg         = 0x00003400,
-			.irq_subsample_period  = 0x00003430,
-			.irq_subsample_pattern = 0x00003434,
-			.framedrop_period      = 0x00003438,
-			.framedrop_pattern     = 0x0000343C,
-			.system_cache_cfg      = 0x00003460,
-			.addr_status_0         = 0x00003468,
-			.addr_status_1         = 0x0000346C,
-			.addr_status_2         = 0x00003470,
-			.addr_status_3         = 0x00003474,
-			.debug_status_cfg      = 0x00003478,
-			.debug_status_0        = 0x0000347C,
-			.debug_status_1        = 0x00003480,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_2,
-			.client_name           = "STATS BE TINTLESS",
-		},
-		/* BUS Client 3 Stats Bhist */
-		{
-			.cfg                   = 0x00003500,
-			.image_addr            = 0x00003504,
-			.frame_incr            = 0x00003508,
-			.image_cfg_0           = 0x0000350C,
-			.image_cfg_1           = 0x00003510,
-			.image_cfg_2           = 0x00003514,
-			.packer_cfg            = 0x00003518,
-			.bw_limit              = 0x0000351C,
-			.frame_header_addr     = 0x00003520,
-			.frame_header_incr     = 0x00003524,
-			.frame_header_cfg      = 0x00003528,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003530,
-			.irq_subsample_pattern = 0x00003534,
-			.framedrop_period      = 0x00003538,
-			.framedrop_pattern     = 0x0000353C,
-			.system_cache_cfg      = 0x00003560,
-			.addr_status_0         = 0x00003568,
-			.addr_status_1         = 0x0000356C,
-			.addr_status_2         = 0x00003570,
-			.addr_status_3         = 0x00003574,
-			.debug_status_cfg      = 0x00003578,
-			.debug_status_0        = 0x0000357C,
-			.debug_status_1        = 0x00003580,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_2,
-			.client_name           = "STATS BHIST",
-		},
-		/* BUS Client 4 Stats AWB BG */
-		{
-			.cfg                   = 0x00003600,
-			.image_addr            = 0x00003604,
-			.frame_incr            = 0x00003608,
-			.image_cfg_0           = 0x0000360C,
-			.image_cfg_1           = 0x00003610,
-			.image_cfg_2           = 0x00003614,
-			.packer_cfg            = 0x00003618,
-			.bw_limit              = 0x0000361C,
-			.frame_header_addr     = 0x00003620,
-			.frame_header_incr     = 0x00003624,
-			.frame_header_cfg      = 0x00003628,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003630,
-			.irq_subsample_pattern = 0x00003634,
-			.framedrop_period      = 0x00003638,
-			.framedrop_pattern     = 0x0000363C,
-			.system_cache_cfg      = 0x00003660,
-			.addr_status_0         = 0x00003668,
-			.addr_status_1         = 0x0000366C,
-			.addr_status_2         = 0x00003670,
-			.addr_status_3         = 0x00003674,
-			.debug_status_cfg      = 0x00003678,
-			.debug_status_0        = 0x0000367C,
-			.debug_status_1        = 0x00003680,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_3,
-			.client_name           = "STATS AWB BG",
-		},
-		/* BUS Client 5 Stats AEC BG */
-		{
-			.cfg                   = 0x00003700,
-			.image_addr            = 0x00003704,
-			.frame_incr            = 0x00003708,
-			.image_cfg_0           = 0x0000370C,
-			.image_cfg_1           = 0x00003710,
-			.image_cfg_2           = 0x00003714,
-			.packer_cfg            = 0x00003718,
-			.bw_limit              = 0x0000371C,
-			.frame_header_addr     = 0x00003720,
-			.frame_header_incr     = 0x00003724,
-			.frame_header_cfg      = 0x00003728,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003730,
-			.irq_subsample_pattern = 0x00003734,
-			.framedrop_period      = 0x00003738,
-			.framedrop_pattern     = 0x0000373C,
-			.system_cache_cfg      = 0x00003760,
-			.addr_status_0         = 0x00003768,
-			.addr_status_1         = 0x0000376C,
-			.addr_status_2         = 0x00003770,
-			.addr_status_3         = 0x00003774,
-			.debug_status_cfg      = 0x00003778,
-			.debug_status_0        = 0x0000377C,
-			.debug_status_1        = 0x00003780,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_3,
-			.client_name           = "STATS AEC BG",
-		},
-		/* BUS Client 6 Stats BAF */
-		{
-			.cfg                   = 0x00003800,
-			.image_addr            = 0x00003804,
-			.frame_incr            = 0x00003808,
-			.image_cfg_0           = 0x0000380C,
-			.image_cfg_1           = 0x00003810,
-			.image_cfg_2           = 0x00003814,
-			.packer_cfg            = 0x00003818,
-			.bw_limit              = 0x0000381C,
-			.frame_header_addr     = 0x00003820,
-			.frame_header_incr     = 0x00003824,
-			.frame_header_cfg      = 0x00003828,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003830,
-			.irq_subsample_pattern = 0x00003834,
-			.framedrop_period      = 0x00003838,
-			.framedrop_pattern     = 0x0000383C,
-			.system_cache_cfg      = 0x00003860,
-			.addr_status_0         = 0x00003868,
-			.addr_status_1         = 0x0000386C,
-			.addr_status_2         = 0x00003870,
-			.addr_status_3         = 0x00003874,
-			.debug_status_cfg      = 0x00003878,
-			.debug_status_0        = 0x0000387C,
-			.debug_status_1        = 0x00003880,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_4,
-			.client_name           = "STATS BAF",
-		},
-		/* BUS Client 7 RDI0 */
-		{
-			.cfg                   = 0x00003900,
-			.image_addr            = 0x00003904,
-			.frame_incr            = 0x00003908,
-			.image_cfg_0           = 0x0000390C,
-			.image_cfg_1           = 0x00003910,
-			.image_cfg_2           = 0x00003914,
-			.packer_cfg            = 0x00003918,
-			.bw_limit              = 0x0000391C,
-			.frame_header_addr     = 0x00003920,
-			.frame_header_incr     = 0x00003924,
-			.frame_header_cfg      = 0x00003928,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003930,
-			.irq_subsample_pattern = 0x00003934,
-			.framedrop_period      = 0x00003938,
-			.framedrop_pattern     = 0x0000393C,
-			.system_cache_cfg      = 0x00003960,
-			.addr_status_0         = 0x00003968,
-			.addr_status_1         = 0x0000396C,
-			.addr_status_2         = 0x00003970,
-			.addr_status_3         = 0x00003974,
-			.debug_status_cfg      = 0x00003978,
-			.debug_status_0        = 0x0000397C,
-			.debug_status_1        = 0x00003980,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_5,
-			.client_name           = "RDI0",
-		},
-		/* BUS Client 8 RDI1 */
-		{
-			.cfg                   = 0x00003A00,
-			.image_addr            = 0x00003A04,
-			.frame_incr            = 0x00003A08,
-			.image_cfg_0           = 0x00003A0C,
-			.image_cfg_1           = 0x00003A10,
-			.image_cfg_2           = 0x00003A14,
-			.packer_cfg            = 0x00003A18,
-			.bw_limit              = 0x00003A1C,
-			.frame_header_addr     = 0x00003A20,
-			.frame_header_incr     = 0x00003A24,
-			.frame_header_cfg      = 0x00003A28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003A30,
-			.irq_subsample_pattern = 0x00003A34,
-			.framedrop_period      = 0x00003A38,
-			.framedrop_pattern     = 0x00003A3C,
-			.system_cache_cfg      = 0x00003A60,
-			.addr_status_0         = 0x00003A68,
-			.addr_status_1         = 0x00003A6C,
-			.addr_status_2         = 0x00003A70,
-			.addr_status_3         = 0x00003A74,
-			.debug_status_cfg      = 0x00003A78,
-			.debug_status_0        = 0x00003A7C,
-			.debug_status_1        = 0x00003A80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_6,
-			.client_name           = "RDI1",
-		},
-		/* BUS Client 9 RDI2 */
-		{
-			.cfg                   = 0x00003B00,
-			.image_addr            = 0x00003B04,
-			.frame_incr            = 0x00003B08,
-			.image_cfg_0           = 0x00003B0C,
-			.image_cfg_1           = 0x00003B10,
-			.image_cfg_2           = 0x00003B14,
-			.packer_cfg            = 0x00003B18,
-			.bw_limit              = 0x00003B1C,
-			.frame_header_addr     = 0x00003B20,
-			.frame_header_incr     = 0x00003B24,
-			.frame_header_cfg      = 0x00003B28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003B30,
-			.irq_subsample_pattern = 0x00003B34,
-			.framedrop_period      = 0x00003B38,
-			.framedrop_pattern     = 0x00003B3C,
-			.system_cache_cfg      = 0x00003B60,
-			.addr_status_0         = 0x00003B68,
-			.addr_status_1         = 0x00003B6C,
-			.addr_status_2         = 0x00003B70,
-			.addr_status_3         = 0x00003B74,
-			.debug_status_cfg      = 0x00003B78,
-			.debug_status_0        = 0x00003B7C,
-			.debug_status_1        = 0x00003B80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_7,
-			.client_name           = "RDI2",
-		},
-		/* BUS Client 10 PDAF */
-		{
-			.cfg                   = 0x00003C00,
-			.image_addr            = 0x00003C04,
-			.frame_incr            = 0x00003C08,
-			.image_cfg_0           = 0x00003C0C,
-			.image_cfg_1           = 0x00003C10,
-			.image_cfg_2           = 0x00003C14,
-			.packer_cfg            = 0x00003C18,
-			.bw_limit              = 0x00003C1C,
-			.frame_header_addr     = 0x00003C20,
-			.frame_header_incr     = 0x00003C24,
-			.frame_header_cfg      = 0x00003C28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003C30,
-			.irq_subsample_pattern = 0x00003C34,
-			.framedrop_period      = 0x00003C38,
-			.framedrop_pattern     = 0x00003C3C,
-			.system_cache_cfg      = 0x00003C60,
-			.addr_status_0         = 0x00003C68,
-			.addr_status_1         = 0x00003C6C,
-			.addr_status_2         = 0x00003C70,
-			.addr_status_3         = 0x00003C74,
-			.debug_status_cfg      = 0x00003C78,
-			.debug_status_0        = 0x00003C7C,
-			.debug_status_1        = 0x00003C80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_8,
-			.client_name           = "PDAF",
-		},
-		/* BUS Client 11 DS4 */
-		{
-			.cfg                   = 0x00003D00,
-			.image_addr            = 0x00003D04,
-			.frame_incr            = 0x00003D08,
-			.image_cfg_0           = 0x00003D0C,
-			.image_cfg_1           = 0x00003D10,
-			.image_cfg_2           = 0x00003D14,
-			.packer_cfg            = 0x00003D18,
-			.bw_limit              = 0x00003D1C,
-			.frame_header_addr     = 0x00003D20,
-			.frame_header_incr     = 0x00003D24,
-			.frame_header_cfg      = 0x00003D28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003D30,
-			.irq_subsample_pattern = 0x00003D34,
-			.framedrop_period      = 0x00003D38,
-			.framedrop_pattern     = 0x00003D3C,
-			.system_cache_cfg      = 0x00003D60,
-			.addr_status_0         = 0x00003D68,
-			.addr_status_1         = 0x00003D6C,
-			.addr_status_2         = 0x00003D70,
-			.addr_status_3         = 0x00003D74,
-			.debug_status_cfg      = 0x00003D78,
-			.debug_status_0        = 0x00003D7C,
-			.debug_status_1        = 0x00003D80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_0,
-			.client_name           = "DS4",
-		},
-		/* BUS Client 12 DS16 */
-		{
-			.cfg                   = 0x00003E00,
-			.image_addr            = 0x00003E04,
-			.frame_incr            = 0x00003E08,
-			.image_cfg_0           = 0x00003E0C,
-			.image_cfg_1           = 0x00003E10,
-			.image_cfg_2           = 0x00003E14,
-			.packer_cfg            = 0x00003E18,
-			.bw_limit              = 0x00003E1C,
-			.frame_header_addr     = 0x00003E20,
-			.frame_header_incr     = 0x00003E24,
-			.frame_header_cfg      = 0x00003E28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003E30,
-			.irq_subsample_pattern = 0x00003E34,
-			.framedrop_period      = 0x00003E38,
-			.framedrop_pattern     = 0x00003E3C,
-			.system_cache_cfg      = 0x00003E60,
-			.addr_status_0         = 0x00003E68,
-			.addr_status_1         = 0x00003E6C,
-			.addr_status_2         = 0x00003E70,
-			.addr_status_3         = 0x00003E74,
-			.debug_status_cfg      = 0x00003E78,
-			.debug_status_0        = 0x00003E7C,
-			.debug_status_1        = 0x00003E80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_0,
-			.client_name           = "DS16",
-		},
-		/* BUS Client 13 AI-Y */
-		{
-			.cfg                   = 0x00003F00,
-			.image_addr            = 0x00003F04,
-			.frame_incr            = 0x00003F08,
-			.image_cfg_0           = 0x00003F0C,
-			.image_cfg_1           = 0x00003F10,
-			.image_cfg_2           = 0x00003F14,
-			.packer_cfg            = 0x00003F18,
-			.bw_limit              = 0x00003F1C,
-			.frame_header_addr     = 0x00003F20,
-			.frame_header_incr     = 0x00003F24,
-			.frame_header_cfg      = 0x00003F28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003F30,
-			.irq_subsample_pattern = 0x00003F34,
-			.framedrop_period      = 0x00003F38,
-			.framedrop_pattern     = 0x00003F3C,
-			.system_cache_cfg      = 0x00003F60,
-			.addr_status_0         = 0x00003F68,
-			.addr_status_1         = 0x00003F6C,
-			.addr_status_2         = 0x00003F70,
-			.addr_status_3         = 0x00003F74,
-			.debug_status_cfg      = 0x00003F78,
-			.debug_status_0        = 0x00003F7C,
-			.debug_status_1        = 0x00003F80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_9,
-			.client_name           = "AI-Y",
-		},
-		/* BUS Client 14 AI-C */
-		{
-			.cfg                   = 0x00004000,
-			.image_addr            = 0x00004004,
-			.frame_incr            = 0x00004008,
-			.image_cfg_0           = 0x0000400C,
-			.image_cfg_1           = 0x00004010,
-			.image_cfg_2           = 0x00004014,
-			.packer_cfg            = 0x00004018,
-			.bw_limit              = 0x0000401C,
-			.frame_header_addr     = 0x00004020,
-			.frame_header_incr     = 0x00004024,
-			.frame_header_cfg      = 0x00004028,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00004030,
-			.irq_subsample_pattern = 0x00004034,
-			.framedrop_period      = 0x00004038,
-			.framedrop_pattern     = 0x0000403C,
-			.system_cache_cfg      = 0x00004060,
-			.addr_status_0         = 0x00004068,
-			.addr_status_1         = 0x0000406C,
-			.addr_status_2         = 0x00004070,
-			.addr_status_3         = 0x00004074,
-			.debug_status_cfg      = 0x00004078,
-			.debug_status_0        = 0x0000407C,
-			.debug_status_1        = 0x00004080,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_9,
-			.client_name           = "AI-C",
-		},
-		/* BUS Client 15 Stats RS */
-		{
-			.cfg                   = 0x00004100,
-			.image_addr            = 0x00004104,
-			.frame_incr            = 0x00004108,
-			.image_cfg_0           = 0x0000410C,
-			.image_cfg_1           = 0x00004110,
-			.image_cfg_2           = 0x00004114,
-			.packer_cfg            = 0x00004118,
-			.bw_limit              = 0x0000411C,
-			.frame_header_addr     = 0x00004120,
-			.frame_header_incr     = 0x00004124,
-			.frame_header_cfg      = 0x00004128,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00004130,
-			.irq_subsample_pattern = 0x00004134,
-			.framedrop_period      = 0x00004138,
-			.framedrop_pattern     = 0x0000413C,
-			.system_cache_cfg      = 0x00004160,
-			.addr_status_0         = 0x00004168,
-			.addr_status_1         = 0x0000416C,
-			.addr_status_2         = 0x00004170,
-			.addr_status_3         = 0x00004174,
-			.debug_status_cfg      = 0x00004178,
-			.debug_status_0        = 0x0000417C,
-			.debug_status_1        = 0x00004180,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_10,
-			.client_name           = "STATS RS",
-		},
-		/* BUS Client 16 PDAF 0 STAT LCR */
-		{
-			.cfg                   = 0x00004200,
-			.image_addr            = 0x00004204,
-			.frame_incr            = 0x00004208,
-			.image_cfg_0           = 0x0000420C,
-			.image_cfg_1           = 0x00004210,
-			.image_cfg_2           = 0x00004214,
-			.packer_cfg            = 0x00004218,
-			.bw_limit              = 0x0000421C,
-			.frame_header_addr     = 0x00004220,
-			.frame_header_incr     = 0x00004224,
-			.frame_header_cfg      = 0x00004228,
-			.line_done_cfg         = 0x0000422C,
-			.irq_subsample_period  = 0x00004230,
-			.irq_subsample_pattern = 0x00004234,
-			.framedrop_period      = 0x00004238,
-			.framedrop_pattern     = 0x0000423C,
-			.system_cache_cfg      = 0x00004260,
-			.addr_status_0         = 0x00004268,
-			.addr_status_1         = 0x0000426C,
-			.addr_status_2         = 0x00004270,
-			.addr_status_3         = 0x00004274,
-			.debug_status_cfg      = 0x00004278,
-			.debug_status_0        = 0x0000427C,
-			.debug_status_1        = 0x00004280,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_11,
-			.client_name           = "STAT LCR",
-		},
-		/* BUS Client 17 PDAF 1 PD PREPROCESSED*/
-		{
-			.cfg                   = 0x00004300,
-			.image_addr            = 0x00004304,
-			.frame_incr            = 0x00004308,
-			.image_cfg_0           = 0x0000430C,
-			.image_cfg_1           = 0x00004310,
-			.image_cfg_2           = 0x00004314,
-			.packer_cfg            = 0x00004318,
-			.bw_limit              = 0x0000431C,
-			.frame_header_addr     = 0x00004320,
-			.frame_header_incr     = 0x00004324,
-			.frame_header_cfg      = 0x00004328,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00004330,
-			.irq_subsample_pattern = 0x00004334,
-			.framedrop_period      = 0x00004338,
-			.framedrop_pattern     = 0x0000433C,
-			.system_cache_cfg      = 0x00004360,
-			.addr_status_0         = 0x00004368,
-			.addr_status_1         = 0x0000436C,
-			.addr_status_2         = 0x00004370,
-			.addr_status_3         = 0x00004374,
-			.debug_status_cfg      = 0x00004378,
-			.debug_status_0        = 0x0000437C,
-			.debug_status_1        = 0x00004380,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_11,
-			.client_name           = "PD PREPROCESSED",
-		},
-		/* BUS Client 18 PDAF 2 PD PARSED*/
-		{
-			.cfg                   = 0x00004400,
-			.image_addr            = 0x00004404,
-			.frame_incr            = 0x00004408,
-			.image_cfg_0           = 0x0000440C,
-			.image_cfg_1           = 0x00004410,
-			.image_cfg_2           = 0x00004414,
-			.packer_cfg            = 0x00004418,
-			.bw_limit              = 0x0000441C,
-			.frame_header_addr     = 0x00004420,
-			.frame_header_incr     = 0x00004424,
-			.frame_header_cfg      = 0x00004428,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00004430,
-			.irq_subsample_pattern = 0x00004434,
-			.framedrop_period      = 0x00004438,
-			.framedrop_pattern     = 0x0000443C,
-			.system_cache_cfg      = 0x00004460,
-			.addr_status_0         = 0x00004468,
-			.addr_status_1         = 0x0000446C,
-			.addr_status_2         = 0x00004470,
-			.addr_status_3         = 0x00004474,
-			.debug_status_cfg      = 0x00004478,
-			.debug_status_0        = 0x0000447C,
-			.debug_status_1        = 0x00004480,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_11,
-			.client_name           = "PD PARSED",
-		},
-	},
-	.num_out  = 18,
-	.tfe_out_hw_info = {
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_RDI0,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_5,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_1,
-			.mid[0]           = 16,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_RDI1,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_6,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_2,
-			.mid[0]           = 17,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_RDI2,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_7,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_3,
-			.mid[0]           = 18,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_FULL,
-			.max_width        = 4096,
-			.max_height       = 4096,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_0,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 16,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_RAW_DUMP,
-			.max_width        = 4096,
-			.max_height       = 4096,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_1,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 19,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_PDAF,
-			.max_width        = 4096,
-			.max_height       = 4096,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_8,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 26,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_HDR_BE,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_3,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 20,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_HDR_BHIST,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_2,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 18,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_TL_BG,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_2,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 17,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_AWB_BG,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_3,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 19,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_BF,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_4,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 21,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_RS,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_10,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 27,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_DS4,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_0,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 22,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_DS16,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_0,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 23,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_AI,
-			.max_width        = 1920,
-			.max_height       = 1920,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_9,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 24,
-			.mid[1]           = 25,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_PD_LCR_STATS,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_11,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_4,
-			.mid[0]           = 21,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_PD_PREPROCESSED,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_11,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_4,
-			.mid[0]           = 20,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_PD_PARSED,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_11,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_4,
-			.mid[0]           = 22,
-			.pid_mask         = 0x70,
-		},
-	},
-	.num_comp_grp             = 12,
-	.max_wm_per_comp_grp      = 3,
-	.comp_done_shift          = 8,
-	.top_bus_wr_irq_shift     = 1,
-	.comp_buf_done_mask = 0xFFF00,
-	.comp_rup_done_mask = 0xF,
-	.bus_irq_error_mask = {
-		0xD0000000,
-		0x00000000,
-	},
-	.support_consumed_addr = true,
-	.pdaf_rdi2_mux_en = false,
-	.rdi_width = 128,
-	.mode_cfg_shift = 16,
-	.height_shift = 16,
-	.max_out_res = CAM_ISP_TFE_OUT_RES_MAX & 0xFF,
-};
-
-struct cam_tfe_hw_info cam_tfe665 = {
-	.top_irq_mask = {
-		0x00001834,
-		0x00001838,
-		0x0000183C,
-	},
-	.top_irq_clear = {
-		0x00001840,
-		0x00001844,
-		0x00001848,
-	},
-	.top_irq_status = {
-		0x0000184C,
-		0x00001850,
-		0x00001854,
-	},
-	.top_irq_cmd                       = 0x00001830,
-	.global_clear_bitmask              = 0x00000001,
-	.bus_irq_mask = {
-		0x00003018,
-		0x0000301C,
-	},
-	.bus_irq_clear = {
-		0x00003020,
-		0x00003024,
-	},
-	.bus_irq_status = {
-		0x00003028,
-		0x0000302C,
-	},
-	.bus_irq_cmd = 0x00003030,
-	.bus_violation_reg = 0x00003064,
-	.bus_overflow_reg = 0x00003068,
-	.bus_image_size_vilation_reg = 0x3070,
-	.bus_overflow_clear_cmd = 0x3060,
-	.debug_status_top = 0x30D8,
-
-	.reset_irq_mask = {
-		0x00000001,
-		0x00000000,
-		0x00000000,
-	},
-	.error_irq_mask = {
-		0x001F1F00,
-		0x00000000,
-		0x000002FF,
-	},
-	.non_fatal_error_irq_mask = {
-		0x00200000,
-		0x00000000,
-		0x00000000,
-	},
-	.bus_reg_irq_mask = {
-		0x00000002,
-		0x00000000,
-	},
-	.bus_error_irq_mask = {
-		0xC0000000,
-		0x00000000,
-	},
-
-	.num_clc = 39,
-	.clc_hw_status_info            = tfe665_clc_hw_info,
-	.bus_version                   = CAM_TFE_BUS_1_0,
-	.bus_hw_info                   = &tfe665_bus_hw_info,
-
-	.top_version                   = CAM_TFE_TOP_1_0,
-	.top_hw_info                   = &tfe665_top_hw_info,
-};
-
-#endif /* _CAM_TFE665__H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe770.h

@@ -1,1476 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-
-#ifndef _CAM_TFE770_H_
-#define _CAM_TFE770_H_
-#include <media/cam_isp_tfe.h>
-#include "cam_tfe_core.h"
-#include "cam_tfe_bus.h"
-
-
-static struct cam_tfe_top_reg_offset_common  tfe770_top_commong_reg  = {
-	.hw_version                             = 0x00001800,
-	.hw_capability                          = 0x00001804,
-	.lens_feature                           = 0x00001808,
-	.stats_feature                          = 0x0000180C,
-	.zoom_feature                           = 0x00001810,
-	.global_reset_cmd                       = 0x00001814,
-	.core_cgc_ctrl_0                        = 0x00001818,
-	.core_cgc_ctrl_1                        = 0x0000181C,
-	.ahb_cgc_ctrl                           = 0x0000181C,
-	.core_cfg_0                             = 0x00001824,
-	.reg_update_cmd                         = 0x0000182C,
-	.diag_config                            = 0x00001860,
-	.diag_sensor_status_0                   = 0x00001864,
-	.diag_sensor_status_1                   = 0x00001868,
-	.diag_sensor_frame_cnt_status           = 0x0000186C,
-	.violation_status                       = 0x00001870,
-	.stats_throttle_cnt_cfg_0               = 0x00001874,
-	.stats_throttle_cnt_cfg_1               = 0x00001878,
-	.num_debug_reg                          = 12,
-	.debug_reg = {
-		0x000018A0,
-		0x000018A4,
-		0x000018A8,
-		0x000018AC,
-		0x000018B0,
-		0x000018B4,
-		0x000018B8,
-		0x000018BC,
-		0x000018C0,
-		0x000018C4,
-		0x000018C8,
-		0x000018CC,
-	},
-	.debug_cfg                              = 0x000018DC,
-	.num_perf_cfg                           = 2,
-	.perf_cfg = {
-		{
-			.perf_cnt_cfg           = 0x000018E0,
-			.perf_pixel_count       = 0x000018E4,
-			.perf_line_count        = 0x000018E8,
-			.perf_stall_count       = 0x000018EC,
-			.perf_always_count      = 0x000018F0,
-			.perf_count_status      = 0x000018F4,
-		},
-		{
-			.perf_cnt_cfg           = 0x000018F8,
-			.perf_pixel_count       = 0x000018FC,
-			.perf_line_count        = 0x00001900,
-			.perf_stall_count       = 0x00001904,
-			.perf_always_count      = 0x00001908,
-			.perf_count_status      = 0x0000190C,
-		},
-	},
-	.diag_sensor_frame_cnt_status_1         = 0x00001920,
-	.diag_min_hbi_error_shift               = 15,
-	.diag_neq_hbi_shift                     = 14,
-	.diag_sensor_hbi_mask                   = 0x3FFF,
-	.serializer_supported                   = true,
-	.pp_camif_violation_bit                 = BIT(0),
-	.pp_violation_bit                       = BIT(1),
-	.rdi0_camif_violation_bit               = BIT(2),
-	.rdi1_camif_violation_bit               = BIT(3),
-	.rdi2_camif_violation_bit               = BIT(4),
-	.diag_violation_bit                     = BIT(5),
-	.ppp_camif_violation_bit                = BIT(6),
-	.ppp_violation_bit                      = BIT(7),
-	.lcr_pd_timing_protocol_violation_bit   = BIT(8),
-	.dyamanic_switch_violation_bit          = BIT(9),
-	.pp_frame_drop_bit                      = BIT(8),
-	.rdi0_frame_drop_bit                    = BIT(9),
-	.rdi1_frame_drop_bit                    = BIT(10),
-	.rdi2_frame_drop_bit                    = BIT(11),
-	.ppp_frame_drop_bit                     = BIT(12),
-	.pp_overflow_bit                        = BIT(16),
-	.rdi0_overflow_bit                      = BIT(17),
-	.rdi1_overflow_bit                      = BIT(18),
-	.rdi2_overflow_bit                      = BIT(19),
-	.ppp_overflow_bit                       = BIT(20),
-	.out_of_sync_frame_drop_bit             = BIT(21),
-	.mup_shift_val                          = 8,
-	.mup_supported                          = true,
-	.height_shift                           = 16,
-	.epoch_shift_val                        = 16,
-};
-
-static struct cam_tfe_camif_reg  tfe770_camif_reg = {
-	.hw_version                   = 0x00001C00,
-	.hw_status                    = 0x00001C04,
-	.module_cfg                   = 0x00001C60,
-	.pdaf_raw_crop_width_cfg      = 0x00001C68,
-	.pdaf_raw_crop_height_cfg     = 0x00001C6C,
-	.line_skip_pattern            = 0x00001C70,
-	.pixel_skip_pattern           = 0x00001C74,
-	.period_cfg                   = 0x00001C78,
-	.irq_subsample_pattern        = 0x00001C7C,
-	.epoch_irq_cfg                = 0x00001C80,
-	.debug_1                      = 0x00001DF0,
-	.debug_0                      = 0x00001DF4,
-	.test_bus_ctrl                = 0x00001DF8,
-	.spare                        = 0x00001DFC,
-	.reg_update_cmd               = 0x0000182C,
-};
-
-static struct cam_tfe_camif_reg_data tfe770_camif_reg_data = {
-	.extern_reg_update_mask       = 0x00000001,
-	.dual_tfe_pix_en_shift        = 0x00000001,
-	.extern_reg_update_shift      = 0x0,
-	.dual_tfe_sync_sel_shift      = 18,
-	.delay_line_en_shift          = 8,
-	.pixel_pattern_shift          = 24,
-	.pixel_pattern_mask           = 0x7000000,
-	.module_enable_shift          = 0,
-	.pix_out_enable_shift         = 8,
-	.pdaf_output_enable_shift     = 9,
-	.dsp_mode_shift               = 0,
-	.dsp_mode_mask                = 0,
-	.dsp_en_shift                 = 0,
-	.dsp_en_mask                  = 0,
-	.reg_update_cmd_data          = 0x1,
-	.epoch_line_cfg               = 0x00140014,
-	.sof_irq_mask                 = 0x00000001,
-	.epoch0_irq_mask              = 0x00000004,
-	.epoch1_irq_mask              = 0x00000008,
-	.eof_irq_mask                 = 0x00000002,
-	.reg_update_irq_mask          = 0x00000001,
-	.error_irq_mask0              = 0x00210100,
-	.error_irq_mask2              = 0x00000223,
-	.subscribe_irq_mask           = {
-		0x00000000,
-		0x00000007,
-		0x00000000,
-	},
-	.enable_diagnostic_hw         = 0x1,
-	.perf_cnt_start_cmd_shift     = 0,
-	.perf_cnt_continuous_shift    = 2,
-	.perf_client_sel_shift        = 8,
-	.perf_window_start_shift      = 16,
-	.perf_window_end_shift        = 20,
-	.ai_c_srl_en_shift            = 11,
-	.ds16_c_srl_en_shift          = 10,
-	.ds4_c_srl_en_shift           = 9,
-	.shdr_mode_shift              = 21,
-	.extern_mup_shift             = 22,
-};
-
-static struct cam_tfe_rdi_reg  tfe770_rdi0_reg = {
-	.rdi_hw_version              = 0x00001E00,
-	.rdi_hw_status               = 0x00001E04,
-	.rdi_module_config           = 0x00001E60,
-	.rdi_skip_period             = 0x00001E68,
-	.rdi_irq_subsample_pattern   = 0x00001E6C,
-	.rdi_epoch_irq               = 0x00001E70,
-	.rdi_debug_1                 = 0x00001FF0,
-	.rdi_debug_0                 = 0x00001FF4,
-	.rdi_test_bus_ctrl           = 0x00001FF8,
-	.rdi_spare                   = 0x00001FFC,
-	.reg_update_cmd              = 0x0000182C,
-};
-
-static struct cam_tfe_rdi_reg_data tfe770_rdi0_reg_data = {
-	.reg_update_cmd_data         = 0x2,
-	.epoch_line_cfg              = 0x00140014,
-	.pixel_pattern_shift         = 24,
-	.pixel_pattern_mask          = 0x07000000,
-	.rdi_out_enable_shift        = 0,
-
-	.sof_irq_mask                = 0x00000010,
-	.epoch0_irq_mask             = 0x00000040,
-	.epoch1_irq_mask             = 0x00000080,
-	.eof_irq_mask                = 0x00000020,
-	.error_irq_mask0             = 0x00020200,
-	.error_irq_mask2             = 0x00000004,
-	.subscribe_irq_mask          = {
-		0x00000000,
-		0x00000030,
-		0x00000000,
-	},
-	.enable_diagnostic_hw        = 0x1,
-	.diag_sensor_sel             = 0x1,
-	.diag_sensor_shift           = 0x1,
-};
-
-static struct cam_tfe_rdi_reg  tfe770_rdi1_reg = {
-	.rdi_hw_version              = 0x00002000,
-	.rdi_hw_status               = 0x00002004,
-	.rdi_module_config           = 0x00002060,
-	.rdi_skip_period             = 0x00002068,
-	.rdi_irq_subsample_pattern   = 0x0000206C,
-	.rdi_epoch_irq               = 0x00002070,
-	.rdi_debug_1                 = 0x000021F0,
-	.rdi_debug_0                 = 0x000021F4,
-	.rdi_test_bus_ctrl           = 0x000021F8,
-	.rdi_spare                   = 0x000021FC,
-	.reg_update_cmd              = 0x0000182C,
-};
-
-static struct cam_tfe_rdi_reg_data tfe770_rdi1_reg_data = {
-	.reg_update_cmd_data         = 0x4,
-	.epoch_line_cfg              = 0x00140014,
-	.pixel_pattern_shift         = 24,
-	.pixel_pattern_mask          = 0x07000000,
-	.rdi_out_enable_shift        = 0,
-
-	.sof_irq_mask                = 0x00000100,
-	.epoch0_irq_mask             = 0x00000400,
-	.epoch1_irq_mask             = 0x00000800,
-	.eof_irq_mask                = 0x00000200,
-	.error_irq_mask0             = 0x00040400,
-	.error_irq_mask2             = 0x00000008,
-	.subscribe_irq_mask          = {
-		0x00000000,
-		0x00000300,
-		0x00000000,
-	},
-	.enable_diagnostic_hw        = 0x1,
-	.diag_sensor_sel             = 0x2,
-	.diag_sensor_shift           = 0x1,
-};
-
-static struct cam_tfe_rdi_reg  tfe770_rdi2_reg = {
-	.rdi_hw_version              = 0x00002200,
-	.rdi_hw_status               = 0x00002204,
-	.rdi_module_config           = 0x00002260,
-	.rdi_skip_period             = 0x00002268,
-	.rdi_irq_subsample_pattern   = 0x0000226C,
-	.rdi_epoch_irq               = 0x00002270,
-	.rdi_debug_1                 = 0x000023F0,
-	.rdi_debug_0                 = 0x000023F4,
-	.rdi_test_bus_ctrl           = 0x000023F8,
-	.rdi_spare                   = 0x000023FC,
-	.reg_update_cmd              = 0x0000182C,
-};
-
-static struct cam_tfe_rdi_reg_data tfe770_rdi2_reg_data = {
-	.reg_update_cmd_data         = 0x8,
-	.epoch_line_cfg              = 0x00140014,
-	.pixel_pattern_shift         = 24,
-	.pixel_pattern_mask          = 0x07000000,
-	.rdi_out_enable_shift        = 0,
-
-	.sof_irq_mask                = 0x00001000,
-	.epoch0_irq_mask             = 0x00004000,
-	.epoch1_irq_mask             = 0x00008000,
-	.eof_irq_mask                = 0x00002000,
-	.error_irq_mask0             = 0x00080800,
-	.error_irq_mask2             = 0x00000004,
-	.subscribe_irq_mask          = {
-		0x00000000,
-		0x00003000,
-		0x00000000,
-	},
-	.enable_diagnostic_hw        = 0x1,
-	.diag_sensor_sel             = 0x3,
-	.diag_sensor_shift           = 0x1,
-
-};
-
-static struct cam_tfe_ppp_reg  tfe770_ppp_reg = {
-	.ppp_hw_version              = 0x00002400,
-	.ppp_hw_status               = 0x00002404,
-	.ppp_module_config           = 0x00002460,
-	.ppp_skip_period             = 0x00002468,
-	.ppp_irq_subsample_pattern   = 0x0000246C,
-	.ppp_epoch_irq               = 0x00002470,
-	.ppp_debug_1                 = 0x000025F0,
-	.ppp_debug_0                 = 0x000025F4,
-	.ppp_test_bus_ctrl           = 0x000025F8,
-	.ppp_spare                   = 0x000025FC,
-	.reg_update_cmd              = 0x0000182C,
-};
-
-static struct cam_tfe_ppp_reg_data tfe770_ppp_reg_data = {
-	.sof_irq_mask                = 0x00000000,
-	.epoch0_irq_mask             = 0x00000000,
-	.epoch1_irq_mask             = 0x00000000,
-	.eof_irq_mask                = 0x00000000,
-	.subscribe_irq_mask          = {
-		0x00000000,
-		0x00000000,
-		0x00000000,
-	},
-	.enable_diagnostic_hw        = 0x1,
-	.diag_sensor_sel             = 0x4,
-	.diag_sensor_shift           = 0x1,
-	.pdaf_path_en_shift          = 24,
-	.lcr_dis_en_shift            = 23,
-};
-
-static struct cam_tfe_clc_hw_status  tfe770_clc_hw_info[CAM_TFE_MAX_CLC] = {
-	{
-		.name = "CLC_CAMIF",
-		.hw_status_reg = 0x1C04,
-	},
-	{
-		.name = "CLC_RDI0_CAMIF",
-		.hw_status_reg = 0x1E04,
-	},
-	{
-		.name = "CLC_RDI1_CAMIF",
-		.hw_status_reg = 0x2004,
-	},
-	{
-		.name = "CLC_RDI2_CAMIF",
-		.hw_status_reg = 0x2204,
-	},
-	{
-		.name = "CLC_PD_CAMIF",
-		.hw_status_reg = 0x2404,
-	},
-	{
-		.name = "CLC_PDAF_LITE",
-		.hw_status_reg = 0x2A04,
-	},
-	{
-		.name = "CLC_CHANNEL_GAIN",
-		.hw_status_reg = 0x6004,
-	},
-	{
-		.name = "CLC_BPC_PDPC",
-		.hw_status_reg = 0x6204,
-	},
-	{
-		.name = "CLC_LCS",
-		.hw_status_reg = 0x6404,
-	},
-	{
-		.name = "CLC_SHARED_LB",
-		.hw_status_reg = 0x6604,
-	},
-	{
-		.name = "CLC_WB_BDS",
-		.hw_status_reg = 0x6804,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_POST_BDS",
-		.hw_status_reg = 0x6A04,
-	},
-	{
-		.name = "CLC_BLS",
-		.hw_status_reg = 0x6C04,
-	},
-	{
-		.name = "CLC_BAYER_GLUT",
-		.hw_status_reg = 0x6E04,
-	},
-	{
-		.name = "CLC_BAYER_DS4",
-		.hw_status_reg = 0x7004,
-	},
-	{
-		.name = "CLC_COLOR_XFORM_DS4",
-		.hw_status_reg = 0x7204,
-	},
-	{
-		.name = "CLC_CHROMA_DS2",
-		.hw_status_reg = 0x7404,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_Y_DS4",
-		.hw_status_reg = 0x7604,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_C_DS4",
-		.hw_status_reg = 0x7804,
-	},
-	{
-		.name = "CLC_R2PD_DS4",
-		.hw_status_reg = 0x7A04,
-	},
-	{
-		.name = "CLC_DOWNSCALE_4TO1_Y",
-		.hw_status_reg = 0x7C04,
-	},
-	{
-		.name = "CLC_DOWNSCALE_4TO1_C",
-		.hw_status_reg = 0x7E04,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_Y_DS16",
-		.hw_status_reg = 0x8004,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_C_DS16",
-		.hw_status_reg = 0x8204,
-	},
-	{
-		.name = "CLC_R2PD_DS16",
-		.hw_status_reg = 0x8404,
-	},
-	{
-		.name = "CLC_WB_GAIN",
-		.hw_status_reg = 0x8604,
-	},
-	{
-		.name = "CLC_BAYER_DS2",
-		.hw_status_reg = 0x8804,
-	},
-	{
-		.name = "CLC_GTM",
-		.hw_status_reg = 0x8A04,
-	},
-	{
-		.name = "CLC_COLOR_XFORM_AI_DS",
-		.hw_status_reg = 0x8C04,
-	},
-	{
-		.name = "CLC_DOWNSCALE_MN_Y",
-		.hw_status_reg = 0x8E04,
-	},
-	{
-		.name = "CLC_DOWNSCALE_MN_C",
-		.hw_status_reg = 0x9004,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_Y_AI_DS",
-		.hw_status_reg = 0x9204,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_C_AI_DS",
-		.hw_status_reg = 0x9404,
-	},
-	{
-		.name = "CLC_CROP_RND_CLAMP_IDEAL_RAW",
-		.hw_status_reg = 0x9604,
-	},
-	{
-		.name = "CLC_ABF",
-		.hw_status_reg = 0x9804,
-	},
-	{
-		.name = "CLC_STATS_BG",
-		.hw_status_reg = 0x9A04,
-	},
-	{
-		.name = "CLC_STATS_BHIST",
-		.hw_status_reg = 0x9C04,
-	},
-	{
-		.name = "CLC_STATS_AWB_BG",
-		.hw_status_reg = 0x9E04,
-	},
-	{
-		.name = "CLC_STATS_AEC_BG",
-		.hw_status_reg = 0xA004,
-	},
-	{
-		.name = "CLC_STATS_BAF",
-		.hw_status_reg = 0xA204,
-	},
-	{
-		.name = "CLC_STATS_RS",
-		.hw_status_reg = 0xA404,
-	},
-};
-
-static struct  cam_tfe_top_hw_info tfe770_top_hw_info = {
-	.common_reg = &tfe770_top_commong_reg,
-	.camif_hw_info = {
-		.camif_reg = &tfe770_camif_reg,
-		.reg_data  = &tfe770_camif_reg_data,
-	},
-	.rdi_hw_info  = {
-		{
-			.rdi_reg  = &tfe770_rdi0_reg,
-			.reg_data = &tfe770_rdi0_reg_data,
-		},
-		{
-			.rdi_reg  = &tfe770_rdi1_reg,
-			.reg_data = &tfe770_rdi1_reg_data,
-		},
-		{
-			.rdi_reg  = &tfe770_rdi2_reg,
-			.reg_data = &tfe770_rdi2_reg_data,
-		},
-	},
-	.ppp_hw_info = {
-		.ppp_reg = &tfe770_ppp_reg,
-		.reg_data  = &tfe770_ppp_reg_data,
-	},
-	.in_port = {
-		CAM_TFE_CAMIF_VER_1_0,
-		CAM_TFE_RDI_VER_1_0,
-		CAM_TFE_RDI_VER_1_0,
-		CAM_TFE_RDI_VER_1_0,
-		CAM_TFE_PDLIB_VER_1_0
-	},
-	.reg_dump_data  = {
-		.num_reg_dump_entries    = 19,
-		.num_lut_dump_entries    = 0,
-		.bus_start_addr          = 0x2000,
-		.bus_write_top_end_addr  = 0x2120,
-		.bus_client_start_addr   = 0x2200,
-		.bus_client_offset       = 0x100,
-		.num_bus_clients         = 10,
-		.reg_entry = {
-			{
-				.start_offset = 0x1000,
-				.end_offset   = 0x10F4,
-			},
-			{
-				.start_offset = 0x1260,
-				.end_offset   = 0x1280,
-			},
-			{
-				.start_offset = 0x13F0,
-				.end_offset   = 0x13FC,
-			},
-			{
-				.start_offset = 0x1460,
-				.end_offset   = 0x1470,
-			},
-			{
-				.start_offset = 0x15F0,
-				.end_offset   = 0x15FC,
-			},
-			{
-				.start_offset = 0x1660,
-				.end_offset   = 0x1670,
-			},
-			{
-				.start_offset = 0x17F0,
-				.end_offset   = 0x17FC,
-			},
-			{
-				.start_offset = 0x1860,
-				.end_offset   = 0x1870,
-			},
-			{
-				.start_offset = 0x19F0,
-				.end_offset   = 0x19FC,
-			},
-			{
-				.start_offset = 0x2660,
-				.end_offset   = 0x2694,
-			},
-			{
-				.start_offset = 0x2860,
-				.end_offset   = 0x2884,
-			},
-			{
-				.start_offset = 0x2A60,
-				.end_offset   = 0X2B34,
-			},
-			{
-				.start_offset = 0x2C60,
-				.end_offset   = 0X2C80,
-			},
-			{
-				.start_offset = 0x2E60,
-				.end_offset   = 0X2E7C,
-			},
-			{
-				.start_offset = 0x3060,
-				.end_offset   = 0X3110,
-			},
-			{
-				.start_offset = 0x3260,
-				.end_offset   = 0X3278,
-			},
-			{
-				.start_offset = 0x3460,
-				.end_offset   = 0X3478,
-			},
-			{
-				.start_offset = 0x3660,
-				.end_offset   = 0X3684,
-			},
-			{
-				.start_offset = 0x3860,
-				.end_offset   = 0X3884,
-			},
-		},
-		.lut_entry = {
-			{
-				.lut_word_size = 1,
-				.lut_bank_sel  = 0x40,
-				.lut_addr_size = 180,
-				.dmi_reg_offset = 0x2800,
-			},
-			{
-				.lut_word_size = 1,
-				.lut_bank_sel  = 0x41,
-				.lut_addr_size = 180,
-				.dmi_reg_offset = 0x3000,
-			},
-		},
-	},
-	.num_path_port_map = 3,
-	.path_port_map = {
-		{CAM_ISP_HW_TFE_IN_PDLIB, CAM_ISP_TFE_OUT_RES_PD_LCR_STATS},
-		{CAM_ISP_HW_TFE_IN_PDLIB, CAM_ISP_TFE_OUT_RES_PD_PREPROCESSED},
-		{CAM_ISP_HW_TFE_IN_PDLIB, CAM_ISP_TFE_OUT_RES_PD_PARSED},
-	},
-};
-
-static struct cam_tfe_bus_hw_info  tfe770_bus_hw_info = {
-	.common_reg = {
-		.hw_version  = 0x00003000,
-		.cgc_ovd     = 0x00003008,
-		.comp_cfg_0  = 0x0000300C,
-		.comp_cfg_1  = 0x00003010,
-		.frameheader_cfg  = {
-			0x00003034,
-			0x00003038,
-			0x0000303C,
-			0x00003040,
-		},
-		.pwr_iso_cfg = 0x0000305C,
-		.overflow_status_clear = 0x00003060,
-		.ccif_violation_status = 0x00003064,
-		.overflow_status       = 0x00003068,
-		.image_size_violation_status = 0x00003070,
-		.perf_count_cfg = {
-			0x00003074,
-			0x00003078,
-			0x0000307C,
-			0x00003080,
-			0x00003084,
-			0x00003088,
-			0x0000308C,
-			0x00003090,
-		},
-		.perf_count_val = {
-			0x00003094,
-			0x00003098,
-			0x0000309C,
-			0x000030A0,
-			0x000030A4,
-			0x000030A8,
-			0x000030AC,
-			0x000030B0,
-		},
-		.perf_count_status = 0x000030B4,
-		.debug_status_top_cfg = 0x000030D4,
-		.debug_status_top = 0x000030D8,
-		.test_bus_ctrl = 0x000030DC,
-		.irq_mask = {
-			0x00003018,
-			0x0000301C,
-		},
-		.irq_clear = {
-			0x00003020,
-			0x00003024,
-		},
-		.irq_status = {
-			0x00003028,
-			0x0000302C,
-		},
-		.irq_cmd = 0x00003030,
-		.cons_violation_shift = 28,
-		.violation_shift  = 30,
-		.image_size_violation = 31,
-	},
-	.num_client = 19,
-	.bus_client_reg = {
-		/* BUS Client 0 BAYER */
-		{
-			.cfg                   = 0x00003200,
-			.image_addr            = 0x00003204,
-			.frame_incr            = 0x00003208,
-			.image_cfg_0           = 0x0000320C,
-			.image_cfg_1           = 0x00003210,
-			.image_cfg_2           = 0x00003214,
-			.packer_cfg            = 0x00003218,
-			.bw_limit              = 0x0000321C,
-			.frame_header_addr     = 0x00003220,
-			.frame_header_incr     = 0x00003224,
-			.frame_header_cfg      = 0x00003228,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003230,
-			.irq_subsample_pattern = 0x00003234,
-			.framedrop_period      = 0x00003238,
-			.framedrop_pattern     = 0x0000323C,
-			.system_cache_cfg      = 0x00003260,
-			.addr_status_0         = 0x00003268,
-			.addr_status_1         = 0x0000326C,
-			.addr_status_2         = 0x00003270,
-			.addr_status_3         = 0x00003274,
-			.debug_status_cfg      = 0x00003278,
-			.debug_status_0        = 0x0000327C,
-			.debug_status_1        = 0x00003280,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_0,
-			.client_name           = "BAYER",
-		},
-		/* BUS Client 1 IDEAL RAW*/
-		{
-			.cfg                   = 0x00003300,
-			.image_addr            = 0x00003304,
-			.frame_incr            = 0x00003308,
-			.image_cfg_0           = 0x0000330C,
-			.image_cfg_1           = 0x00003310,
-			.image_cfg_2           = 0x00003314,
-			.packer_cfg            = 0x00003318,
-			.bw_limit              = 0x0000331C,
-			.frame_header_addr     = 0x00003320,
-			.frame_header_incr     = 0x00003324,
-			.frame_header_cfg      = 0x00003328,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003330,
-			.irq_subsample_pattern = 0x00003334,
-			.framedrop_period      = 0x00003338,
-			.framedrop_pattern     = 0x0000333C,
-			.system_cache_cfg      = 0x00003360,
-			.addr_status_0         = 0x00003368,
-			.addr_status_1         = 0x0000336C,
-			.addr_status_2         = 0x00003370,
-			.addr_status_3         = 0x00003374,
-			.debug_status_cfg      = 0x00003378,
-			.debug_status_0        = 0x0000337C,
-			.debug_status_1        = 0x00003380,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_1,
-			.client_name           = "IDEAL_RAW",
-		},
-		/* BUS Client 2 Stats BE Tintless */
-		{
-			.cfg                   = 0x00003400,
-			.image_addr            = 0x00003404,
-			.frame_incr            = 0x00003408,
-			.image_cfg_0           = 0x0000340C,
-			.image_cfg_1           = 0x00003410,
-			.image_cfg_2           = 0x00003414,
-			.packer_cfg            = 0x00003418,
-			.bw_limit              = 0x0000341C,
-			.frame_header_addr     = 0x00003420,
-			.frame_header_incr     = 0x00003424,
-			.frame_header_cfg      = 0x00003428,
-			.line_done_cfg         = 0x00003400,
-			.irq_subsample_period  = 0x00003430,
-			.irq_subsample_pattern = 0x00003434,
-			.framedrop_period      = 0x00003438,
-			.framedrop_pattern     = 0x0000343C,
-			.system_cache_cfg      = 0x00003460,
-			.addr_status_0         = 0x00003468,
-			.addr_status_1         = 0x0000346C,
-			.addr_status_2         = 0x00003470,
-			.addr_status_3         = 0x00003474,
-			.debug_status_cfg      = 0x00003478,
-			.debug_status_0        = 0x0000347C,
-			.debug_status_1        = 0x00003480,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_2,
-			.client_name           = "STATS BE TINTLESS",
-		},
-		/* BUS Client 3 Stats Bhist */
-		{
-			.cfg                   = 0x00003500,
-			.image_addr            = 0x00003504,
-			.frame_incr            = 0x00003508,
-			.image_cfg_0           = 0x0000350C,
-			.image_cfg_1           = 0x00003510,
-			.image_cfg_2           = 0x00003514,
-			.packer_cfg            = 0x00003518,
-			.bw_limit              = 0x0000351C,
-			.frame_header_addr     = 0x00003520,
-			.frame_header_incr     = 0x00003524,
-			.frame_header_cfg      = 0x00003528,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003530,
-			.irq_subsample_pattern = 0x00003534,
-			.framedrop_period      = 0x00003538,
-			.framedrop_pattern     = 0x0000353C,
-			.system_cache_cfg      = 0x00003560,
-			.addr_status_0         = 0x00003568,
-			.addr_status_1         = 0x0000356C,
-			.addr_status_2         = 0x00003570,
-			.addr_status_3         = 0x00003574,
-			.debug_status_cfg      = 0x00003578,
-			.debug_status_0        = 0x0000357C,
-			.debug_status_1        = 0x00003580,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_2,
-			.client_name           = "STATS BHIST",
-		},
-		/* BUS Client 4 Stats AWB BG */
-		{
-			.cfg                   = 0x00003600,
-			.image_addr            = 0x00003604,
-			.frame_incr            = 0x00003608,
-			.image_cfg_0           = 0x0000360C,
-			.image_cfg_1           = 0x00003610,
-			.image_cfg_2           = 0x00003614,
-			.packer_cfg            = 0x00003618,
-			.bw_limit              = 0x0000361C,
-			.frame_header_addr     = 0x00003620,
-			.frame_header_incr     = 0x00003624,
-			.frame_header_cfg      = 0x00003628,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003630,
-			.irq_subsample_pattern = 0x00003634,
-			.framedrop_period      = 0x00003638,
-			.framedrop_pattern     = 0x0000363C,
-			.system_cache_cfg      = 0x00003660,
-			.addr_status_0         = 0x00003668,
-			.addr_status_1         = 0x0000366C,
-			.addr_status_2         = 0x00003670,
-			.addr_status_3         = 0x00003674,
-			.debug_status_cfg      = 0x00003678,
-			.debug_status_0        = 0x0000367C,
-			.debug_status_1        = 0x00003680,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_3,
-			.client_name           = "STATS AWB BG",
-		},
-		/* BUS Client 5 Stats AEC BG */
-		{
-			.cfg                   = 0x00003700,
-			.image_addr            = 0x00003704,
-			.frame_incr            = 0x00003708,
-			.image_cfg_0           = 0x0000370C,
-			.image_cfg_1           = 0x00003710,
-			.image_cfg_2           = 0x00003714,
-			.packer_cfg            = 0x00003718,
-			.bw_limit              = 0x0000371C,
-			.frame_header_addr     = 0x00003720,
-			.frame_header_incr     = 0x00003724,
-			.frame_header_cfg      = 0x00003728,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003730,
-			.irq_subsample_pattern = 0x00003734,
-			.framedrop_period      = 0x00003738,
-			.framedrop_pattern     = 0x0000373C,
-			.system_cache_cfg      = 0x00003760,
-			.addr_status_0         = 0x00003768,
-			.addr_status_1         = 0x0000376C,
-			.addr_status_2         = 0x00003770,
-			.addr_status_3         = 0x00003774,
-			.debug_status_cfg      = 0x00003778,
-			.debug_status_0        = 0x0000377C,
-			.debug_status_1        = 0x00003780,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_3,
-			.client_name           = "STATS AEC BG",
-		},
-		/* BUS Client 6 Stats BAF */
-		{
-			.cfg                   = 0x00003800,
-			.image_addr            = 0x00003804,
-			.frame_incr            = 0x00003808,
-			.image_cfg_0           = 0x0000380C,
-			.image_cfg_1           = 0x00003810,
-			.image_cfg_2           = 0x00003814,
-			.packer_cfg            = 0x00003818,
-			.bw_limit              = 0x0000381C,
-			.frame_header_addr     = 0x00003820,
-			.frame_header_incr     = 0x00003824,
-			.frame_header_cfg      = 0x00003828,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003830,
-			.irq_subsample_pattern = 0x00003834,
-			.framedrop_period      = 0x00003838,
-			.framedrop_pattern     = 0x0000383C,
-			.system_cache_cfg      = 0x00003860,
-			.addr_status_0         = 0x00003868,
-			.addr_status_1         = 0x0000386C,
-			.addr_status_2         = 0x00003870,
-			.addr_status_3         = 0x00003874,
-			.debug_status_cfg      = 0x00003878,
-			.debug_status_0        = 0x0000387C,
-			.debug_status_1        = 0x00003880,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_4,
-			.client_name           = "STATS BAF",
-		},
-		/* BUS Client 7 RDI0 */
-		{
-			.cfg                   = 0x00003900,
-			.image_addr            = 0x00003904,
-			.frame_incr            = 0x00003908,
-			.image_cfg_0           = 0x0000390C,
-			.image_cfg_1           = 0x00003910,
-			.image_cfg_2           = 0x00003914,
-			.packer_cfg            = 0x00003918,
-			.bw_limit              = 0x0000391C,
-			.frame_header_addr     = 0x00003920,
-			.frame_header_incr     = 0x00003924,
-			.frame_header_cfg      = 0x00003928,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003930,
-			.irq_subsample_pattern = 0x00003934,
-			.framedrop_period      = 0x00003938,
-			.framedrop_pattern     = 0x0000393C,
-			.system_cache_cfg      = 0x00003960,
-			.addr_status_0         = 0x00003968,
-			.addr_status_1         = 0x0000396C,
-			.addr_status_2         = 0x00003970,
-			.addr_status_3         = 0x00003974,
-			.debug_status_cfg      = 0x00003978,
-			.debug_status_0        = 0x0000397C,
-			.debug_status_1        = 0x00003980,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_5,
-			.client_name           = "RDI0",
-		},
-		/* BUS Client 8 RDI1 */
-		{
-			.cfg                   = 0x00003A00,
-			.image_addr            = 0x00003A04,
-			.frame_incr            = 0x00003A08,
-			.image_cfg_0           = 0x00003A0C,
-			.image_cfg_1           = 0x00003A10,
-			.image_cfg_2           = 0x00003A14,
-			.packer_cfg            = 0x00003A18,
-			.bw_limit              = 0x00003A1C,
-			.frame_header_addr     = 0x00003A20,
-			.frame_header_incr     = 0x00003A24,
-			.frame_header_cfg      = 0x00003A28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003A30,
-			.irq_subsample_pattern = 0x00003A34,
-			.framedrop_period      = 0x00003A38,
-			.framedrop_pattern     = 0x00003A3C,
-			.system_cache_cfg      = 0x00003A60,
-			.addr_status_0         = 0x00003A68,
-			.addr_status_1         = 0x00003A6C,
-			.addr_status_2         = 0x00003A70,
-			.addr_status_3         = 0x00003A74,
-			.debug_status_cfg      = 0x00003A78,
-			.debug_status_0        = 0x00003A7C,
-			.debug_status_1        = 0x00003A80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_6,
-			.client_name           = "RDI1",
-		},
-		/* BUS Client 9 RDI2 */
-		{
-			.cfg                   = 0x00003B00,
-			.image_addr            = 0x00003B04,
-			.frame_incr            = 0x00003B08,
-			.image_cfg_0           = 0x00003B0C,
-			.image_cfg_1           = 0x00003B10,
-			.image_cfg_2           = 0x00003B14,
-			.packer_cfg            = 0x00003B18,
-			.bw_limit              = 0x00003B1C,
-			.frame_header_addr     = 0x00003B20,
-			.frame_header_incr     = 0x00003B24,
-			.frame_header_cfg      = 0x00003B28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003B30,
-			.irq_subsample_pattern = 0x00003B34,
-			.framedrop_period      = 0x00003B38,
-			.framedrop_pattern     = 0x00003B3C,
-			.system_cache_cfg      = 0x00003B60,
-			.addr_status_0         = 0x00003B68,
-			.addr_status_1         = 0x00003B6C,
-			.addr_status_2         = 0x00003B70,
-			.addr_status_3         = 0x00003B74,
-			.debug_status_cfg      = 0x00003B78,
-			.debug_status_0        = 0x00003B7C,
-			.debug_status_1        = 0x00003B80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_7,
-			.client_name           = "RDI2",
-		},
-		/* BUS Client 10 PDAF */
-		{
-			.cfg                   = 0x00003C00,
-			.image_addr            = 0x00003C04,
-			.frame_incr            = 0x00003C08,
-			.image_cfg_0           = 0x00003C0C,
-			.image_cfg_1           = 0x00003C10,
-			.image_cfg_2           = 0x00003C14,
-			.packer_cfg            = 0x00003C18,
-			.bw_limit              = 0x00003C1C,
-			.frame_header_addr     = 0x00003C20,
-			.frame_header_incr     = 0x00003C24,
-			.frame_header_cfg      = 0x00003C28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003C30,
-			.irq_subsample_pattern = 0x00003C34,
-			.framedrop_period      = 0x00003C38,
-			.framedrop_pattern     = 0x00003C3C,
-			.system_cache_cfg      = 0x00003C60,
-			.addr_status_0         = 0x00003C68,
-			.addr_status_1         = 0x00003C6C,
-			.addr_status_2         = 0x00003C70,
-			.addr_status_3         = 0x00003C74,
-			.debug_status_cfg      = 0x00003C78,
-			.debug_status_0        = 0x00003C7C,
-			.debug_status_1        = 0x00003C80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_8,
-			.client_name           = "PDAF",
-		},
-		/* BUS Client 11 DS4 */
-		{
-			.cfg                   = 0x00003D00,
-			.image_addr            = 0x00003D04,
-			.frame_incr            = 0x00003D08,
-			.image_cfg_0           = 0x00003D0C,
-			.image_cfg_1           = 0x00003D10,
-			.image_cfg_2           = 0x00003D14,
-			.packer_cfg            = 0x00003D18,
-			.bw_limit              = 0x00003D1C,
-			.frame_header_addr     = 0x00003D20,
-			.frame_header_incr     = 0x00003D24,
-			.frame_header_cfg      = 0x00003D28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003D30,
-			.irq_subsample_pattern = 0x00003D34,
-			.framedrop_period      = 0x00003D38,
-			.framedrop_pattern     = 0x00003D3C,
-			.system_cache_cfg      = 0x00003D60,
-			.addr_status_0         = 0x00003D68,
-			.addr_status_1         = 0x00003D6C,
-			.addr_status_2         = 0x00003D70,
-			.addr_status_3         = 0x00003D74,
-			.debug_status_cfg      = 0x00003D78,
-			.debug_status_0        = 0x00003D7C,
-			.debug_status_1        = 0x00003D80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_0,
-			.client_name           = "DS4",
-		},
-		/* BUS Client 12 DS16 */
-		{
-			.cfg                   = 0x00003E00,
-			.image_addr            = 0x00003E04,
-			.frame_incr            = 0x00003E08,
-			.image_cfg_0           = 0x00003E0C,
-			.image_cfg_1           = 0x00003E10,
-			.image_cfg_2           = 0x00003E14,
-			.packer_cfg            = 0x00003E18,
-			.bw_limit              = 0x00003E1C,
-			.frame_header_addr     = 0x00003E20,
-			.frame_header_incr     = 0x00003E24,
-			.frame_header_cfg      = 0x00003E28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003E30,
-			.irq_subsample_pattern = 0x00003E34,
-			.framedrop_period      = 0x00003E38,
-			.framedrop_pattern     = 0x00003E3C,
-			.system_cache_cfg      = 0x00003E60,
-			.addr_status_0         = 0x00003E68,
-			.addr_status_1         = 0x00003E6C,
-			.addr_status_2         = 0x00003E70,
-			.addr_status_3         = 0x00003E74,
-			.debug_status_cfg      = 0x00003E78,
-			.debug_status_0        = 0x00003E7C,
-			.debug_status_1        = 0x00003E80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_0,
-			.client_name           = "DS16",
-		},
-		/* BUS Client 13 AI-Y */
-		{
-			.cfg                   = 0x00003F00,
-			.image_addr            = 0x00003F04,
-			.frame_incr            = 0x00003F08,
-			.image_cfg_0           = 0x00003F0C,
-			.image_cfg_1           = 0x00003F10,
-			.image_cfg_2           = 0x00003F14,
-			.packer_cfg            = 0x00003F18,
-			.bw_limit              = 0x00003F1C,
-			.frame_header_addr     = 0x00003F20,
-			.frame_header_incr     = 0x00003F24,
-			.frame_header_cfg      = 0x00003F28,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00003F30,
-			.irq_subsample_pattern = 0x00003F34,
-			.framedrop_period      = 0x00003F38,
-			.framedrop_pattern     = 0x00003F3C,
-			.system_cache_cfg      = 0x00003F60,
-			.addr_status_0         = 0x00003F68,
-			.addr_status_1         = 0x00003F6C,
-			.addr_status_2         = 0x00003F70,
-			.addr_status_3         = 0x00003F74,
-			.debug_status_cfg      = 0x00003F78,
-			.debug_status_0        = 0x00003F7C,
-			.debug_status_1        = 0x00003F80,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_9,
-			.client_name           = "AI-Y",
-		},
-		/* BUS Client 14 AI-C */
-		{
-			.cfg                   = 0x00004000,
-			.image_addr            = 0x00004004,
-			.frame_incr            = 0x00004008,
-			.image_cfg_0           = 0x0000400C,
-			.image_cfg_1           = 0x00004010,
-			.image_cfg_2           = 0x00004014,
-			.packer_cfg            = 0x00004018,
-			.bw_limit              = 0x0000401C,
-			.frame_header_addr     = 0x00004020,
-			.frame_header_incr     = 0x00004024,
-			.frame_header_cfg      = 0x00004028,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00004030,
-			.irq_subsample_pattern = 0x00004034,
-			.framedrop_period      = 0x00004038,
-			.framedrop_pattern     = 0x0000403C,
-			.system_cache_cfg      = 0x00004060,
-			.addr_status_0         = 0x00004068,
-			.addr_status_1         = 0x0000406C,
-			.addr_status_2         = 0x00004070,
-			.addr_status_3         = 0x00004074,
-			.debug_status_cfg      = 0x00004078,
-			.debug_status_0        = 0x0000407C,
-			.debug_status_1        = 0x00004080,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_9,
-			.client_name           = "AI-C",
-		},
-		/* BUS Client 15 Stats RS */
-		{
-			.cfg                   = 0x00004100,
-			.image_addr            = 0x00004104,
-			.frame_incr            = 0x00004108,
-			.image_cfg_0           = 0x0000410C,
-			.image_cfg_1           = 0x00004110,
-			.image_cfg_2           = 0x00004114,
-			.packer_cfg            = 0x00004118,
-			.bw_limit              = 0x0000411C,
-			.frame_header_addr     = 0x00004120,
-			.frame_header_incr     = 0x00004124,
-			.frame_header_cfg      = 0x00004128,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00004130,
-			.irq_subsample_pattern = 0x00004134,
-			.framedrop_period      = 0x00004138,
-			.framedrop_pattern     = 0x0000413C,
-			.system_cache_cfg      = 0x00004160,
-			.addr_status_0         = 0x00004168,
-			.addr_status_1         = 0x0000416C,
-			.addr_status_2         = 0x00004170,
-			.addr_status_3         = 0x00004174,
-			.debug_status_cfg      = 0x00004178,
-			.debug_status_0        = 0x0000417C,
-			.debug_status_1        = 0x00004180,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_10,
-			.client_name           = "STATS RS",
-		},
-		/* BUS Client 16 PDAF 0 STAT LCR */
-		{
-			.cfg                   = 0x00004200,
-			.image_addr            = 0x00004204,
-			.frame_incr            = 0x00004208,
-			.image_cfg_0           = 0x0000420C,
-			.image_cfg_1           = 0x00004210,
-			.image_cfg_2           = 0x00004214,
-			.packer_cfg            = 0x00004218,
-			.bw_limit              = 0x0000421C,
-			.frame_header_addr     = 0x00004220,
-			.frame_header_incr     = 0x00004224,
-			.frame_header_cfg      = 0x00004228,
-			.line_done_cfg         = 0x0000422C,
-			.irq_subsample_period  = 0x00004230,
-			.irq_subsample_pattern = 0x00004234,
-			.framedrop_period      = 0x00004238,
-			.framedrop_pattern     = 0x0000423C,
-			.system_cache_cfg      = 0x00004260,
-			.addr_status_0         = 0x00004268,
-			.addr_status_1         = 0x0000426C,
-			.addr_status_2         = 0x00004270,
-			.addr_status_3         = 0x00004274,
-			.debug_status_cfg      = 0x00004278,
-			.debug_status_0        = 0x0000427C,
-			.debug_status_1        = 0x00004280,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_11,
-			.client_name           = "STAT LCR",
-		},
-		/* BUS Client 17 PDAF 1 PD PREPROCESSED*/
-		{
-			.cfg                   = 0x00004300,
-			.image_addr            = 0x00004304,
-			.frame_incr            = 0x00004308,
-			.image_cfg_0           = 0x0000430C,
-			.image_cfg_1           = 0x00004310,
-			.image_cfg_2           = 0x00004314,
-			.packer_cfg            = 0x00004318,
-			.bw_limit              = 0x0000431C,
-			.frame_header_addr     = 0x00004320,
-			.frame_header_incr     = 0x00004324,
-			.frame_header_cfg      = 0x00004328,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00004330,
-			.irq_subsample_pattern = 0x00004334,
-			.framedrop_period      = 0x00004338,
-			.framedrop_pattern     = 0x0000433C,
-			.system_cache_cfg      = 0x00004360,
-			.addr_status_0         = 0x00004368,
-			.addr_status_1         = 0x0000436C,
-			.addr_status_2         = 0x00004370,
-			.addr_status_3         = 0x00004374,
-			.debug_status_cfg      = 0x00004378,
-			.debug_status_0        = 0x0000437C,
-			.debug_status_1        = 0x00004380,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_11,
-			.client_name           = "PD PREPROCESSED",
-		},
-		/* BUS Client 18 PDAF 2 PD PARSED*/
-		{
-			.cfg                   = 0x00004400,
-			.image_addr            = 0x00004404,
-			.frame_incr            = 0x00004408,
-			.image_cfg_0           = 0x0000440C,
-			.image_cfg_1           = 0x00004410,
-			.image_cfg_2           = 0x00004414,
-			.packer_cfg            = 0x00004418,
-			.bw_limit              = 0x0000441C,
-			.frame_header_addr     = 0x00004420,
-			.frame_header_incr     = 0x00004424,
-			.frame_header_cfg      = 0x00004428,
-			.line_done_cfg         = 0x00000000,
-			.irq_subsample_period  = 0x00004430,
-			.irq_subsample_pattern = 0x00004434,
-			.framedrop_period      = 0x00004438,
-			.framedrop_pattern     = 0x0000443C,
-			.system_cache_cfg      = 0x00004460,
-			.addr_status_0         = 0x00004468,
-			.addr_status_1         = 0x0000446C,
-			.addr_status_2         = 0x00004470,
-			.addr_status_3         = 0x00004474,
-			.debug_status_cfg      = 0x00004478,
-			.debug_status_0        = 0x0000447C,
-			.debug_status_1        = 0x00004480,
-			.comp_group            = CAM_TFE_BUS_COMP_GRP_11,
-			.client_name           = "PD PARSED",
-		},
-	},
-	.num_out  = 18,
-	.tfe_out_hw_info = {
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_RDI0,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_5,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_1,
-			.mid[0]           = 16,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_RDI1,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_6,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_2,
-			.mid[0]           = 17,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_RDI2,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_7,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_3,
-			.mid[0]           = 18,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_FULL,
-			.max_width        = 4096,
-			.max_height       = 4096,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_0,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 16,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_RAW_DUMP,
-			.max_width        = 4096,
-			.max_height       = 4096,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_1,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 19,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_PDAF,
-			.max_width        = 4096,
-			.max_height       = 4096,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_8,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 26,
-			.pid_mask         = 0x700,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_HDR_BE,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_3,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 20,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_HDR_BHIST,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_2,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 18,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_TL_BG,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_2,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 17,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_AWB_BG,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_3,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 19,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_BF,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_4,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 21,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_STATS_RS,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_10,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 27,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_DS4,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_0,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 22,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_DS16,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_0,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 23,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_AI,
-			.max_width        = 1920,
-			.max_height       = 1920,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_9,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_0,
-			.mid[0]           = 24,
-			.mid[1]           = 25,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_PD_LCR_STATS,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_11,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_4,
-			.mid[0]           = 21,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_PD_PREPROCESSED,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_11,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_4,
-			.mid[0]           = 20,
-			.pid_mask         = 0x70,
-		},
-		{
-			.tfe_out_id       = CAM_TFE_BUS_TFE_OUT_PD_PARSED,
-			.max_width        = -1,
-			.max_height       = -1,
-			.composite_group  = CAM_TFE_BUS_COMP_GRP_11,
-			.rup_group_id     = CAM_TFE_BUS_RUP_GRP_4,
-			.mid[0]           = 22,
-			.pid_mask         = 0x70,
-		},
-	},
-	.num_comp_grp             = 12,
-	.max_wm_per_comp_grp      = 3,
-	.comp_done_shift          = 8,
-	.top_bus_wr_irq_shift     = 1,
-	.comp_buf_done_mask = 0xFFF00,
-	.comp_rup_done_mask = 0xF,
-	.bus_irq_error_mask = {
-		0xD0000000,
-		0x00000000,
-	},
-	.support_consumed_addr = true,
-	.pdaf_rdi2_mux_en = false,
-	.rdi_width = 128,
-	.mode_cfg_shift = 16,
-	.height_shift = 16,
-	.max_out_res = CAM_ISP_TFE_OUT_RES_MAX & 0xFF,
-};
-
-struct cam_tfe_hw_info cam_tfe770 = {
-	.top_irq_mask = {
-		0x00001834,
-		0x00001838,
-		0x0000183C,
-	},
-	.top_irq_clear = {
-		0x00001840,
-		0x00001844,
-		0x00001848,
-	},
-	.top_irq_status = {
-		0x0000184C,
-		0x00001850,
-		0x00001854,
-	},
-	.top_irq_cmd                       = 0x00001830,
-	.global_clear_bitmask              = 0x00000001,
-	.bus_irq_mask = {
-		0x00003018,
-		0x0000301C,
-	},
-	.bus_irq_clear = {
-		0x00003020,
-		0x00003024,
-	},
-	.bus_irq_status = {
-		0x00003028,
-		0x0000302C,
-	},
-	.bus_irq_cmd = 0x00003030,
-	.bus_violation_reg = 0x00003064,
-	.bus_overflow_reg = 0x00003068,
-	.bus_image_size_vilation_reg = 0x3070,
-	.bus_overflow_clear_cmd = 0x3060,
-	.debug_status_top = 0x30D8,
-
-	.reset_irq_mask = {
-		0x00000001,
-		0x00000000,
-		0x00000000,
-	},
-	.error_irq_mask = {
-		0x001F1F00,
-		0x00000000,
-		0x000002FF,
-	},
-	.non_fatal_error_irq_mask = {
-		0x00200000,
-		0x00000000,
-		0x00000000,
-	},
-	.bus_reg_irq_mask = {
-		0x00000002,
-		0x00000000,
-	},
-	.bus_error_irq_mask = {
-		0xC0000000,
-		0x00000000,
-	},
-
-	.num_clc = 39,
-	.clc_hw_status_info            = tfe770_clc_hw_info,
-	.bus_version                   = CAM_TFE_BUS_1_0,
-	.bus_hw_info                   = &tfe770_bus_hw_info,
-
-	.top_version                   = CAM_TFE_TOP_1_0,
-	.top_hw_info                   = &tfe770_top_hw_info,
-};
-
-#endif /* _CAM_TFE770__H_ */

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_bus.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/ratelimit.h>
@@ -71,8 +71,6 @@ struct cam_tfe_bus_common_data {
 	uint32_t                                    num_sec_out;
 	uint32_t                                    comp_done_shift;
 	uint32_t                                    rdi_width;
-	uint32_t                                    mode_cfg_shift;
-	uint32_t                                    height_shift;
 	bool                                        is_lite;
 	bool                                        support_consumed_addr;
 	cam_hw_mgr_event_cb_func                    event_cb;
@@ -81,7 +79,6 @@ struct cam_tfe_bus_common_data {
 	uint32_t                                    max_bw_counter_limit;
 	uint32_t                                    counter_limit_shift;
 	uint32_t                                    counter_limit_mask;
-	uint32_t                                    pack_align_shift;
 };
 
 struct cam_tfe_bus_wm_resource_data {
@@ -111,12 +108,7 @@ struct cam_tfe_bus_wm_resource_data {
 	uint32_t             acquired_width;
 	uint32_t             acquired_height;
 	uint32_t             acquired_stride;
-
-	uint32_t             buffer_offset;
-	bool                 is_buffer_aligned;
 	bool                 limiter_blob_status;
-
-	bool                 is_dim_update;
 };
 
 struct cam_tfe_bus_comp_grp_data {
@@ -160,7 +152,6 @@ struct cam_tfe_bus_tfe_out_data {
 	void                            *priv;
 	cam_hw_mgr_event_cb_func         event_cb;
 	uint32_t                         mid[CAM_TFE_BUS_MAX_MID_PER_PORT];
-	uint64_t                         pid_mask;
 };
 
 struct cam_tfe_bus_priv {
@@ -182,7 +173,6 @@ struct cam_tfe_bus_priv {
 	uint32_t                            comp_buf_done_mask;
 	uint32_t                            comp_rup_done_mask;
 	uint32_t           bus_irq_error_mask[CAM_TFE_BUS_IRQ_REGISTERS_MAX];
-	uint32_t                            max_out_res;
 };
 
 static bool cam_tfe_bus_can_be_secure(uint32_t out_id)
@@ -196,9 +186,6 @@ static bool cam_tfe_bus_can_be_secure(uint32_t out_id)
 	case CAM_TFE_BUS_TFE_OUT_DS4:
 	case CAM_TFE_BUS_TFE_OUT_DS16:
 	case CAM_TFE_BUS_TFE_OUT_AI:
-	case CAM_TFE_BUS_TFE_OUT_PD_LCR_STATS:
-	case CAM_TFE_BUS_TFE_OUT_PD_PREPROCESSED:
-	case CAM_TFE_BUS_TFE_OUT_PD_PARSED:
 		return true;
 
 	case CAM_TFE_BUS_TFE_OUT_STATS_HDR_BE:
@@ -246,12 +233,6 @@ static enum cam_tfe_bus_tfe_out_id
 		return CAM_TFE_BUS_TFE_OUT_DS16;
 	case CAM_ISP_TFE_OUT_RES_AI:
 		return CAM_TFE_BUS_TFE_OUT_AI;
-	case CAM_ISP_TFE_OUT_RES_PD_LCR_STATS:
-		return CAM_TFE_BUS_TFE_OUT_PD_LCR_STATS;
-	case CAM_ISP_TFE_OUT_RES_PD_PREPROCESSED:
-		return CAM_TFE_BUS_TFE_OUT_PD_PREPROCESSED;
-	case CAM_ISP_TFE_OUT_RES_PD_PARSED:
-		return CAM_TFE_BUS_TFE_OUT_PD_PARSED;
 	default:
 		return CAM_TFE_BUS_TFE_OUT_MAX;
 	}
@@ -342,7 +323,7 @@ static int cam_tfe_bus_get_num_wm(
 		switch (format) {
 		case CAM_FORMAT_NV12:
 		case CAM_FORMAT_TP10:
-		case CAM_FORMAT_PLAIN16_10:
+		case CAM_FORMAT_PD10:
 			return 2;
 		default:
 			break;
@@ -369,17 +350,6 @@ static int cam_tfe_bus_get_num_wm(
 			break;
 		}
 		break;
-	case CAM_TFE_BUS_TFE_OUT_PD_LCR_STATS:
-	case CAM_TFE_BUS_TFE_OUT_PD_PREPROCESSED:
-	case CAM_TFE_BUS_TFE_OUT_PD_PARSED:
-		switch (format) {
-		case CAM_FORMAT_PLAIN16_10:
-		case CAM_FORMAT_PLAIN64:
-			return 1;
-		default:
-			break;
-		}
-		break;
 	default:
 		break;
 	}
@@ -390,47 +360,6 @@ static int cam_tfe_bus_get_num_wm(
 	return -EINVAL;
 }
 
-static int cam_tfe_lite_bus_get_wm_idx(
-	enum cam_tfe_bus_tfe_out_id tfe_out_res_id,
-	enum cam_tfe_bus_plane_type plane)
-{
-	int wm_idx = -1;
-
-	switch (tfe_out_res_id) {
-	case CAM_TFE_BUS_TFE_OUT_RDI0:
-		switch (plane) {
-		case PLANE_Y:
-			wm_idx = 0;
-			break;
-		default:
-			break;
-		}
-		break;
-	case CAM_TFE_BUS_TFE_OUT_RDI1:
-		switch (plane) {
-		case PLANE_Y:
-			wm_idx = 1;
-			break;
-		default:
-			break;
-		}
-		break;
-	case CAM_TFE_BUS_TFE_OUT_RDI2:
-		switch (plane) {
-		case PLANE_Y:
-			wm_idx = 2;
-			break;
-		default:
-			break;
-		}
-		break;
-	default:
-		break;
-	}
-
-	return wm_idx;
-}
-
 static int cam_tfe_bus_get_wm_idx(
 	enum cam_tfe_bus_tfe_out_id tfe_out_res_id,
 	enum cam_tfe_bus_plane_type plane,
@@ -581,33 +510,6 @@ static int cam_tfe_bus_get_wm_idx(
 			break;
 		}
 		break;
-	case CAM_TFE_BUS_TFE_OUT_PD_LCR_STATS:
-		switch (plane) {
-		case PLANE_Y:
-			wm_idx = 16;
-			break;
-		default:
-			break;
-		}
-		break;
-	case CAM_TFE_BUS_TFE_OUT_PD_PREPROCESSED:
-		switch (plane) {
-		case PLANE_Y:
-			wm_idx = 17;
-			break;
-		default:
-			break;
-		}
-		break;
-	case CAM_TFE_BUS_TFE_OUT_PD_PARSED:
-		switch (plane) {
-		case PLANE_Y:
-			wm_idx = 18;
-			break;
-		default:
-			break;
-		}
-		break;
 	default:
 		break;
 	}
@@ -659,7 +561,6 @@ static int cam_tfe_bus_acquire_rdi_wm(
 {
 	int pack_fmt = 0;
 	int rdi_width = rsrc_data->common_data->rdi_width;
-	int mode_cfg_shift = rsrc_data->common_data->mode_cfg_shift;
 
 	if (rdi_width == 64)
 		pack_fmt = 0xa;
@@ -680,7 +581,7 @@ static int cam_tfe_bus_acquire_rdi_wm(
 			rsrc_data->height = 0;
 			rsrc_data->stride =
 				CAM_TFE_RDI_BUS_DEFAULT_STRIDE;
-			rsrc_data->en_cfg = (0x1 << mode_cfg_shift) | 0x1;
+			rsrc_data->en_cfg = (0x1 << 16) | 0x1;
 		}
 		break;
 	case CAM_FORMAT_MIPI_RAW_8:
@@ -697,7 +598,7 @@ static int cam_tfe_bus_acquire_rdi_wm(
 			rsrc_data->height = 0;
 			rsrc_data->stride =
 				CAM_TFE_RDI_BUS_DEFAULT_STRIDE;
-			rsrc_data->en_cfg = (0x1 << mode_cfg_shift) | 0x1;
+			rsrc_data->en_cfg = (0x1 << 16) | 0x1;
 		}
 		break;
 	case CAM_FORMAT_MIPI_RAW_10:
@@ -713,7 +614,7 @@ static int cam_tfe_bus_acquire_rdi_wm(
 			rsrc_data->height = 0;
 			rsrc_data->stride =
 				CAM_TFE_RDI_BUS_DEFAULT_STRIDE;
-			rsrc_data->en_cfg = (0x1 << mode_cfg_shift) | 0x1;
+			rsrc_data->en_cfg = (0x1 << 16) | 0x1;
 		}
 		break;
 	case CAM_FORMAT_MIPI_RAW_12:
@@ -729,7 +630,7 @@ static int cam_tfe_bus_acquire_rdi_wm(
 			rsrc_data->height = 0;
 			rsrc_data->stride =
 				CAM_TFE_RDI_BUS_DEFAULT_STRIDE;
-			rsrc_data->en_cfg = (0x1 << mode_cfg_shift) | 0x1;
+			rsrc_data->en_cfg = (0x1 << 16) | 0x1;
 		}
 		break;
 	case CAM_FORMAT_MIPI_RAW_14:
@@ -745,7 +646,7 @@ static int cam_tfe_bus_acquire_rdi_wm(
 			rsrc_data->height = 0;
 			rsrc_data->stride =
 				CAM_TFE_RDI_BUS_DEFAULT_STRIDE;
-			rsrc_data->en_cfg = (0x1 << mode_cfg_shift) | 0x1;
+			rsrc_data->en_cfg = (0x1 << 16) | 0x1;
 		}
 		break;
 	case CAM_FORMAT_PLAIN16_10:
@@ -765,7 +666,7 @@ static int cam_tfe_bus_acquire_rdi_wm(
 			rsrc_data->height = 0;
 			rsrc_data->stride =
 				CAM_TFE_RDI_BUS_DEFAULT_STRIDE;
-			rsrc_data->en_cfg = (0x1 << mode_cfg_shift) | 0x1;
+			rsrc_data->en_cfg = (0x1 << 16) | 0x1;
 		}
 		break;
 
@@ -783,7 +684,7 @@ static int cam_tfe_bus_acquire_rdi_wm(
 			rsrc_data->height = 0;
 			rsrc_data->stride =
 				CAM_TFE_RDI_BUS_DEFAULT_STRIDE;
-			rsrc_data->en_cfg = (0x1 << mode_cfg_shift) | 0x1;
+			rsrc_data->en_cfg = (0x1 << 16) | 0x1;
 		}
 		break;
 	default:
@@ -810,16 +711,14 @@ static int cam_tfe_bus_acquire_wm(
 	struct cam_tfe_bus_wm_resource_data  *rsrc_data = NULL;
 	uint32_t wm_idx = 0;
 	int rc = 0;
+
 	*wm_res = NULL;
 	/* No need to allocate for BUS TFE OUT to WM is fixed. */
-	if (bus_priv->common_data.is_lite)
-		wm_idx = cam_tfe_lite_bus_get_wm_idx(tfe_out_res_id, plane);
-	else
-		wm_idx = cam_tfe_bus_get_wm_idx(tfe_out_res_id, plane,
-			bus_priv->common_data.pdaf_rdi2_mux_en);
+	wm_idx = cam_tfe_bus_get_wm_idx(tfe_out_res_id, plane,
+		bus_priv->common_data.pdaf_rdi2_mux_en);
 	if (wm_idx < 0 || wm_idx >= bus_priv->num_client) {
-		CAM_ERR(CAM_ISP, "Unsupported TFE out %d plane %d wm id %d num client %d",
-			tfe_out_res_id, plane, wm_idx, bus_priv->num_client);
+		CAM_ERR(CAM_ISP, "Unsupported TFE out %d plane %d",
+			tfe_out_res_id, plane);
 		return -EINVAL;
 	}
 
@@ -855,8 +754,8 @@ static int cam_tfe_bus_acquire_wm(
 	/* Set WM offset value to default */
 	rsrc_data->offset  = 0;
 
-	if (bus_priv->common_data.is_lite || (((rsrc_data->index >= 7) &&
-		(rsrc_data->index <= 9)) && (tfe_out_res_id != CAM_TFE_BUS_TFE_OUT_PDAF))) {
+	if (((rsrc_data->index >= 7) && (rsrc_data->index <= 9)) &&
+		(tfe_out_res_id != CAM_TFE_BUS_TFE_OUT_PDAF)) {
 		/* WM 7-9 refers to RDI 0/ RDI 1/RDI 2 */
 		rc = cam_tfe_bus_acquire_rdi_wm(rsrc_data);
 		if (rc)
@@ -882,21 +781,6 @@ static int cam_tfe_bus_acquire_wm(
 		case CAM_FORMAT_PLAIN16_10:
 			rsrc_data->pack_fmt = 0x5;
 			rsrc_data->pack_fmt |= 0x10;
-
-			/* AI port */
-			if (rsrc_data->index == 13 || rsrc_data->index == 14) {
-				rsrc_data->pack_fmt = 0x5;
-				switch (plane) {
-				case PLANE_C:
-					rsrc_data->height /= 2;
-					break;
-				case PLANE_Y:
-					break;
-				default:
-					CAM_ERR(CAM_ISP, "Invalid plane %d", plane);
-					return -EINVAL;
-				}
-			}
 			break;
 		case CAM_FORMAT_PLAIN16_12:
 			rsrc_data->pack_fmt = 0x6;
@@ -934,52 +818,11 @@ static int cam_tfe_bus_acquire_wm(
 		rsrc_data->width = 0;
 		rsrc_data->height = 0;
 		rsrc_data->stride = 1;
-		rsrc_data->en_cfg = (0x1 << rsrc_data->common_data->mode_cfg_shift) | 0x1;
+		rsrc_data->en_cfg = (0x1 << 16) | 0x1;
 
 		/*RS state packet format*/
 		if (rsrc_data->index == 15)
 			rsrc_data->pack_fmt = 0x9;
-	} else if (rsrc_data->index == 16) {
-		/* LCR */
-		switch (rsrc_data->format) {
-		case CAM_FORMAT_PLAIN64:
-			rsrc_data->width = 0;
-			rsrc_data->height = 0;
-			rsrc_data->stride = 1;
-			rsrc_data->en_cfg = (0x1 << rsrc_data->common_data->mode_cfg_shift) | 0x1;
-			break;
-		default:
-			CAM_ERR(CAM_ISP, "Invalid format %d out_type:%d index: %d",
-				rsrc_data->format, tfe_out_res_id, rsrc_data->index);
-			return -EINVAL;
-		}
-	} else if (rsrc_data->index == 17) {
-		/* PD_PREPROCESSED */
-		switch (rsrc_data->format) {
-		case CAM_FORMAT_PLAIN16_10:
-			rsrc_data->stride = ALIGNUP(rsrc_data->width * 2, 8);
-			rsrc_data->en_cfg = 0x1;
-			break;
-		default:
-			CAM_ERR(CAM_ISP, "Invalid format %d out_type:%d index: %d",
-				rsrc_data->format, tfe_out_res_id, rsrc_data->index);
-			return -EINVAL;
-		}
-	} else if (rsrc_data->index == 18) {
-		/* PD PARSED */
-		switch (rsrc_data->format) {
-		case CAM_FORMAT_PLAIN16_10:
-			rsrc_data->stride = ALIGNUP(rsrc_data->width * 2, 8);
-			rsrc_data->en_cfg = 0x1;
-			/* LSB aligned */
-			rsrc_data->pack_fmt |= (1 <<
-				bus_priv->common_data.pack_align_shift);
-			break;
-		default:
-			CAM_ERR(CAM_ISP, "Invalid format %d out_type:%d index: %d",
-				rsrc_data->format, tfe_out_res_id, rsrc_data->index);
-			return -EINVAL;
-		}
 	} else {
 		CAM_ERR(CAM_ISP, "Invalid WM:%d requested", rsrc_data->index);
 		return -EINVAL;
@@ -1016,8 +859,6 @@ static int cam_tfe_bus_release_wm(void   *bus_priv,
 	rsrc_data->en_cfg = 0;
 	rsrc_data->is_dual = 0;
 	rsrc_data->limiter_blob_status = false;
-	rsrc_data->is_buffer_aligned = false;
-	rsrc_data->buffer_offset = 0;
 
 	wm_res->tasklet_info = NULL;
 	wm_res->res_state = CAM_ISP_RESOURCE_STATE_AVAILABLE;
@@ -1034,14 +875,13 @@ static int cam_tfe_bus_start_wm(struct cam_isp_resource_node *wm_res)
 		wm_res->res_priv;
 	struct cam_tfe_bus_common_data        *common_data =
 		rsrc_data->common_data;
-	int height_shift = rsrc_data->common_data->height_shift;
 
 	/* Skip to overwrite if wm bandwidth limiter blob already sent */
 	if (!rsrc_data->limiter_blob_status)
 		cam_io_w(rsrc_data->common_data->counter_limit_mask,
 			common_data->mem_base + rsrc_data->hw_regs->bw_limit);
 
-	cam_io_w((rsrc_data->height << height_shift) | rsrc_data->width,
+	cam_io_w((rsrc_data->height << 16) | rsrc_data->width,
 		common_data->mem_base + rsrc_data->hw_regs->image_cfg_0);
 	cam_io_w(rsrc_data->pack_fmt,
 		common_data->mem_base + rsrc_data->hw_regs->packer_cfg);
@@ -1057,6 +897,10 @@ static int cam_tfe_bus_start_wm(struct cam_isp_resource_node *wm_res)
 			rsrc_data->stride);
 	}
 
+	/* Enable WM */
+	cam_io_w_mb(rsrc_data->en_cfg, common_data->mem_base +
+		rsrc_data->hw_regs->cfg);
+
 	CAM_DBG(CAM_ISP, "TFE:%d WM:%d width = %d, height = %d",
 		common_data->core_index, rsrc_data->index,
 		rsrc_data->width, rsrc_data->height);
@@ -1427,10 +1271,7 @@ static int cam_tfe_bus_init_comp_grp(uint32_t index,
 	INIT_LIST_HEAD(&comp_grp->list);
 
 	comp_grp->res_id = index;
-	if (bus_priv->common_data.is_lite)
-		rsrc_data->comp_grp_id   = hw_info->bus_client_reg[index].comp_group;
-	else
-		rsrc_data->comp_grp_id   = index;
+	rsrc_data->comp_grp_id   = index;
 	rsrc_data->common_data   = &bus_priv->common_data;
 	rsrc_data->max_wm_per_comp_grp =
 		bus_priv->max_wm_per_comp_grp;
@@ -1856,8 +1697,6 @@ static int cam_tfe_bus_init_tfe_out_resource(uint32_t  index,
 	for (i = 0; i < CAM_TFE_BUS_MAX_MID_PER_PORT; i++)
 		rsrc_data->mid[i] = hw_info->tfe_out_hw_info[index].mid[i];
 
-	rsrc_data->pid_mask = hw_info->tfe_out_hw_info[index].pid_mask;
-
 	tfe_out->hw_intf = bus_priv->common_data.hw_intf;
 
 	return 0;
@@ -1906,8 +1745,6 @@ static const char *cam_tfe_bus_rup_type(
 		return "RDI1 RUP";
 	case CAM_ISP_HW_TFE_IN_RDI2:
 		return "RDI2 RUP";
-	case CAM_ISP_HW_TFE_IN_PDLIB:
-		return "PDLIB RUP";
 	default:
 		return "invalid rup group";
 	}
@@ -1916,10 +1753,12 @@ static int cam_tfe_bus_rup_bottom_half(
 	struct cam_tfe_bus_priv            *bus_priv,
 	struct cam_tfe_irq_evt_payload *evt_payload)
 {
-	struct cam_tfe_bus_tfe_out_data    *out_rsrc_data = NULL;
+	struct cam_tfe_bus_common_data     *common_data;
+	struct cam_tfe_bus_tfe_out_data    *out_rsrc_data;
 	struct cam_isp_hw_event_info        evt_info;
 	uint32_t i, j;
 
+	common_data = &bus_priv->common_data;
 	evt_info.hw_idx = bus_priv->common_data.core_index;
 	evt_info.res_type = CAM_ISP_RESOURCE_TFE_OUT;
 
@@ -1929,20 +1768,17 @@ static int cam_tfe_bus_rup_bottom_half(
 			break;
 
 		if (evt_payload->bus_irq_val[0] & BIT(i)) {
-			for (j = 0; j < bus_priv->num_out; j++) {
+			for (j = 0; j < CAM_TFE_BUS_TFE_OUT_MAX; j++) {
 				out_rsrc_data =
 					(struct cam_tfe_bus_tfe_out_data *)
 					bus_priv->tfe_out[j].res_priv;
-				if (!out_rsrc_data)
-					break;
-
 				if ((out_rsrc_data->rup_group_id == i) &&
 					(bus_priv->tfe_out[j].res_state ==
 					CAM_ISP_RESOURCE_STATE_STREAMING))
 					break;
 			}
 
-			if (j == bus_priv->num_out) {
+			if (j == CAM_TFE_BUS_TFE_OUT_MAX) {
 				CAM_ERR(CAM_ISP,
 					"TFE:%d out rsc active status[0]:0x%x",
 					bus_priv->common_data.core_index,
@@ -1954,13 +1790,6 @@ static int cam_tfe_bus_rup_bottom_half(
 				bus_priv->common_data.core_index,
 				cam_tfe_bus_rup_type(i));
 			evt_info.res_id = i;
-
-			if (!out_rsrc_data) {
-				CAM_ERR(CAM_ISP,
-					"out_rsrc_data null for out_res: %d, RUP_group: %d",
-					j, i);
-				break;
-			}
 			if (out_rsrc_data->event_cb) {
 				out_rsrc_data->event_cb(
 					out_rsrc_data->priv,
@@ -1987,15 +1816,13 @@ static uint32_t cam_tfe_bus_get_last_consumed_addr(
 	struct cam_isp_resource_node        *rsrc_node = NULL;
 	struct cam_tfe_bus_tfe_out_data     *rsrc_data = NULL;
 	struct cam_tfe_bus_wm_resource_data *wm_rsrc_data = NULL;
-	enum cam_tfe_bus_tfe_out_id             tfe_out_res_id;
 
-	tfe_out_res_id = cam_tfe_bus_get_out_res_id(out_id);
-	if (tfe_out_res_id >= CAM_TFE_BUS_TFE_OUT_MAX) {
+	if (out_id >= CAM_TFE_BUS_TFE_OUT_MAX) {
 		CAM_ERR(CAM_ISP, "invalid out_id:%u", out_id);
 		return 0;
 	}
 
-	rsrc_node = &bus_priv->tfe_out[tfe_out_res_id];
+	rsrc_node = &bus_priv->tfe_out[out_id];
 	rsrc_data = rsrc_node->res_priv;
 	wm_rsrc_data = rsrc_data->wm_res[PLANE_Y]->res_priv;
 
@@ -2003,9 +1830,6 @@ static uint32_t cam_tfe_bus_get_last_consumed_addr(
 		wm_rsrc_data->common_data->mem_base +
 		wm_rsrc_data->hw_regs->addr_status_0);
 
-	CAM_DBG(CAM_ISP, "TFE:%u res_type:0x%x res_id:0x%x last_consumed_addr:0x%x",
-		bus_priv->common_data.core_index, out_id, tfe_out_res_id, val);
-
 	return val;
 }
 
@@ -2020,7 +1844,6 @@ static int cam_tfe_bus_bufdone_bottom_half(
 	struct cam_tfe_bus_comp_grp_data     *comp_rsrc_data;
 	struct cam_isp_hw_bufdone_event_info  bufdone_evt_info = {0};
 	uint32_t i;
-	struct cam_tfe_bus_wm_resource_data *wm_rsrc_data = NULL;
 
 	common_data = &bus_priv->common_data;
 
@@ -2032,31 +1855,31 @@ static int cam_tfe_bus_bufdone_bottom_half(
 		comp_rsrc_data = (struct cam_tfe_bus_comp_grp_data  *)
 			bus_priv->comp_grp[i].res_priv;
 
-		CAM_DBG(CAM_ISP, "i: %d irq: 0x%x comm_done: 0x%x com_grp: %d",
-			i, evt_payload->bus_irq_val[0], bus_priv->common_data.comp_done_shift,
-			comp_rsrc_data->comp_grp_id);
-
 		if (evt_payload->bus_irq_val[0] &
 			BIT(comp_rsrc_data->comp_grp_id +
 			bus_priv->common_data.comp_done_shift)) {
-				out_rsrc = comp_rsrc_data->out_rsrc[0];
-				out_rsrc_data = out_rsrc->res_priv;
-				evt_info.res_type = out_rsrc->res_type;
-				evt_info.hw_idx = out_rsrc->hw_intf->hw_idx;
-				evt_info.res_id = out_rsrc->res_id;
-				bufdone_evt_info.res_id = out_rsrc->res_id;
-				bufdone_evt_info.comp_grp_id = comp_rsrc_data->comp_grp_id;
-				wm_rsrc_data = out_rsrc_data->wm_res[PLANE_Y]->res_priv;
-				bufdone_evt_info.last_consumed_addr = cam_io_r_mb(
-					wm_rsrc_data->common_data->mem_base +
-					wm_rsrc_data->hw_regs->addr_status_0);
-				evt_info.event_data = (void *)&bufdone_evt_info;
-
-				if (out_rsrc_data->event_cb)
-					out_rsrc_data->event_cb(out_rsrc_data->priv,
-						CAM_ISP_HW_EVENT_DONE,
-						(void *)&evt_info);
+			out_rsrc = comp_rsrc_data->out_rsrc[0];
+			out_rsrc_data = out_rsrc->res_priv;
+			evt_info.res_type = out_rsrc->res_type;
+			evt_info.hw_idx = out_rsrc->hw_intf->hw_idx;
+			evt_info.res_id = out_rsrc->res_id;
+			bufdone_evt_info.res_id = out_rsrc->res_id;
+			bufdone_evt_info.comp_grp_id = comp_rsrc_data->comp_grp_id;
+			bufdone_evt_info.last_consumed_addr =
+				cam_tfe_bus_get_last_consumed_addr(
+					out_rsrc_data->bus_priv,
+					out_rsrc_data->out_id);
+			evt_info.event_data = (void *)&bufdone_evt_info;
+
+			if (out_rsrc_data->event_cb)
+				out_rsrc_data->event_cb(out_rsrc_data->priv,
+					CAM_ISP_HW_EVENT_DONE,
+					(void *)&evt_info);
 		}
+
+		evt_payload->bus_irq_val[0] &=
+			BIT(comp_rsrc_data->comp_grp_id +
+			bus_priv->common_data.comp_done_shift);
 	}
 
 	return 0;
@@ -2204,103 +2027,6 @@ end:
 
 }
 
-static int cam_tfe_bus_update_wm_config(void *priv, void *cmd_args,
-	uint32_t arg_size)
-{
-	struct cam_tfe_bus_priv                    *bus_priv;
-	struct cam_isp_hw_get_cmd_update           *update_wm_cmd;
-	struct cam_tfe_bus_tfe_out_data            *tfe_out_data = NULL;
-	struct cam_tfe_bus_wm_resource_data        *wm_data = NULL;
-	struct cam_isp_tfe_wm_dimension_config     *update_out_cfg;
-	uint32_t  i, rc = 0;
-
-	bus_priv = (struct cam_tfe_bus_priv  *) priv;
-	update_wm_cmd = (struct cam_isp_hw_get_cmd_update *) cmd_args;
-	update_out_cfg = (struct cam_isp_tfe_wm_dimension_config *) update_wm_cmd->data;
-
-	tfe_out_data = (struct cam_tfe_bus_tfe_out_data *) update_wm_cmd->res->res_priv;
-
-	if (!tfe_out_data) {
-		CAM_ERR(CAM_ISP, "Failed! invalid data");
-		return -EINVAL;
-	}
-
-	for (i = 0; i < tfe_out_data->num_wm; i++) {
-		wm_data = tfe_out_data->wm_res[i]->res_priv;
-		wm_data->is_dim_update = true;
-		wm_data->width = update_out_cfg->width;
-		wm_data->height = update_out_cfg->height;
-		CAM_DBG(CAM_ISP, "WM %d width %lld height %lld", wm_data->index,
-			wm_data->width, wm_data->height);
-	}
-
-	return rc;
-}
-
-static int cam_tfe_bus_diable_wm(void *priv, void *cmd_args,
-	uint32_t arg_size)
-{
-	struct cam_tfe_bus_priv              *bus_priv;
-	struct cam_isp_hw_get_cmd_update     *update_buf;
-	struct cam_tfe_bus_tfe_out_data      *tfe_out_data = NULL;
-	struct cam_tfe_bus_wm_resource_data  *wm_data = NULL;
-	struct cam_cdm_utils_ops             *cdm_util_ops = NULL;
-	uint32_t *reg_val_pair;
-	uint32_t num_regval_pairs = 0;
-	uint32_t i, j, size = 0;
-
-	bus_priv = (struct cam_tfe_bus_priv  *) priv;
-	update_buf = (struct cam_isp_hw_get_cmd_update *) cmd_args;
-	tfe_out_data = (struct cam_tfe_bus_tfe_out_data *) update_buf->res->res_priv;
-
-	if (!tfe_out_data || !(tfe_out_data->cdm_util_ops)) {
-		CAM_ERR(CAM_ISP, "Failed! invalid data");
-		return -EINVAL;
-	}
-
-	cdm_util_ops = tfe_out_data->cdm_util_ops;
-
-	reg_val_pair = &tfe_out_data->common_data->io_buf_update[0];
-	for (i = 0, j = 0; i < tfe_out_data->num_wm; i++) {
-		if (j >= (MAX_REG_VAL_PAIR_SIZE - MAX_BUF_UPDATE_REG_NUM * 2)) {
-			CAM_ERR(CAM_ISP,
-				"reg_val_pair %d exceeds the array limit %zu",
-				j, MAX_REG_VAL_PAIR_SIZE);
-			return -ENOMEM;
-		}
-		wm_data = tfe_out_data->wm_res[i]->res_priv;
-
-		CAM_TFE_ADD_REG_VAL_PAIR(reg_val_pair, j, wm_data->hw_regs->cfg, 0);
-		CAM_DBG(CAM_ISP, "WM:%d disabled cfg %x", wm_data->index, wm_data->hw_regs->cfg);
-	}
-
-	num_regval_pairs = j / 2;
-
-	if (num_regval_pairs) {
-		size = cdm_util_ops->cdm_required_size_reg_random(num_regval_pairs);
-
-		/* cdm util returns dwords, need to convert to bytes */
-		if ((size * 4) > update_buf->cmd.size) {
-			CAM_ERR(CAM_ISP,
-				"Failed! Buf size:%d insufficient, expected size:%d",
-				update_buf->cmd.size, size);
-			return -ENOMEM;
-		}
-
-		cdm_util_ops->cdm_write_regrandom(
-			update_buf->cmd.cmd_buf_addr,
-			num_regval_pairs, reg_val_pair);
-
-		/* cdm util returns dwords, need to convert to bytes */
-		update_buf->cmd.used_bytes = size * 4;
-	} else {
-		update_buf->cmd.used_bytes = 0;
-		CAM_DBG(CAM_ISP, "No reg val pairs. num_wms: %u", tfe_out_data->num_wm);
-	}
-
-	return 0;
-}
-
 static int cam_tfe_bus_update_wm(void *priv, void *cmd_args,
 	uint32_t arg_size)
 {
@@ -2309,7 +2035,7 @@ static int cam_tfe_bus_update_wm(void *priv, void *cmd_args,
 	struct cam_buf_io_cfg                *io_cfg;
 	struct cam_tfe_bus_tfe_out_data      *tfe_out_data = NULL;
 	struct cam_tfe_bus_wm_resource_data  *wm_data = NULL;
-	struct cam_cdm_utils_ops             *cdm_util_ops = NULL;
+	struct cam_cdm_utils_ops             *cdm_util_ops;
 	uint32_t *reg_val_pair;
 	uint32_t num_regval_pairs = 0;
 	uint32_t i, j, size = 0;
@@ -2321,13 +2047,13 @@ static int cam_tfe_bus_update_wm(void *priv, void *cmd_args,
 	tfe_out_data = (struct cam_tfe_bus_tfe_out_data *)
 		update_buf->res->res_priv;
 
-	if (!tfe_out_data || !(tfe_out_data->cdm_util_ops)) {
-		CAM_ERR(CAM_ISP, "Failed! invalid data");
+	cdm_util_ops = tfe_out_data->cdm_util_ops;
+
+	if (!tfe_out_data || !cdm_util_ops) {
+		CAM_ERR(CAM_ISP, "Failed! Invalid data");
 		return -EINVAL;
 	}
 
-	cdm_util_ops = tfe_out_data->cdm_util_ops;
-
 	if (update_buf->wm_update->num_buf != tfe_out_data->num_wm) {
 		CAM_ERR(CAM_ISP,
 			"Failed! Invalid number buffers:%d required:%d",
@@ -2348,8 +2074,7 @@ static int cam_tfe_bus_update_wm(void *priv, void *cmd_args,
 
 		wm_data = tfe_out_data->wm_res[i]->res_priv;
 		/* update width register */
-		val = ((wm_data->height << wm_data->common_data->height_shift) |
-			(wm_data->width & 0xFFFF));
+		val = ((wm_data->height << 16) | (wm_data->width & 0xFFFF));
 		CAM_TFE_ADD_REG_VAL_PAIR(reg_val_pair, j,
 			wm_data->hw_regs->image_cfg_0, val);
 		CAM_DBG(CAM_ISP, "WM:%d image height and width 0x%x",
@@ -2364,9 +2089,7 @@ static int cam_tfe_bus_update_wm(void *priv, void *cmd_args,
 		if ((wm_data->index < 7) || ((wm_data->index >= 7) &&
 			(wm_data->mode == CAM_ISP_TFE_WM_LINE_BASED_MODE)) ||
 			(wm_data->out_id == CAM_TFE_BUS_TFE_OUT_PDAF) ||
-			(wm_data->index >= 11 && wm_data->index <= 15) ||
-			(wm_data->index >= 17)) {
-
+			(wm_data->index >= 11 && wm_data->index <= 15)) {
 			CAM_TFE_ADD_REG_VAL_PAIR(reg_val_pair, j,
 				wm_data->hw_regs->image_cfg_2,
 				io_cfg->planes[i].plane_stride);
@@ -2378,9 +2101,6 @@ static int cam_tfe_bus_update_wm(void *priv, void *cmd_args,
 		frame_inc = io_cfg->planes[i].plane_stride *
 			io_cfg->planes[i].slice_height;
 
-		if (wm_data->is_buffer_aligned)
-			update_buf->wm_update->image_buf[i] += wm_data->buffer_offset;
-
 		CAM_TFE_ADD_REG_VAL_PAIR(reg_val_pair, j,
 			wm_data->hw_regs->image_addr,
 			update_buf->wm_update->image_buf[i]);
@@ -2428,38 +2148,6 @@ static int cam_tfe_bus_update_wm(void *priv, void *cmd_args,
 
 	return 0;
 }
-static int cam_tfe_buffer_alignment_update(void *priv, void *cmd_args,
-	uint32_t arg_size)
-{
-	struct cam_tfe_bus_priv                    *bus_priv;
-	struct cam_isp_hw_get_cmd_update           *alignment_cmd;
-	struct cam_tfe_bus_tfe_out_data            *tfe_out_data = NULL;
-	struct cam_tfe_bus_wm_resource_data        *wm_data = NULL;
-	struct cam_isp_tfe_alignment_offset_config *alignment_port_cfg = NULL;
-	uint32_t  i, rc = 0;
-
-	bus_priv = (struct cam_tfe_bus_priv  *) priv;
-	alignment_cmd = (struct cam_isp_hw_get_cmd_update *) cmd_args;
-	alignment_port_cfg = (struct cam_isp_tfe_alignment_offset_config *) alignment_cmd->data;
-
-	tfe_out_data = (struct cam_tfe_bus_tfe_out_data *) alignment_cmd->res->res_priv;
-
-	if (!tfe_out_data) {
-		CAM_ERR(CAM_ISP, "Failed! invalid data");
-		return -EINVAL;
-	}
-
-	for (i = 0; i < tfe_out_data->num_wm; i++) {
-		wm_data = tfe_out_data->wm_res[i]->res_priv;
-		wm_data->is_buffer_aligned = true;
-		wm_data->offset = alignment_port_cfg->x_offset;
-		wm_data->buffer_offset = alignment_port_cfg->y_offset;
-		CAM_DBG(CAM_ISP, "wm %d X-Offset %x Y-Offset %x", wm_data->index,
-			wm_data->offset, wm_data->buffer_offset);
-	}
-
-	return rc;
-}
 
 static int cam_tfe_bus_update_hfr(void *priv, void *cmd_args,
 	uint32_t arg_size)
@@ -2468,7 +2156,7 @@ static int cam_tfe_bus_update_hfr(void *priv, void *cmd_args,
 	struct cam_isp_hw_get_cmd_update         *update_hfr;
 	struct cam_tfe_bus_tfe_out_data          *tfe_out_data = NULL;
 	struct cam_tfe_bus_wm_resource_data      *wm_data = NULL;
-	struct cam_cdm_utils_ops                 *cdm_util_ops = NULL;
+	struct cam_cdm_utils_ops                 *cdm_util_ops;
 	struct cam_isp_tfe_port_hfr_config       *hfr_cfg = NULL;
 	uint32_t *reg_val_pair;
 	uint32_t num_regval_pairs = 0;
@@ -2480,12 +2168,13 @@ static int cam_tfe_bus_update_hfr(void *priv, void *cmd_args,
 	tfe_out_data = (struct cam_tfe_bus_tfe_out_data *)
 		update_hfr->res->res_priv;
 
-	if (!tfe_out_data || !(tfe_out_data->cdm_util_ops)) {
-		CAM_ERR(CAM_ISP, "Failed! invalid data");
+	cdm_util_ops = tfe_out_data->cdm_util_ops;
+
+	if (!tfe_out_data || !cdm_util_ops) {
+		CAM_ERR(CAM_ISP, "Failed! Invalid data");
 		return -EINVAL;
 	}
 
-	cdm_util_ops = tfe_out_data->cdm_util_ops;
 	reg_val_pair = &tfe_out_data->common_data->io_buf_update[0];
 	hfr_cfg = (struct cam_isp_tfe_port_hfr_config *)update_hfr->data;
 
@@ -2606,9 +2295,7 @@ static int cam_tfe_bus_get_res_id_for_mid(
 	struct cam_isp_hw_get_cmd_update   *cmd_update =
 		(struct cam_isp_hw_get_cmd_update   *)cmd_args;
 	struct cam_isp_hw_get_res_for_mid       *get_res = NULL;
-	uint32_t num_mid = 0, port_mid[CAM_TFE_BUS_TFE_OUT_MAX] = {0};
 	int i, j;
-	bool pid_found = false;
 
 	get_res = (struct cam_isp_hw_get_res_for_mid *)cmd_update->data;
 	if (!get_res) {
@@ -2626,23 +2313,11 @@ static int cam_tfe_bus_get_res_id_for_mid(
 
 		for (j = 0; j < CAM_TFE_BUS_MAX_MID_PER_PORT; j++) {
 			if (tfe_out_data->mid[j] == get_res->mid)
-				port_mid[num_mid++] = i;
-
+				goto end;
 		}
 	}
 
-	for (i = 0; i < num_mid; i++) {
-		tfe_out_data = (struct cam_tfe_bus_tfe_out_data  *)
-			bus_priv->tfe_out[port_mid[i]].res_priv;
-		get_res->out_res_id = bus_priv->tfe_out[port_mid[i]].res_id;
-		if (tfe_out_data->pid_mask & (1 << get_res->pid)) {
-			get_res->out_res_id = bus_priv->tfe_out[port_mid[i]].res_id;
-			pid_found = true;
-			goto end;
-		}
-	}
-
-	if (!num_mid) {
+	if (i == bus_priv->num_out) {
 		CAM_ERR(CAM_ISP,
 			"mid:%d does not match with any out resource",
 			get_res->mid);
@@ -2651,8 +2326,9 @@ static int cam_tfe_bus_get_res_id_for_mid(
 	}
 
 end:
-	CAM_INFO(CAM_ISP, "match mid :%d  out resource:%d found, is pid found %d",
-		get_res->mid, get_res->out_res_id, pid_found);
+	CAM_INFO(CAM_ISP, "match mid :%d  out resource:%d found",
+		get_res->mid, bus_priv->tfe_out[i].res_id);
+	get_res->out_res_id = bus_priv->tfe_out[i].res_id;
 	return 0;
 }
 
@@ -2873,49 +2549,15 @@ static int cam_tfe_bus_deinit_hw(void *hw_priv,
 	return rc;
 }
 
-static int cam_tfe_bus_check_overflow(
-	struct cam_tfe_bus_priv    *bus_priv,
-	void *cmd_args, uint32_t arg_size)
-{
-	struct cam_tfe_bus_wm_resource_data  *rsrc_data;
-	struct cam_isp_hw_overflow_info      *overflow_info = NULL;
-	uint32_t                             bus_overflow_status = 0, i = 0, tmp = 0;
-
-	overflow_info = (struct cam_isp_hw_overflow_info *)cmd_args;
-
-	bus_overflow_status  = cam_io_r(bus_priv->common_data.mem_base +
-		bus_priv->common_data.common_reg->overflow_status);
-
-	if (bus_overflow_status) {
-		overflow_info->is_bus_overflow = true;
-		CAM_INFO(CAM_ISP, "TFE[%d] Bus overflow status: 0x%x",
-				bus_priv->common_data.core_index, bus_overflow_status);
-	}
-
-	tmp = bus_overflow_status;
-	while (tmp) {
-		if (tmp & 0x1) {
-			rsrc_data = bus_priv->bus_client[i].res_priv;
-			CAM_ERR(CAM_ISP, "TFE[%d] WM : %d %s overflow",
-				bus_priv->common_data.core_index, i,
-				rsrc_data->hw_regs->client_name);
-		}
-		tmp = tmp >> 1;
-		i++;
-	}
-
-	return 0;
-}
-
 static int cam_tfe_bus_process_cmd(void *priv,
 	uint32_t cmd_type, void *cmd_args, uint32_t arg_size)
 {
 	struct cam_tfe_bus_priv      *bus_priv;
-	int rc = 0;
+	int rc = -EINVAL;
 	uint32_t i, val;
+	bool *support_consumed_addr;
 	bool *pdaf_rdi2_mux_en;
 	struct cam_isp_hw_done_event_data *done;
-	struct cam_isp_hw_cap *tfe_bus_cap;
 
 	if (!priv || !cmd_args) {
 		CAM_ERR_RATE_LIMIT(CAM_ISP, "Invalid input arguments");
@@ -2947,11 +2589,10 @@ static int cam_tfe_bus_process_cmd(void *priv,
 				bus_priv->common_data.common_reg->irq_mask[i]);
 		}
 		break;
-	case CAM_ISP_HW_CMD_QUERY_CAP:
+	case CAM_ISP_HW_CMD_IS_CONSUMED_ADDR_SUPPORT:
 		bus_priv = (struct cam_tfe_bus_priv  *) priv;
-		tfe_bus_cap = (struct cam_isp_hw_cap *) cmd_args;
-		tfe_bus_cap->max_out_res_type = bus_priv->max_out_res;
-		tfe_bus_cap->support_consumed_addr =
+		support_consumed_addr = (bool *)cmd_args;
+		*support_consumed_addr =
 			bus_priv->common_data.support_consumed_addr;
 		break;
 	case CAM_ISP_HW_CMD_GET_RES_FOR_MID:
@@ -2974,22 +2615,9 @@ static int cam_tfe_bus_process_cmd(void *priv,
 		done->last_consumed_addr = cam_tfe_bus_get_last_consumed_addr(
 			bus_priv, done->resource_handle);
 		break;
-	case CAM_ISP_HW_CMD_BUS_WM_DISABLE:
-		rc = cam_tfe_bus_diable_wm(priv, cmd_args, arg_size);
-		break;
-	case CAM_ISP_HW_NOTIFY_OVERFLOW:
-		rc = cam_tfe_bus_check_overflow(priv, cmd_args, arg_size);
-		break;
-	case CAM_ISP_HW_CMD_BUFFER_ALIGNMENT_UPDATE:
-		rc = cam_tfe_buffer_alignment_update(priv, cmd_args, arg_size);
-		break;
-	case CAM_ISP_HW_CMD_WM_CONFIG_UPDATE:
-		rc = cam_tfe_bus_update_wm_config(priv, cmd_args, arg_size);
-		break;
 	default:
 		CAM_ERR_RATE_LIMIT(CAM_ISP, "Invalid camif process command:%d",
 			cmd_type);
-		rc = -EINVAL;
 		break;
 	}
 
@@ -3007,7 +2635,6 @@ int cam_tfe_bus_init(
 	struct cam_tfe_bus_priv    *bus_priv = NULL;
 	struct cam_tfe_bus         *tfe_bus_local;
 	struct cam_tfe_bus_hw_info *hw_info = bus_hw_info;
-	struct cam_tfe_soc_private       *soc_private = NULL;
 
 	if (!soc_info || !hw_intf || !bus_hw_info) {
 		CAM_ERR(CAM_ISP,
@@ -3017,13 +2644,6 @@ int cam_tfe_bus_init(
 		goto end;
 	}
 
-	soc_private = soc_info->soc_private;
-	if (!soc_private) {
-		CAM_ERR(CAM_ISP, "Invalid soc_private");
-		rc = -ENODEV;
-		goto end;
-	}
-
 	tfe_bus_local = kzalloc(sizeof(struct cam_tfe_bus), GFP_KERNEL);
 	if (!tfe_bus_local) {
 		CAM_DBG(CAM_ISP, "Failed to alloc for tfe_bus");
@@ -3045,7 +2665,6 @@ int cam_tfe_bus_init(
 	bus_priv->num_comp_grp                 = hw_info->num_comp_grp;
 	bus_priv->max_wm_per_comp_grp          = hw_info->max_wm_per_comp_grp;
 	bus_priv->top_bus_wr_irq_shift         = hw_info->top_bus_wr_irq_shift;
-	bus_priv->max_out_res                  = hw_info->max_out_res;
 	bus_priv->common_data.comp_done_shift  = hw_info->comp_done_shift;
 
 	bus_priv->common_data.num_sec_out      = 0;
@@ -3065,15 +2684,16 @@ int cam_tfe_bus_init(
 	bus_priv->common_data.max_bw_counter_limit = hw_info->max_bw_counter_limit;
 	bus_priv->common_data.counter_limit_shift = hw_info->counter_limit_shift;
 	bus_priv->common_data.counter_limit_mask = hw_info->counter_limit_mask;
-	bus_priv->common_data.mode_cfg_shift = hw_info->mode_cfg_shift;
-	bus_priv->common_data.height_shift = hw_info->height_shift;
-	bus_priv->common_data.pack_align_shift = hw_info->pack_align_shift;
 
 	for (i = 0; i < CAM_TFE_BUS_IRQ_REGISTERS_MAX; i++)
 		bus_priv->bus_irq_error_mask[i] =
 			hw_info->bus_irq_error_mask[i];
 
-	bus_priv->common_data.is_lite = soc_private->is_tfe_lite;
+	if (strnstr(soc_info->compatible, "lite",
+		strlen(soc_info->compatible)) != NULL)
+		bus_priv->common_data.is_lite = true;
+	else
+		bus_priv->common_data.is_lite = false;
 
 	for (i = 0; i < CAM_TFE_BUS_RUP_GRP_MAX; i++)
 		bus_priv->common_data.rup_irq_enable[i] = false;
@@ -3188,7 +2808,7 @@ int cam_tfe_bus_deinit(
 				"Deinit Comp Grp failed rc=%d", rc);
 	}
 
-	for (i = 0; i < bus_priv->num_out; i++) {
+	for (i = 0; i < CAM_TFE_BUS_TFE_OUT_MAX; i++) {
 		rc = cam_tfe_bus_deinit_tfe_out_resource(
 			&bus_priv->tfe_out[i]);
 		if (rc < 0)

qcom/opensource/camera-kernel/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_bus.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 
@@ -12,7 +12,7 @@
 #include "cam_isp_hw.h"
 #include "cam_tfe_hw_intf.h"
 
-#define CAM_TFE_BUS_MAX_CLIENTS            19
+#define CAM_TFE_BUS_MAX_CLIENTS            16
 #define CAM_TFE_BUS_MAX_SUB_GRPS            4
 #define CAM_TFE_BUS_MAX_PERF_CNT_REG        8
 #define CAM_TFE_BUS_MAX_IRQ_REGISTERS       2
@@ -61,7 +61,6 @@ enum cam_tfe_bus_comp_grp_id {
 	CAM_TFE_BUS_COMP_GRP_8,
 	CAM_TFE_BUS_COMP_GRP_9,
 	CAM_TFE_BUS_COMP_GRP_10,
-	CAM_TFE_BUS_COMP_GRP_11,
 	CAM_TFE_BUS_COMP_GRP_MAX,
 };
 
@@ -70,7 +69,6 @@ enum cam_tfe_bus_rup_grp_id {
 	CAM_TFE_BUS_RUP_GRP_1,
 	CAM_TFE_BUS_RUP_GRP_2,
 	CAM_TFE_BUS_RUP_GRP_3,
-	CAM_TFE_BUS_RUP_GRP_4,
 	CAM_TFE_BUS_RUP_GRP_MAX,
 };
 
@@ -90,9 +88,6 @@ enum cam_tfe_bus_tfe_out_id {
 	CAM_TFE_BUS_TFE_OUT_DS4,
 	CAM_TFE_BUS_TFE_OUT_DS16,
 	CAM_TFE_BUS_TFE_OUT_AI,
-	CAM_TFE_BUS_TFE_OUT_PD_LCR_STATS,
-	CAM_TFE_BUS_TFE_OUT_PD_PREPROCESSED,
-	CAM_TFE_BUS_TFE_OUT_PD_PARSED,
 	CAM_TFE_BUS_TFE_OUT_MAX,
 };
 
@@ -150,7 +145,6 @@ struct cam_tfe_bus_reg_offset_bus_client {
 	uint32_t irq_subsample_pattern;
 	uint32_t framedrop_period;
 	uint32_t framedrop_pattern;
-	uint32_t system_cache_cfg;
 	uint32_t addr_status_0;
 	uint32_t addr_status_1;
 	uint32_t addr_status_2;
@@ -167,13 +161,12 @@ struct cam_tfe_bus_reg_offset_bus_client {
  * struct cam_tfe_bus_tfe_out_hw_info:
  *
  * @Brief:           HW capability of TFE Bus Client
- * tfe_out_id:       Tfe out port id
- * max_width:        Max width supported by the outport
- * max_height:       Max height supported by outport
- * composite_group:  Out port composite group id
- * rup_group_id:     Reg update group of outport id
+ * tfe_out_id        Tfe out port id
+ * max_width         Max width supported by the outport
+ * max_height        Max height supported by outport
+ * composite_group   Out port composite group id
+ * rup_group_id      Reg update group of outport id
  * mid:              ouport mid value
- * pid:              pid associated with mid
  */
 struct cam_tfe_bus_tfe_out_hw_info {
 	enum cam_tfe_bus_tfe_out_id         tfe_out_id;
@@ -182,7 +175,6 @@ struct cam_tfe_bus_tfe_out_hw_info {
 	uint32_t                            composite_group;
 	uint32_t                            rup_group_id;
 	uint32_t                            mid[CAM_TFE_BUS_MAX_MID_PER_PORT];
-	uint64_t                            pid_mask;
 };
 
 /*
@@ -197,8 +189,6 @@ struct cam_tfe_bus_tfe_out_hw_info {
  * @num_comp_grp:          Number of composite group
  * @max_wm_per_comp_grp:   Max number of wm associated with one composite group
  * @comp_done_shift:       Mask shift for comp done mask
- * @mode_cfg_shift:        Mask shift for mode config
- * @height_shift:          Mask shift for height shift
  * @top_bus_wr_irq_shift:  Mask shift for top level BUS WR irq
  * @comp_buf_done_mask:    Composite buf done bits mask
  * @comp_rup_done_mask:    Reg update done mask
@@ -209,9 +199,6 @@ struct cam_tfe_bus_tfe_out_hw_info {
  * @max_bw_counter_limit:  Max BW counter limit
  * @counter_limit_shift:   Mask shift for BW counter limit
  * @counter_limit_mask:    Default Mask of BW limit counter
- * @en_cfg_shift:          bus client frame based enable bit
- * @pack_align_shift:      pack alignment shift
- * @max_out_res:           Max tfe out resource value supported for hw
  */
 struct cam_tfe_bus_hw_info {
 	struct cam_tfe_bus_reg_offset_common common_reg;
@@ -224,8 +211,6 @@ struct cam_tfe_bus_hw_info {
 	uint32_t num_comp_grp;
 	uint32_t max_wm_per_comp_grp;
 	uint32_t comp_done_shift;
-	uint32_t mode_cfg_shift;
-	uint32_t height_shift;
 	uint32_t top_bus_wr_irq_shift;
 	uint32_t comp_buf_done_mask;
 	uint32_t comp_rup_done_mask;
@@ -236,8 +221,6 @@ struct cam_tfe_bus_hw_info {
 	uint32_t max_bw_counter_limit;
 	uint32_t counter_limit_shift;
 	uint32_t counter_limit_mask;
-	uint32_t pack_align_shift;
-	uint32_t max_out_res;
 };
 
 /*