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

Commit e990f992 authored by Chandan Kumar Jha's avatar Chandan Kumar Jha Committed by Vishalsingh Hajeri
Browse files

msm: camera: isp: Ignore other csid irq errors during csid top reset 



During global reset, csi rx irq bits are set since sensor/phy was not
reset properly in last closure and sending some data. This can lead
to csid fatal or non-fatal errors.
To avoid this condition, ignore other csid irq errors during csid top
reset and during csid stop sequence.

CRs-Fixed: 2585726
Change-Id: I5e09caf3b374407ece8ff1b871c2cf7e0f1837ac
Signed-off-by: default avatarChandan Kumar Jha <cjha@codeaurora.org>
Signed-off-by: default avatarDepeng Shao <depengs@codeaurora.org>
Signed-off-by: default avatarVishalsingh Hajeri <vhajeri@codeaurora.org>
parent d324acfb

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

+22 −0
Original line number Diff line number Diff line
@@ -3302,6 +3302,8 @@ static int cam_ife_csid_reset_regs( 


	spin_lock_irqsave(&csid_hw->hw_info->hw_lock, flags);



	csid_hw->is_resetting = true;



	/* clear the top interrupt first */

	cam_io_w_mb(1, soc_info->reg_map[0].mem_base +

		csid_reg->cmn_reg->csid_top_irq_clear_addr);
@@ -3366,6 +3368,7 @@ static int cam_ife_csid_reset_regs( 
			rem_jiffies);



end:

	csid_hw->is_resetting = false;

	return rc;

}
@@ -3540,6 +3543,7 @@ int cam_ife_csid_start(void *hw_priv, void *start_args, 
	struct cam_hw_info                     *csid_hw_info;

	struct cam_isp_resource_node           *res;

	const struct cam_ife_csid_reg_offset   *csid_reg;

	unsigned long                           flags;



	if (!hw_priv || !start_args ||

		(arg_size != sizeof(struct cam_isp_resource_node))) {
@@ -3567,6 +3571,10 @@ int cam_ife_csid_start(void *hw_priv, void *start_args, 
	csid_hw->sof_irq_triggered = false;

	csid_hw->irq_debug_cnt = 0;



	spin_lock_irqsave(&csid_hw->lock_state, flags);

	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);
@@ -3615,6 +3623,7 @@ int cam_ife_csid_stop(void *hw_priv, 
	struct cam_csid_hw_stop_args         *csid_stop;

	uint32_t  i;

	uint32_t res_mask = 0;

	unsigned long flags;



	if (!hw_priv || !stop_args ||

		(arg_size != sizeof(struct cam_csid_hw_stop_args))) {
@@ -3677,6 +3686,10 @@ int cam_ife_csid_stop(void *hw_priv, 
		}

	}



	spin_lock_irqsave(&csid_hw->lock_state, flags);

	csid_hw->device_enabled = 0;

	spin_unlock_irqrestore(&csid_hw->lock_state, flags);



	if (res_mask)

		rc = cam_ife_csid_poll_stop_status(csid_hw, res_mask);
@@ -4065,6 +4078,14 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data) 
	if (irq_status_top & CSID_TOP_IRQ_DONE) {

		CAM_DBG(CAM_ISP, "csid top reset complete");

		complete(&csid_hw->csid_top_complete);

		csid_hw->is_resetting = false;

		return IRQ_HANDLED;

	}



	if (csid_hw->is_resetting) {

		CAM_DBG(CAM_ISP, "CSID:%d is resetting, IRQ Handling exit",

			csid_hw->hw_intf->hw_idx);

		return IRQ_HANDLED;

	}



	if (irq_status_rx & BIT(csid_reg->csi2_reg->csi2_rst_done_shift_val)) {
@@ -4446,6 +4467,7 @@ int cam_ife_csid_hw_probe_init(struct cam_hw_intf *csid_hw_intf, 




	ife_csid_hw->device_enabled = 0;

	ife_csid_hw->is_resetting = false;

	ife_csid_hw->hw_info->hw_state = CAM_HW_STATE_POWER_DOWN;

	mutex_init(&ife_csid_hw->hw_info->hw_mutex);

	spin_lock_init(&ife_csid_hw->hw_info->hw_lock);

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

+2 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ struct cam_ife_csid_path_cfg { 
 * @clk_rate                  Clock rate

 * @sof_irq_triggered:        Flag is set on receiving event to enable sof irq

 *                            incase of SOF freeze.

 * @is_resetting:             informs whether reset is started or not.

 * @irq_debug_cnt:            Counter to track sof irq's when above flag is set.

 * @error_irq_count           Error IRQ count, if continuous error irq comes

 *                            need to stop the CSID and mask interrupts.
@@ -580,6 +581,7 @@ struct cam_ife_csid_hw { 
	uint64_t                         csid_debug;

	uint64_t                         clk_rate;

	bool                             sof_irq_triggered;

	bool                             is_resetting;

	uint32_t                         irq_debug_cnt;

	uint32_t                         error_irq_count;

	uint32_t                         device_enabled;