Merge "msm: camera: isp: resolve csid stop race condition" into dev/msm-4.9-camx (f0bd00db) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+16 −55

Original line number	Diff line number	Diff line
		@@ -1497,9 +1497,9 @@ static int cam_ife_csid_deinit_ipp_path(
		struct cam_isp_resource_node *res)
		{
		int rc = 0;
		uint32_t val = 0;
		struct cam_ife_csid_reg_offset *csid_reg;
		struct cam_hw_soc_info *soc_info;
		uint32_t val = 0;

		csid_reg = csid_hw->csid_info->csid_reg;
		soc_info = &csid_hw->hw_info->soc_info;
		@@ -1596,10 +1596,10 @@ static int cam_ife_csid_disable_ipp_path(
		enum cam_ife_csid_halt_cmd stop_cmd)
		{
		int rc = 0;
		uint32_t val = 0;
		struct cam_ife_csid_reg_offset *csid_reg;
		struct cam_hw_soc_info *soc_info;
		struct cam_ife_csid_path_cfg *path_data;
		uint32_t val = 0;

		path_data = (struct cam_ife_csid_path_cfg *) res->res_priv;
		csid_reg = csid_hw->csid_info->csid_reg;
		@@ -1656,21 +1656,6 @@ static int cam_ife_csid_disable_ipp_path(

		/* For slave mode, halt command should take it from master */

		/* Enable the EOF interrupt for resume at boundary case */
		if (stop_cmd != CAM_CSID_HALT_IMMEDIATELY) {
		init_completion(&csid_hw->csid_ipp_complete);
		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
		csid_reg->ipp_reg->csid_ipp_irq_mask_addr);
		val \|= CSID_PATH_INFO_INPUT_EOF;
		cam_io_w_mb(val, soc_info->reg_map[0].mem_base +
		csid_reg->ipp_reg->csid_ipp_irq_mask_addr);
		} else {
		val &= ~(CSID_PATH_INFO_RST_DONE \|
		CSID_PATH_ERROR_FIFO_OVERFLOW);
		cam_io_w_mb(val, soc_info->reg_map[0].mem_base +
		csid_reg->ipp_reg->csid_ipp_irq_mask_addr);
		}

		return rc;
		}

		@@ -1811,9 +1796,9 @@ static int cam_ife_csid_deinit_rdi_path(
		struct cam_isp_resource_node *res)
		{
		int rc = 0;
		uint32_t val = 0, id;
		struct cam_ife_csid_reg_offset *csid_reg;
		struct cam_hw_soc_info *soc_info;
		uint32_t val = 0, id;

		csid_reg = csid_hw->csid_info->csid_reg;
		soc_info = &csid_hw->hw_info->soc_info;
		@@ -1889,9 +1874,9 @@ static int cam_ife_csid_disable_rdi_path(
		enum cam_ife_csid_halt_cmd stop_cmd)
		{
		int rc = 0;
		uint32_t id;
		struct cam_ife_csid_reg_offset *csid_reg;
		struct cam_hw_soc_info *soc_info;
		uint32_t val = 0, id;

		csid_reg = csid_hw->csid_info->csid_reg;
		soc_info = &csid_hw->hw_info->soc_info;
		@@ -1926,25 +1911,9 @@ static int cam_ife_csid_disable_rdi_path(
		return -EINVAL;
		}


		CAM_DBG(CAM_ISP, "CSID:%d res_id:%d",
		csid_hw->hw_intf->hw_idx, res->res_id);

		init_completion(&csid_hw->csid_rdin_complete[id]);

		if (stop_cmd != CAM_CSID_HALT_IMMEDIATELY) {
		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
		csid_reg->rdi_reg[id]->csid_rdi_irq_mask_addr);
		val \|= CSID_PATH_INFO_INPUT_EOF;
		cam_io_w_mb(val, soc_info->reg_map[0].mem_base +
		csid_reg->rdi_reg[id]->csid_rdi_irq_mask_addr);
		} else {
		val &= ~(CSID_PATH_INFO_RST_DONE \|
		CSID_PATH_ERROR_FIFO_OVERFLOW);
		cam_io_w_mb(val, soc_info->reg_map[0].mem_base +
		csid_reg->rdi_reg[id]->csid_rdi_irq_mask_addr);
		}

		/Halt the RDI path /
		cam_io_w_mb(stop_cmd, soc_info->reg_map[0].mem_base +
		csid_reg->rdi_reg[id]->csid_rdi_ctrl_addr);
		@@ -2029,12 +1998,10 @@ static int cam_ife_csid_res_wait_for_halt(
		struct cam_isp_resource_node *res)
		{
		int rc = 0;
		uint32_t val = 0, id, status, path_status_reg;
		struct cam_ife_csid_reg_offset *csid_reg;
		struct cam_hw_soc_info *soc_info;

		struct completion *complete;
		uint32_t val = 0, id;

		csid_reg = csid_hw->csid_info->csid_reg;
		soc_info = &csid_hw->hw_info->soc_info;

		@@ -2060,18 +2027,18 @@ static int cam_ife_csid_res_wait_for_halt(
		}

		if (res->res_id == CAM_IFE_PIX_PATH_RES_IPP)
		complete = &csid_hw->csid_ipp_complete;
		path_status_reg = csid_reg->ipp_reg->csid_ipp_status_addr;
		else
		complete = &csid_hw->csid_rdin_complete[res->res_id];
		path_status_reg = csid_reg->rdi_reg[res->res_id]->
		csid_rdi_status_addr;

		rc = wait_for_completion_timeout(complete,
		msecs_to_jiffies(IFE_CSID_TIMEOUT));
		if (rc <= 0) {
		CAM_ERR(CAM_ISP, "CSID%d stop at frame boundary failid:%drc:%d",
		csid_hw->hw_intf->hw_idx,
		res->res_id, rc);
		if (rc == 0)
		/* continue even have timeout */
		rc = readl_poll_timeout(soc_info->reg_map[0].mem_base +
		path_status_reg, status,
		(status == 1),
		CAM_IFE_CSID_TIMEOUT_SLEEP_US, CAM_IFE_CSID_TIMEOUT_ALL_US);
		if (rc < 0) {
		CAM_ERR(CAM_ISP, "Time out: Res id:%d Path has not halted",
		res->res_id);
		rc = -ETIMEDOUT;
		}

		@@ -2813,9 +2780,6 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data)
		CAM_ERR(CAM_ISP, "CSID:%d IPP EOF received",
		csid_hw->hw_intf->hw_idx);

		if (irq_status_ipp & CSID_PATH_INFO_INPUT_EOF)
		complete(&csid_hw->csid_ipp_complete);

		if (irq_status_ipp & CSID_PATH_ERROR_FIFO_OVERFLOW) {
		CAM_ERR(CAM_ISP, "CSID:%d IPP fifo over flow",
		csid_hw->hw_intf->hw_idx);
		@@ -2841,9 +2805,6 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data)
		(csid_hw->csid_debug & CSID_DEBUG_ENABLE_EOF_IRQ))
		CAM_ERR(CAM_ISP, "CSID RDI:%d EOF received", i);

		if (irq_status_rdi[i] & CSID_PATH_INFO_INPUT_EOF)
		complete(&csid_hw->csid_rdin_complete[i]);

		if (irq_status_rdi[i] & CSID_PATH_ERROR_FIFO_OVERFLOW) {
		CAM_ERR(CAM_ISP, "CSID:%d RDI fifo over flow",
		csid_hw->hw_intf->hw_idx);