Merge "msm: camera: isp: Add debug logs for IOMMu issue" (e2dc9093) · Commits · e / devices / android_kernel_sony_msm8994

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -1215,17 +1215,17 @@ static int msm_isp_buf_mgr_debug(struct msm_isp_buf_mgr *buf_mgr)
		break;
		}
		for (k = 0; k < bufs->num_planes; k++) {
		if (!start_addr)
		start_addr = bufs->
		mapped_info[k].paddr;
		end_addr = bufs->mapped_info[k].paddr +
		bufs->mapped_info[k].len;
		snprintf(temp_buf, sizeof(temp_buf),
		" buf %d plane %d start_addr %x end_addr %x\n",
		j, k, start_addr, end_addr);
		strlcat(print_buf, temp_buf,
		print_buf_size);
		}
		}
		snprintf(temp_buf, sizeof(temp_buf),
		" start_addr %x end_addr %x\n",
		start_addr, end_addr);
		strlcat(print_buf, temp_buf, print_buf_size);
		start_addr = 0;
		end_addr = 0;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,8 @@ struct msm_vfe_axi_ops {

		void (cfg_ub) (struct vfe_device vfe_dev);

		void (read_wm_ping_pong_addr)(struct vfe_device vfe_dev);

		void (update_ping_pong_addr) (struct vfe_device vfe_dev,
		uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr);

+9 −0

Original line number	Diff line number	Diff line
		@@ -1520,6 +1520,13 @@ static void msm_vfe40_cfg_axi_ub(struct vfe_device *vfe_dev)
		}
		}

		static void msm_vfe40_read_wm_ping_pong_addr(
		struct vfe_device *vfe_dev)
		{
		msm_camera_io_dump_2(vfe_dev->vfe_base +
		(VFE40_WM_BASE(0) & 0xFFFFFFF0), 0x100);
		}

		static void msm_vfe40_update_ping_pong_addr(
		struct vfe_device *vfe_dev,
		uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr)
		@@ -2073,6 +2080,8 @@ struct msm_vfe_hardware_info vfe40_hw_info = {
		.cfg_wm_xbar_reg = msm_vfe40_axi_cfg_wm_xbar_reg,
		.clear_wm_xbar_reg = msm_vfe40_axi_clear_wm_xbar_reg,
		.cfg_ub = msm_vfe40_cfg_axi_ub,
		.read_wm_ping_pong_addr =
		msm_vfe40_read_wm_ping_pong_addr,
		.update_ping_pong_addr =
		msm_vfe40_update_ping_pong_addr,
		.get_comp_mask = msm_vfe40_get_comp_mask,

+9 −0

Original line number	Diff line number	Diff line
		@@ -1279,6 +1279,13 @@ static void msm_vfe44_cfg_axi_ub(struct vfe_device *vfe_dev)
		msm_vfe44_cfg_axi_ub_equal_default(vfe_dev);
		}

		static void msm_vfe44_read_wm_ping_pong_addr(
		struct vfe_device *vfe_dev)
		{
		msm_camera_io_dump_2(vfe_dev->vfe_base +
		(VFE44_WM_BASE(0) & 0xFFFFFFF0), 0x100);
		}

		static void msm_vfe44_update_ping_pong_addr(
		struct vfe_device *vfe_dev,
		uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr)
		@@ -1887,6 +1894,8 @@ struct msm_vfe_hardware_info vfe44_hw_info = {
		.cfg_wm_xbar_reg = msm_vfe44_axi_cfg_wm_xbar_reg,
		.clear_wm_xbar_reg = msm_vfe44_axi_clear_wm_xbar_reg,
		.cfg_ub = msm_vfe44_cfg_axi_ub,
		.read_wm_ping_pong_addr =
		msm_vfe44_read_wm_ping_pong_addr,
		.update_ping_pong_addr =
		msm_vfe44_update_ping_pong_addr,
		.get_comp_mask = msm_vfe44_get_comp_mask,

+9 −0

Original line number	Diff line number	Diff line
		@@ -1347,6 +1347,13 @@ static void msm_vfe46_cfg_axi_ub(struct vfe_device *vfe_dev)
		msm_vfe46_cfg_axi_ub_equal_default(vfe_dev);
		}

		static void msm_vfe46_read_wm_ping_pong_addr(
		struct vfe_device *vfe_dev)
		{
		msm_camera_io_dump_2(vfe_dev->vfe_base +
		(VFE46_WM_BASE(0) & 0xFFFFFFF0), 0x100);
		}

		static void msm_vfe46_update_ping_pong_addr(
		struct vfe_device *vfe_dev,
		uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr)
		@@ -1980,6 +1987,8 @@ struct msm_vfe_hardware_info vfe46_hw_info = {
		.cfg_wm_xbar_reg = msm_vfe46_axi_cfg_wm_xbar_reg,
		.clear_wm_xbar_reg = msm_vfe46_axi_clear_wm_xbar_reg,
		.cfg_ub = msm_vfe46_cfg_axi_ub,
		.read_wm_ping_pong_addr =
		msm_vfe46_read_wm_ping_pong_addr,
		.update_ping_pong_addr =
		msm_vfe46_update_ping_pong_addr,
		.get_comp_mask = msm_vfe46_get_comp_mask,