Merge tag 'camera-kernel.qclinux.1.0-260118' into 00

* tag 'camera-kernel.qclinux.1.0-260118':
  msm: camera: isp: fix csid camif and vfe headers for qcs615
  msm: camera: isp: handle comp overwrite error on vfe bus
  msm: camera: isp: ignoring reg read of primary SOF ts addr for QCS615
  msm: camera: isp: RDI-only ctx on non-EPOCH targets
  msm: camera: req_mgr: Correcting always false if case
  msm: camera: sensor: enable sysfs utility config flags for qcs615
  msm: camera: cci: fixing i2c write time delay variable overflow
  msm: camera: jpeg: fix DMA reset sequence
  msm: camera: common: Enable Talos camera support

Change-Id: If202d647028687d0dafa3d91e5a1bab187bc568b
Signed-off-by: Chandan Kumar Jha <cjha@qti.qualcomm.com>

Author: cjha01

Makefile

@@ -1,7 +1,7 @@
 KBUILD_OPTIONS += CAMERA_KERNEL_ROOT=$(shell pwd)
 KBUILD_OPTIONS += KERNEL_ROOT=$(ROOT_DIR)/$(KERNEL_DIR)
 KBUILD_OPTIONS += INSTALL_MOD_DIR=camera
-SUPPORTED_ARCH = qcm6490 qcs9100
+SUPPORTED_ARCH = qcm6490 qcs9100 qcs615
 
 .PHONY: clean all
 

camera/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -2330,6 +2330,8 @@ static int cam_ife_hw_mgr_acquire_res_ife_out_rdi(
 			comp_grp = &c_ctx->vfe_bus_comp_grp[index];
 			comp_grp->res_id[comp_grp->num_res] = vfe_out_res_id;
 			comp_grp->num_res++;
+			CAM_DBG(CAM_ISP, "index %d comp_grp->num_res %d",
+					index, comp_grp->num_res);
 		}
 		break;
 	}
@@ -2527,6 +2529,11 @@ static int cam_ife_hw_mgr_acquire_res_ife_out_pixel(
 					comp_grp->res_id[comp_grp->num_res] =
 						ife_out_res->hw_res[j]->res_id;
 					comp_grp->num_res++;
+					CAM_DBG(CAM_ISP,
+							"index %d update_only %d num_res %d ctx:%u",
+							index, update_only, comp_grp->num_res,
+							c_ctx->ctx_index);
+
 				}
 			}
 
@@ -5843,6 +5850,8 @@ static int cam_ife_mgr_acquire_get_unified_structure_v0(
 		in_port->data[i].split_point  = in->data_flex[i].split_point;
 		in_port->data[i].secure_mode  = in->data_flex[i].secure_mode;
 		in_port->data[i].reserved     = in->data_flex[i].reserved;
+		CAM_DBG(CAM_ISP, "res_type 0x%x comp_grp_id %d", in_port->data[i].res_type,
+				in_port->data[i].comp_grp_id);
 	}
 
 	return 0;
@@ -5966,6 +5975,8 @@ static int cam_ife_mgr_acquire_get_unified_structure_v3(
 		in_port->data[i].secure_mode  = in->data_flex[i].secure_mode;
 		in_port->data[i].wm_mode      = in->data_flex[i].wm_mode;
 		in_port->data[i].hw_context_id   = in->data_flex[i].context_id;
+		CAM_DBG(CAM_ISP, "res_type 0x%x comp_grp_id %d", in_port->data[i].res_type,
+				in_port->data[i].comp_grp_id);
 	}
 
 	return 0;
@@ -6097,6 +6108,8 @@ static int cam_ife_mgr_acquire_get_unified_structure_v2(
 		in_port->data[i].comp_grp_id  = in->data_flex[i].comp_grp_id;
 		in_port->data[i].split_point  = in->data_flex[i].split_point;
 		in_port->data[i].secure_mode  = in->data_flex[i].secure_mode;
+		CAM_DBG(CAM_ISP, "res_type 0x%x comp_grp_id %d", in_port->data[i].res_type,
+				in_port->data[i].comp_grp_id);
 	}
 
 	return 0;
@@ -15317,11 +15330,25 @@ static int cam_ife_mgr_int_cmd(void                        *hw_mgr_priv,
 			isp_hw_cmd_args->u.sof_irq_enable);
 		break;
 	case CAM_ISP_HW_MGR_CMD_CTX_TYPE:
+		CAM_DBG(CAM_ISP, "Is rdi_epoch_config_not_supported : %d",
+				hw_mgr->rdi_epoch_config_not_supported);
 		if (c_ctx->flags.is_fe_enabled && c_ctx->flags.is_offline)
 			isp_hw_cmd_args->u.ctx_info.type = CAM_ISP_CTX_OFFLINE;
 		else if (c_ctx->flags.is_fe_enabled && !c_ctx->flags.is_offline &&
 				c_ctx->ctx_type != CAM_IFE_CTX_TYPE_SFE)
 			isp_hw_cmd_args->u.ctx_info.type = CAM_ISP_CTX_FS2;
+		/*
+		 * For older tagets, RDI does not support EPOCH configuration,
+		 * so unified state machine is not applicable and use RDI-only
+		 * ISP context state machine for RDI use cases.
+		 *
+		 * On newer targets, RDI supports EPOCH configuration and can use
+		 * the unified ISP context state machine (PIX/RDI).
+		 */
+		else if ((c_ctx->flags.is_rdi_only_context ||
+				c_ctx->flags.is_lite_context) &&
+				(hw_mgr->rdi_epoch_config_not_supported))
+			isp_hw_cmd_args->u.ctx_info.type = CAM_ISP_CTX_RDI;
 		else
 			isp_hw_cmd_args->u.ctx_info.type = CAM_ISP_CTX_PIX;
 		if (hw_mgr->csid_aup_rup_en)
@@ -17005,20 +17032,20 @@ static int cam_ife_hw_mgr_handle_hw_buf_done(
 	CAM_DBG(CAM_ISP,
 		"Buf done for %s: %d res_id: 0x%x last consumed addr: 0x%x ctx: %u",
 		((event_info->hw_type == CAM_ISP_HW_TYPE_SFE) ? "SFE" : "IFE"),
-		event_info->hw_idx, event_info->res_id,
+		event_info->hw_idx, bufdone_evt_info->res_id,
 		bufdone_evt_info->last_consumed_addr, c_ctx->ctx_index);
 
 	/* Check scratch for sHDR/FS use-cases */
 	if (c_ctx->flags.is_sfe_fs || c_ctx->flags.is_sfe_shdr) {
 		rc = cam_ife_hw_mgr_check_for_scratch_buf_done(ife_hw_mgr_ctx,
-			event_info->hw_type, event_info->res_id,
+			event_info->hw_type, bufdone_evt_info->res_id,
 			bufdone_evt_info->last_consumed_addr);
 		if (rc)
 			return 0;
 	}
 
 	buf_done_event_data.hw_type = event_info->hw_type;
-	buf_done_event_data.resource_handle = event_info->res_id;
+	buf_done_event_data.resource_handle = bufdone_evt_info->res_id;
 	buf_done_event_data.last_consumed_addr = bufdone_evt_info->last_consumed_addr;
 	buf_done_event_data.comp_group_id = bufdone_evt_info->comp_grp_id;
 
@@ -17027,8 +17054,9 @@ static int cam_ife_hw_mgr_handle_hw_buf_done(
 
 	if (buf_done_event_data.resource_handle > 0 && ife_hwr_irq_wm_done_cb) {
 		CAM_DBG(CAM_ISP,
-			"Notify ISP context for %u handles in ctx: %u",
-			buf_done_event_data.resource_handle, c_ctx->ctx_index);
+			"Notify ISP context for %u handles in ctx: %u comp_grp_id %d",
+			buf_done_event_data.resource_handle, c_ctx->ctx_index,
+			buf_done_event_data.comp_group_id);
 		ife_hwr_irq_wm_done_cb(ife_hw_mgr_ctx->cb_priv,
 			CAM_ISP_HW_EVENT_DONE, (void *)&buf_done_event_data);
 	}
@@ -17292,6 +17320,8 @@ static int cam_ife_hw_mgr_sort_dev_with_caps(
 			ife_hw_mgr->csid_hw_caps[i].global_reset_en;
 		ife_hw_mgr->csid_aup_rup_en =
 			ife_hw_mgr->csid_hw_caps[i].aup_rup_en;
+		ife_hw_mgr->rdi_epoch_config_not_supported =
+			ife_hw_mgr->csid_hw_caps[i].rdi_epoch_config_not_supported;
 		ife_hw_mgr->csid_camif_irq_support =
 			ife_hw_mgr->csid_hw_caps[i].camif_irq_support;
 	}

camera/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.h

@@ -675,6 +675,7 @@ enum cam_isp_irq_inject_common_param_pos {
  * @min_clk_threshold:     Min sfe clock
  * @offline_reconfig:      offline ISP need to reconfigure or not
  * @offline_outport_sync:  Offline ISP HW needs to check outport to sync with correct hw
+ * @rdi_epoch_config_not_supported:    is RDI epoch config supported
  */
 struct cam_ife_hw_mgr {
 	struct cam_isp_hw_mgr          mgr_common;
@@ -722,6 +723,7 @@ struct cam_ife_hw_mgr {
 	uint32_t                         bytes_per_clk;
 	bool                             offline_reconfig;
 	bool                             offline_outport_sync;
+	bool                             rdi_epoch_config_not_supported;
 };
 
 /**

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid170.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 #ifndef _CAM_IFE_CSID_170_H_
 #define _CAM_IFE_CSID_170_H_
@@ -64,7 +65,7 @@ static struct cam_ife_csid_ver1_path_reg_info
 	.halt_immediate                 = 2,
 	.halt_cmd_shift                 = 0,
 	.early_eof_en_shift_val         = 29,
-	.timestamp_en_shift_val         = 2,
+	.timestamp_en_shift_val         = 1,
 	.format_measure_en_shift_val    = 0,
 	.fatal_err_mask                 = 0x4,
 	.non_fatal_err_mask             = 0xe000,
@@ -120,7 +121,7 @@ static struct cam_ife_csid_ver1_path_reg_info
 	.plain_fmt_shift_val             = 10,
 	.crop_v_en_shift_val             = 6,
 	.crop_h_en_shift_val             = 5,
-	.timestamp_en_shift_val          = 1,
+	.timestamp_en_shift_val          = 2,
 	.format_measure_en_shift_val     = 1,
 	.fatal_err_mask                  = 0x4,
 	.non_fatal_err_mask              = 0xe000,
@@ -176,7 +177,7 @@ static struct cam_ife_csid_ver1_path_reg_info
 	.plain_fmt_shift_val             = 10,
 	.crop_v_en_shift_val             = 6,
 	.crop_h_en_shift_val             = 5,
-	.timestamp_en_shift_val          = 1,
+	.timestamp_en_shift_val          = 2,
 	.format_measure_en_shift_val     = 1,
 	.fatal_err_mask                  = 0x4,
 	.non_fatal_err_mask              = 0xe000,
@@ -233,7 +234,7 @@ static struct cam_ife_csid_ver1_path_reg_info
 	.plain_fmt_shift_val             = 10,
 	.crop_v_en_shift_val             = 6,
 	.crop_h_en_shift_val             = 5,
-	.timestamp_en_shift_val          = 1,
+	.timestamp_en_shift_val          = 2,
 	.format_measure_en_shift_val     = 1,
 	.fatal_err_mask                  = 0x4,
 	.non_fatal_err_mask              = 0xe000,
@@ -385,12 +386,14 @@ static struct cam_ife_csid_ver1_common_reg_info
 	.rdi_irq_mask_all                = 0x7FFF,
 	.ppp_irq_mask_all                = 0x0,
 	.measure_en_hbi_vbi_cnt_mask     = 0xC,
+	.measure_pixel_line_en_mask      = 0x3,
 	.timestamp_strobe_val            = 0x2,
 	.timestamp_stb_sel_shift_val     = 0,
 	.format_measure_height_mask_val  = 0xFFFF,
 	.format_measure_height_shift_val = 0x10,
 	.format_measure_width_mask_val   = 0xFFFF,
 	.format_measure_width_shift_val  = 0x0,
+	.rdi_epoch_config_not_supported  = 1,
 };
 
 static struct cam_ife_csid_ver1_reg_info cam_ife_csid_170_reg_info = {

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver1.c

@@ -299,6 +299,7 @@ static int cam_ife_csid_ver1_get_hw_caps(void *hw_priv,
 	hw_caps->version_incr = csid_reg->cmn_reg->version_incr;
 	hw_caps->global_reset_en = csid_reg->cmn_reg->global_reset;
 	hw_caps->aup_rup_en = csid_reg->cmn_reg->aup_rup_supported;
+	hw_caps->rdi_epoch_config_not_supported = csid_reg->cmn_reg->rdi_epoch_config_not_supported;
 	hw_caps->is_lite = soc_private->is_ife_csid_lite;
 
 	CAM_DBG(CAM_ISP,
@@ -3469,6 +3470,7 @@ static int cam_ife_csid_ver1_get_time_stamp(
 	struct cam_ife_csid_ver1_reg_info *csid_reg;
 	struct timespec64 ts;
 	uint32_t curr_0_sof_addr, curr_1_sof_addr;
+	uint32_t prev_0_sof_addr, prev_1_sof_addr;
 
 	timestamp_args = (struct cam_csid_get_time_stamp_args *)cmd_args;
 	res = timestamp_args->node_res;
@@ -3495,10 +3497,14 @@ static int cam_ife_csid_ver1_get_time_stamp(
 	case CAM_IFE_PIX_PATH_RES_IPP:
 		curr_0_sof_addr = csid_reg->ipp_reg->timestamp_curr0_sof_addr;
 		curr_1_sof_addr = csid_reg->ipp_reg->timestamp_curr1_sof_addr;
+		prev_0_sof_addr = csid_reg->ipp_reg->timestamp_prev0_sof_addr;
+		prev_1_sof_addr = csid_reg->ipp_reg->timestamp_prev1_sof_addr;
 		break;
 	case CAM_IFE_PIX_PATH_RES_PPP:
 		curr_0_sof_addr = csid_reg->ppp_reg->timestamp_curr0_sof_addr;
 		curr_1_sof_addr = csid_reg->ppp_reg->timestamp_curr1_sof_addr;
+		prev_0_sof_addr = csid_reg->ppp_reg->timestamp_prev0_sof_addr;
+		prev_1_sof_addr = csid_reg->ppp_reg->timestamp_prev1_sof_addr;
 		break;
 	case CAM_IFE_PIX_PATH_RES_RDI_0:
 	case CAM_IFE_PIX_PATH_RES_RDI_1:
@@ -3511,13 +3517,30 @@ static int cam_ife_csid_ver1_get_time_stamp(
 		curr_1_sof_addr =
 			csid_reg->rdi_reg
 			[res->res_id]->timestamp_curr1_sof_addr;
+		prev_0_sof_addr =
+			csid_reg->rdi_reg
+			[res->res_id]->timestamp_prev0_sof_addr;
+		prev_1_sof_addr =
+			csid_reg->rdi_reg
+			[res->res_id]->timestamp_prev1_sof_addr;
 	break;
 	default:
 		CAM_ERR(CAM_ISP, "CSID:%d invalid res %d",
 			csid_hw->hw_intf->hw_idx, res->res_id);
 		return -EINVAL;
 	}
 
+	time_hi = cam_io_r_mb(soc_info->reg_map[0].mem_base +
+			prev_1_sof_addr);
+	time_lo = cam_io_r_mb(soc_info->reg_map[0].mem_base +
+			prev_0_sof_addr);
+	timestamp_args->prev_time_stamp_val = (time_hi << 32) | time_lo;
+
+	timestamp_args->prev_time_stamp_val = mul_u64_u32_div(
+		timestamp_args->prev_time_stamp_val,
+		CAM_IFE_CSID_QTIMER_MUL_FACTOR,
+		CAM_IFE_CSID_QTIMER_DIV_FACTOR);
+
 	time_hi = cam_io_r_mb(soc_info->reg_map[0].mem_base +
 			curr_1_sof_addr);
 	time_lo = cam_io_r_mb(soc_info->reg_map[0].mem_base +
@@ -3789,6 +3812,10 @@ static int cam_ife_csid_ver1_process_cmd(void *hw_priv,
 	case CAM_ISP_HW_CMD_CSID_CHANGE_HALT_MODE:
 		rc = cam_ife_csid_halt(csid_hw, cmd_args);
 		break;
+	case CAM_ISP_HW_CMD_GET_SET_PRIM_SOF_TS_ADDR:
+		/* Not supported for V1 */
+		rc = 0;
+		break;
 	case CAM_ISP_HW_CMD_CSID_DISCARD_INIT_FRAMES:
 		/* Not supported for V1 */
 		rc = 0;

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver1.h

@@ -119,6 +119,7 @@ struct cam_ife_csid_ver1_common_reg_info {
 	uint32_t early_eof_supported;
 	uint32_t global_reset;
 	uint32_t aup_rup_supported;
+	uint32_t rdi_epoch_config_not_supported;
 
 	/* Masks */
 	uint32_t ipp_irq_mask_all;

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -2479,6 +2479,7 @@ static int cam_ife_csid_ver2_get_hw_caps(void *hw_priv,
 	hw_caps->version_incr = csid_reg->cmn_reg->version_incr;
 	hw_caps->global_reset_en = csid_reg->cmn_reg->global_reset;
 	hw_caps->aup_rup_en = csid_reg->cmn_reg->aup_rup_supported;
+	hw_caps->rdi_epoch_config_not_supported = csid_reg->cmn_reg->rdi_epoch_config_not_supported;
 	hw_caps->only_master_rup = csid_reg->cmn_reg->only_master_rup;
 	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;

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.h

@@ -665,6 +665,7 @@ struct cam_ife_csid_ver2_common_reg_info {
 	uint32_t early_eof_supported;
 	uint32_t global_reset;
 	uint32_t aup_rup_supported;
+	uint32_t rdi_epoch_config_not_supported;
 	uint32_t only_master_rup;
 	uint32_t sfe_ipp_input_rdi_res;
 	uint32_t phy_sel_base_idx;