Merge "msm: camera: isp: Ignore other csid irq errors during csid top reset"... (b6b4e93f) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -3377,6 +3377,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);
		@@ -3440,6 +3442,7 @@ static int cam_ife_csid_reset_regs(
		rem_jiffies);

		end:
		csid_hw->is_resetting = false;
		return rc;
		}

		@@ -4195,6 +4198,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)) {
		@@ -4638,6 +4649,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);

+2 −0

Original line number	Diff line number	Diff line
		@@ -553,6 +553,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.
		@@ -591,6 +592,7 @@ struct cam_ife_csid_hw {
		uint32_t hbi;
		uint32_t vbi;
		bool sof_irq_triggered;
		bool is_resetting;
		uint32_t irq_debug_cnt;
		uint32_t error_irq_count;
		uint32_t device_enabled;