Merge "msm: camera: isp: Handle page fault in case of overflow" (1e1dee58) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+38 −5

Original line number	Diff line number	Diff line
		@@ -1741,11 +1741,38 @@ void msm_isp_update_error_frame_count(struct vfe_device *vfe_dev)
		static int msm_isp_process_iommu_page_fault(struct vfe_device *vfe_dev)
		{
		int rc = vfe_dev->buf_mgr->pagefault_debug_disable;
		uint32_t irq_status0, irq_status1;
		uint32_t overflow_mask;
		unsigned long irq_flags;

		pr_err("%s:%d] VFE%d Handle Page fault! vfe_dev %pK\n", __func__,
		__LINE__, vfe_dev->pdev->id, vfe_dev);

		/* Check if any overflow bit is set */
		vfe_dev->hw_info->vfe_ops.core_ops.
		get_overflow_mask(&overflow_mask);
		vfe_dev->hw_info->vfe_ops.irq_ops.
		read_irq_status(vfe_dev, &irq_status0, &irq_status1);
		overflow_mask &= irq_status1;
		spin_lock_irqsave(
		&vfe_dev->common_data->common_dev_data_lock, irq_flags);
		if (overflow_mask \|\|
		atomic_read(&vfe_dev->error_info.overflow_state) !=
		NO_OVERFLOW) {
		spin_unlock_irqrestore(
		&vfe_dev->common_data->common_dev_data_lock, irq_flags);
		pr_err_ratelimited("%s: overflow detected during IOMMU\n",
		__func__);
		/* Don't treat the Overflow + Page fault scenario as fatal.
		* Instead try to do a recovery. Using an existing event as
		* as opposed to creating a new event.
		*/
		msm_isp_halt_send_error(vfe_dev, ISP_EVENT_PING_PONG_MISMATCH);
		} else {
		spin_unlock_irqrestore(
		&vfe_dev->common_data->common_dev_data_lock, irq_flags);
		pr_err("%s:%d] VFE%d Handle Page fault! vfe_dev %pK\n",
		__func__, __LINE__, vfe_dev->pdev->id, vfe_dev);
		vfe_dev->hw_info->vfe_ops.axi_ops.halt(vfe_dev, 0);
		msm_isp_halt_send_error(vfe_dev, ISP_EVENT_IOMMU_P_FAULT);
		}

		if (vfe_dev->buf_mgr->pagefault_debug_disable == 0) {
		vfe_dev->buf_mgr->pagefault_debug_disable = 1;
		@@ -1835,7 +1862,7 @@ void msm_isp_process_overflow_irq(

		vfe_dev->hw_info->vfe_ops.core_ops.
		set_halt_restart_mask(vfe_dev);

		vfe_dev->hw_info->vfe_ops.axi_ops.halt(vfe_dev, 0);
		/* mask off other vfe if dual vfe is used */
		if (vfe_dev->is_split) {
		uint32_t other_vfe_id;
		@@ -1860,6 +1887,10 @@ void msm_isp_process_overflow_irq(
		vfe_dev->hw_info->vfe_ops.core_ops.
		set_halt_restart_mask(vfe_dev->common_data->
		dual_vfe_res->vfe_dev[other_vfe_id]);
		if (other_vfe_dev) {
		other_vfe_dev->hw_info->vfe_ops.axi_ops.
		halt(other_vfe_dev, 0);
		}
		}

		/* reset irq status so skip further process */
		@@ -2112,6 +2143,8 @@ static void msm_vfe_iommu_fault_handler(struct iommu_domain *domain,
		if (vfe_dev->vfe_open_cnt > 0) {
		atomic_set(&vfe_dev->error_info.overflow_state,
		HALT_ENFORCED);
		pr_err_ratelimited("%s: fault address is %lx\n",
		__func__, iova);
		msm_isp_process_iommu_page_fault(vfe_dev);
		} else {
		pr_err("%s: no handling, vfe open cnt = %d\n",