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

Commit f5820ee5 authored by Karthik Anantha Ram's avatar Karthik Anantha Ram
Browse files

msm: camera: isp: Add debugfs to dump hbi/vbi info 



Add debugfs which when enabled dumps the configured
horizontal & vertical blanking.

To dump hbi/vbi from csid-
adb shell "echo 0x80 > /sys/kernel/debug/camera_ife/ife_csid_debug"

To dump camif sensor diagnostic status-
adb shell "echo 0x1 > /sys/kernel/debug/camera_ife/ife_camif_debug"

Change-Id: Ib6372600883b68893563e137f62eef21cf4b7ff1
Signed-off-by: default avatarKarthik Anantha Ram <kartanan@codeaurora.org>
parent a97799e5

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+50 −1
Original line number Diff line number Diff line
@@ -2259,7 +2259,8 @@ static int cam_ife_mgr_start_hw(void *hw_mgr_priv, void *start_hw_args) 
	struct cam_isp_stop_args          stop_isp;

	struct cam_ife_hw_mgr_ctx        *ctx;

	struct cam_ife_hw_mgr_res        *hw_mgr_res;

	uint32_t                          i;

	struct cam_isp_resource_node     *rsrc_node = NULL;

	uint32_t                          i, camif_debug;



	if (!hw_mgr_priv || !start_isp) {

		CAM_ERR(CAM_ISP, "Invalid arguments");
@@ -2293,6 +2294,24 @@ static int cam_ife_mgr_start_hw(void *hw_mgr_priv, void *start_hw_args) 
				sizeof(g_ife_hw_mgr.debug_cfg.csid_debug));

	}



	camif_debug = g_ife_hw_mgr.debug_cfg.camif_debug;

	list_for_each_entry(hw_mgr_res, &ctx->res_list_ife_src, list) {

		for (i = 0; i < CAM_ISP_HW_SPLIT_MAX; i++) {

			if (!hw_mgr_res->hw_res[i])

				continue;



			rsrc_node = hw_mgr_res->hw_res[i];

			if (rsrc_node->process_cmd && (rsrc_node->res_id ==

				CAM_ISP_HW_VFE_IN_CAMIF)) {

				rc = hw_mgr_res->hw_res[i]->process_cmd(

					hw_mgr_res->hw_res[i],

					CAM_ISP_HW_CMD_SET_CAMIF_DEBUG,

					&camif_debug,

					sizeof(camif_debug));

			}

		}

	}



	rc = cam_ife_hw_mgr_init_hw(ctx);

	if (rc) {

		CAM_ERR(CAM_ISP, "Init failed");
@@ -4443,6 +4462,28 @@ DEFINE_SIMPLE_ATTRIBUTE(cam_ife_csid_debug, 
	cam_ife_get_csid_debug,

	cam_ife_set_csid_debug, "%16llu");



static int cam_ife_set_camif_debug(void *data, u64 val)

{

	g_ife_hw_mgr.debug_cfg.camif_debug = val;

	CAM_DBG(CAM_ISP,

		"Set camif enable_diag_sensor_status value :%lld", val);

	return 0;

}



static int cam_ife_get_camif_debug(void *data, u64 *val)

{

	*val = g_ife_hw_mgr.debug_cfg.camif_debug;

	CAM_DBG(CAM_ISP,

		"Set camif enable_diag_sensor_status value :%lld",

		g_ife_hw_mgr.debug_cfg.csid_debug);



	return 0;

}



DEFINE_SIMPLE_ATTRIBUTE(cam_ife_camif_debug,

	cam_ife_get_camif_debug,

	cam_ife_set_camif_debug, "%16llu");



static int cam_ife_hw_mgr_debug_register(void)

{

	g_ife_hw_mgr.debug_cfg.dentry = debugfs_create_dir("camera_ife",
@@ -4468,6 +4509,14 @@ static int cam_ife_hw_mgr_debug_register(void) 
		CAM_ERR(CAM_ISP, "failed to create enable_recovery");

		goto err;

	}



	if (!debugfs_create_file("ife_camif_debug",

		0644,

		g_ife_hw_mgr.debug_cfg.dentry, NULL,

		&cam_ife_camif_debug)) {

		CAM_ERR(CAM_ISP, "failed to create cam_ife_camif_debug");

		goto err;

	}

	g_ife_hw_mgr.debug_cfg.enable_recovery = 0;



	return 0;

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.h

+5 −3
Original line number Diff line number Diff line
@@ -85,13 +85,15 @@ struct ctx_base_info { 
 *

 * @dentry:                    Debugfs entry

 * @csid_debug:                csid debug information

 * @enable_recovery      enable recovery

 * @enable_recovery:           enable recovery

 * @enable_diag_sensor_status: enable sensor diagnosis status

 *

 */

struct cam_ife_hw_mgr_debug {

	struct dentry  *dentry;

	uint64_t       csid_debug;

	uint32_t       enable_recovery;

	uint32_t       camif_debug;

};



/**

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid170.h

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ static struct cam_ife_csid_common_reg_offset 
	.ipp_irq_mask_all                             = 0x7FFF,

	.rdi_irq_mask_all                             = 0x7FFF,

	.ppp_irq_mask_all                             = 0x0,

	.measure_en_hbi_vbi_cnt_mask                  = 0xC,

	.format_measure_en_val                        = 1,

};



static struct cam_ife_csid_reg_offset cam_ife_csid_170_reg_offset = {

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid175.h

+2 −0
Original line number Diff line number Diff line
@@ -328,6 +328,8 @@ static struct cam_ife_csid_common_reg_offset 
	.ipp_irq_mask_all                             = 0x7FFF,

	.rdi_irq_mask_all                             = 0x7FFF,

	.ppp_irq_mask_all                             = 0xFFFF,

	.measure_en_hbi_vbi_cnt_mask                  = 0xC,

	.format_measure_en_val                        = 1,

};



static struct cam_ife_csid_reg_offset cam_ife_csid_175_reg_offset = {

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

+127 −1
Original line number Diff line number Diff line
@@ -1553,9 +1553,23 @@ static int cam_ife_csid_init_config_pxl_path( 
	val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

		pxl_reg->csid_pxl_cfg0_addr);

	val |= (1 << csid_reg->cmn_reg->path_en_shift_val);



	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_HBI_VBI_INFO)

		val |= csid_reg->cmn_reg->format_measure_en_val;



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

		pxl_reg->csid_pxl_cfg0_addr);



	/* Enable the HBI/VBI counter */

	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_HBI_VBI_INFO) {

		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			pxl_reg->csid_pxl_format_measure_cfg0_addr);

		val |= csid_reg->cmn_reg->measure_en_hbi_vbi_cnt_mask;

		cam_io_w_mb(val,

			soc_info->reg_map[0].mem_base +

			pxl_reg->csid_pxl_format_measure_cfg0_addr);

	}



	/* configure the rx packet capture based on csid debug set */

	val = 0;

	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_SHORT_PKT_CAPTURE)
@@ -1594,6 +1608,7 @@ static int cam_ife_csid_deinit_pxl_path( 
	struct cam_isp_resource_node    *res)

{

	int rc = 0;

	uint32_t val;

	const struct cam_ife_csid_reg_offset      *csid_reg;

	struct cam_hw_soc_info                    *soc_info;

	const struct cam_ife_csid_pxl_reg_offset  *pxl_reg = NULL;
@@ -1624,8 +1639,25 @@ static int cam_ife_csid_deinit_pxl_path( 
			csid_hw->hw_intf->hw_idx, (is_ipp) ? "IPP" : "PPP",

			res->res_id);

		rc = -EINVAL;

		goto end;

	}



	val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			pxl_reg->csid_pxl_cfg0_addr);

	if (val & csid_reg->cmn_reg->format_measure_en_val) {

		val &= ~csid_reg->cmn_reg->format_measure_en_val;

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

			pxl_reg->csid_pxl_cfg0_addr);



		/* Disable the HBI/VBI counter */

		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			pxl_reg->csid_pxl_format_measure_cfg0_addr);

		val &= ~csid_reg->cmn_reg->measure_en_hbi_vbi_cnt_mask;

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

			pxl_reg->csid_pxl_format_measure_cfg0_addr);

	}



end:

	res->res_state = CAM_ISP_RESOURCE_STATE_RESERVED;

	return rc;

}
@@ -1794,6 +1826,7 @@ static int cam_ife_csid_init_config_rdi_path( 
	const struct cam_ife_csid_reg_offset   *csid_reg;

	struct cam_hw_soc_info                 *soc_info;

	uint32_t path_format = 0, plain_fmt = 0, val = 0, id;

	uint32_t format_measure_addr;



	path_data = (struct cam_ife_csid_path_cfg   *) res->res_priv;

	csid_reg = csid_hw->csid_info->csid_reg;
@@ -1887,9 +1920,24 @@ static int cam_ife_csid_init_config_rdi_path( 
		csid_reg->rdi_reg[id]->csid_rdi_cfg0_addr);

	val |= (1 << csid_reg->cmn_reg->path_en_shift_val);



	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_HBI_VBI_INFO)

		val |= csid_reg->cmn_reg->format_measure_en_val;



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

		csid_reg->rdi_reg[id]->csid_rdi_cfg0_addr);



	format_measure_addr =

		csid_reg->rdi_reg[id]->csid_rdi_format_measure_cfg0_addr;



	/* Enable the HBI/VBI counter */

	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_HBI_VBI_INFO) {

		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			format_measure_addr);

		val |= csid_reg->cmn_reg->measure_en_hbi_vbi_cnt_mask;

		cam_io_w_mb(val,

			soc_info->reg_map[0].mem_base + format_measure_addr);

	}



	/* configure the rx packet capture based on csid debug set */

	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_SHORT_PKT_CAPTURE)

		val = ((1 <<
@@ -1925,7 +1973,7 @@ static int cam_ife_csid_deinit_rdi_path( 
	struct cam_isp_resource_node    *res)

{

	int rc = 0;

	uint32_t id;

	uint32_t id, val, format_measure_addr;

	const struct cam_ife_csid_reg_offset      *csid_reg;

	struct cam_hw_soc_info                    *soc_info;
@@ -1942,6 +1990,24 @@ static int cam_ife_csid_deinit_rdi_path( 
		return -EINVAL;

	}



	format_measure_addr =

		csid_reg->rdi_reg[id]->csid_rdi_format_measure_cfg0_addr;



	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_HBI_VBI_INFO) {

		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->rdi_reg[id]->csid_rdi_cfg0_addr);

		val &= ~csid_reg->cmn_reg->format_measure_en_val;

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

			csid_reg->rdi_reg[id]->csid_rdi_cfg0_addr);



		/* Disable the HBI/VBI counter */

		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			format_measure_addr);

		val &= ~csid_reg->cmn_reg->measure_en_hbi_vbi_cnt_mask;

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

			format_measure_addr);

	}



	res->res_state = CAM_ISP_RESOURCE_STATE_RESERVED;

	return rc;

}
@@ -2044,6 +2110,60 @@ static int cam_ife_csid_disable_rdi_path( 
	return rc;

}



static int cam_ife_csid_get_hbi_vbi(

	struct cam_ife_csid_hw   *csid_hw,

	struct cam_isp_resource_node *res)

{

	uint32_t  hbi, vbi;

	const struct cam_ife_csid_reg_offset     *csid_reg;

	const struct cam_ife_csid_rdi_reg_offset *rdi_reg;

	struct cam_hw_soc_info                   *soc_info;



	csid_reg = csid_hw->csid_info->csid_reg;

	soc_info = &csid_hw->hw_info->soc_info;



	if (res->res_type != CAM_ISP_RESOURCE_PIX_PATH ||

		res->res_id >= CAM_IFE_PIX_PATH_RES_MAX) {

		CAM_ERR(CAM_ISP, "CSID:%d Invalid res_type:%d res id%d",

			csid_hw->hw_intf->hw_idx, res->res_type,

			res->res_id);

		return -EINVAL;

	}



	if (csid_hw->hw_info->hw_state != CAM_HW_STATE_POWER_UP) {

		CAM_ERR(CAM_ISP, "CSID:%d Invalid dev state :%d",

			csid_hw->hw_intf->hw_idx,

			csid_hw->hw_info->hw_state);

		return -EINVAL;

	}



	if (res->res_id == CAM_IFE_PIX_PATH_RES_IPP) {

		hbi = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->ipp_reg->csid_pxl_format_measure1_addr);

		vbi = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->ipp_reg->csid_pxl_format_measure2_addr);

	} else if (res->res_id == CAM_IFE_PIX_PATH_RES_PPP) {

		hbi = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->ppp_reg->csid_pxl_format_measure1_addr);

		vbi = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->ppp_reg->csid_pxl_format_measure2_addr);

	} else {

		rdi_reg = csid_reg->rdi_reg[res->res_id];

		hbi = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			rdi_reg->csid_rdi_format_measure1_addr);

		vbi = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			rdi_reg->csid_rdi_format_measure2_addr);

	}



	CAM_INFO_RATE_LIMIT(CAM_ISP, "Resource %u HBI: 0x%x", res->res_id,

		hbi);

	CAM_INFO_RATE_LIMIT(CAM_ISP, "Resource %u VBI: 0x%x", res->res_id,

		vbi);



	return 0;

}





static int cam_ife_csid_get_time_stamp(

		struct cam_ife_csid_hw   *csid_hw, void *cmd_args)

{
@@ -2708,6 +2828,7 @@ static int cam_ife_csid_process_cmd(void *hw_priv, 
	int rc = 0;

	struct cam_ife_csid_hw               *csid_hw;

	struct cam_hw_info                   *csid_hw_info;

	struct cam_isp_resource_node         *res = NULL;



	if (!hw_priv || !cmd_args) {

		CAM_ERR(CAM_ISP, "CSID: Invalid arguments");
@@ -2720,6 +2841,11 @@ static int cam_ife_csid_process_cmd(void *hw_priv, 
	switch (cmd_type) {

	case CAM_IFE_CSID_CMD_GET_TIME_STAMP:

		rc = cam_ife_csid_get_time_stamp(csid_hw, cmd_args);

		if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_HBI_VBI_INFO) {

			res = ((struct cam_csid_get_time_stamp_args *)

				cmd_args)->node_res;

			cam_ife_csid_get_hbi_vbi(csid_hw, res);

		}

		break;

	case CAM_IFE_CSID_SET_CSID_DEBUG:

		rc = cam_ife_csid_set_csid_debug(csid_hw, cmd_args);