Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25522a65 authored by Jigar Agrawal's avatar Jigar Agrawal
Browse files

msm: camera: csid: Add support for unmapped vc dt detection in csid 



Add a debugfs support for unmapped vc dt detction. Subscribe to
Unmapped vc dt detction in csid. Turn on debugfs with command
adb shell "echo 512 >> sys/kernel/debug/camera_ife/ife_csid_debug".

CRs-Fixed: 2709537
Change-Id: Ica2030f5914bfe86811f4f3c4501fa06dd310751
Signed-off-by: default avatarJigar Agrawal <jigar@codeaurora.org>
parent a2fdf71a

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+72 −2
Original line number Diff line number Diff line
@@ -2085,6 +2085,7 @@ static int cam_ife_csid_enable_pxl_path( 
	bool                                      is_ipp;

	uint32_t                                  val = 0;

	struct cam_isp_sensor_dimension          *path_config;

	unsigned int                              irq_mask_val = 0;



	path_data = (struct cam_ife_csid_path_cfg   *) res->res_priv;

	csid_reg = csid_hw->csid_info->csid_reg;
@@ -2118,6 +2119,25 @@ static int cam_ife_csid_enable_pxl_path( 


	CAM_DBG(CAM_ISP, "Enable %s path", (is_ipp) ? "IPP" : "PPP");



	if ((csid_hw->csid_debug & CSID_DEBUG_ENABLE_UNMAPPED_VC_DT_IRQ) &&

		(path_data->sync_mode != CAM_ISP_HW_SYNC_SLAVE)) {

		irq_mask_val =

			cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->csi2_reg->csid_csi2_rx_irq_mask_addr);



		if (!(irq_mask_val &

			CSID_CSI2_RX_ERROR_UNMAPPED_VC_DT)) {

			CAM_DBG(CAM_ISP,

				"Subscribing to UNMAPPED_VC_DT event for sync_mode: %d",

				path_data->sync_mode);

			irq_mask_val |=

				CSID_CSI2_RX_ERROR_UNMAPPED_VC_DT;

			cam_io_w_mb(irq_mask_val,

			soc_info->reg_map[0].mem_base +

				csid_reg->csi2_reg->csid_csi2_rx_irq_mask_addr);

		}

	}



	/* Set master or slave path */

	if (path_data->sync_mode == CAM_ISP_HW_SYNC_MASTER) {

		/*Set halt mode as master */
@@ -2756,6 +2776,7 @@ static int cam_ife_csid_enable_rdi_path( 
{

	const struct cam_ife_csid_reg_offset      *csid_reg;

	struct cam_hw_soc_info                    *soc_info;

	unsigned int                               irq_mask_val = 0;

	uint32_t id, val;



	csid_reg = csid_hw->csid_info->csid_reg;
@@ -2772,6 +2793,22 @@ static int cam_ife_csid_enable_rdi_path( 
		return -EINVAL;

	}



	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_UNMAPPED_VC_DT_IRQ) {

		irq_mask_val =

			cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->csi2_reg->csid_csi2_rx_irq_mask_addr);



		if (!(irq_mask_val &

			CSID_CSI2_RX_ERROR_UNMAPPED_VC_DT)) {

			CAM_DBG(CAM_ISP, "Subscribing to UNMAPPED_VC_DT event");

			irq_mask_val |=

				CSID_CSI2_RX_ERROR_UNMAPPED_VC_DT;

			cam_io_w_mb(irq_mask_val,

				soc_info->reg_map[0].mem_base +

				csid_reg->csi2_reg->csid_csi2_rx_irq_mask_addr);

		}

	}



	/*resume at frame boundary */

	cam_io_w_mb(CAM_CSID_RESUME_AT_FRAME_BOUNDARY,

			soc_info->reg_map[0].mem_base +
@@ -2809,6 +2846,7 @@ static int cam_ife_csid_enable_udi_path( 
{

	const struct cam_ife_csid_reg_offset      *csid_reg;

	struct cam_hw_soc_info                    *soc_info;

	unsigned int                               irq_mask_val = 0;

	uint32_t id, val;



	csid_reg = csid_hw->csid_info->csid_reg;
@@ -2826,6 +2864,23 @@ static int cam_ife_csid_enable_udi_path( 
		return -EINVAL;

	}



	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_UNMAPPED_VC_DT_IRQ) {

		irq_mask_val =

			cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->csi2_reg->csid_csi2_rx_irq_mask_addr);



		if (!(irq_mask_val &

			CSID_CSI2_RX_ERROR_UNMAPPED_VC_DT)) {

			CAM_DBG(CAM_ISP,

				"Subscribing to UNMAPPED_VC_DT event");

			irq_mask_val |=

				CSID_CSI2_RX_ERROR_UNMAPPED_VC_DT;

			cam_io_w_mb(irq_mask_val,

			soc_info->reg_map[0].mem_base +

			csid_reg->csi2_reg->csid_csi2_rx_irq_mask_addr);

		}

	}



	/*resume at frame boundary */

	cam_io_w_mb(CAM_CSID_RESUME_AT_FRAME_BOUNDARY,

		soc_info->reg_map[0].mem_base +
@@ -3733,7 +3788,6 @@ int cam_ife_csid_start(void *hw_priv, void *start_args, 
	if (!csid_hw->device_enabled)

		cam_ife_csid_csi2_irq_ctrl(csid_hw, true);

	csid_hw->device_enabled = 1;

	spin_unlock_irqrestore(&csid_hw->lock_state, flags);



	CAM_DBG(CAM_ISP, "CSID:%d res_type :%d res_id:%d",

		csid_hw->hw_intf->hw_idx, res->res_type, res->res_id);
@@ -3759,7 +3813,7 @@ int cam_ife_csid_start(void *hw_priv, void *start_args, 
		} else {

			CAM_ERR(CAM_ISP, "Invalid res_id: %u", res->res_id);

			rc = -EINVAL;

			goto end;

			goto irq_restore;

		}



		break;
@@ -3769,6 +3823,8 @@ int cam_ife_csid_start(void *hw_priv, void *start_args, 
			res->res_type);

		break;

	}

irq_restore:

	spin_unlock_irqrestore(&csid_hw->lock_state, flags);

end:

	return rc;

}
@@ -4656,6 +4712,20 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data) 
			CAM_ERR_RATE_LIMIT(CAM_ISP, "CSID:%d MMAPPED_VC_DT",

				csid_hw->hw_intf->hw_idx);

		}

		if ((irq_status[CAM_IFE_CSID_IRQ_REG_RX] &

			CSID_CSI2_RX_ERROR_UNMAPPED_VC_DT) &&

			(csid_hw->csid_debug &

				CSID_DEBUG_ENABLE_UNMAPPED_VC_DT_IRQ)) {



			val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csi2_reg->csid_csi2_rx_captured_long_pkt_0_addr);



			CAM_ERR_RATE_LIMIT(CAM_ISP,

				"CSID:%d UNMAPPED_VC_DT. VC: %d DT: %d WC: %d",

				csid_hw->hw_intf->hw_idx, (val >> 22),

				((val >> 16) & 0x3F), (val & 0xFFFF));

			csid_hw->error_irq_count++;

		}

		if (irq_status[CAM_IFE_CSID_IRQ_REG_RX] &

			CSID_CSI2_RX_ERROR_STREAM_UNDERFLOW) {

			CAM_ERR_RATE_LIMIT(CAM_ISP,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
#define CSID_DEBUG_ENABLE_CPHY_PKT_CAPTURE        BIT(6)

#define CSID_DEBUG_ENABLE_HBI_VBI_INFO            BIT(7)

#define CSID_DEBUG_DISABLE_EARLY_EOF              BIT(8)

#define CSID_DEBUG_ENABLE_UNMAPPED_VC_DT_IRQ      BIT(9)



#define CAM_CSID_EVT_PAYLOAD_MAX                  10

#define CAM_CSID_MIN_HBI_CFG_MAX_VAL              0xF