Merge "msm: camera: isp: Create debugfs for STATs DMI and cfg dump" into dev/msm-4.14-camx (2cce3769) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+52 −1

Original line number	Diff line number	Diff line
		@@ -2958,8 +2958,11 @@ 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;
		struct cam_hw_intf *hw_intf;
		struct cam_isp_resource_node *rsrc_node = NULL;
		uint32_t i, camif_debug;
		uint32_t i, j, camif_debug;
		uint32_t enable_dmi_dump;
		struct cam_isp_hw_get_cmd_update cmd_update;

		if (!hw_mgr_priv \|\| !start_isp) {
		CAM_ERR(CAM_ISP, "Invalid arguments");
		@@ -3017,6 +3020,24 @@ static int cam_ife_mgr_start_hw(void hw_mgr_priv, void start_hw_args)
		}
		}

		enable_dmi_dump = g_ife_hw_mgr.debug_cfg.enable_dmi_dump;
		for (i = 0; i < CAM_IFE_HW_OUT_RES_MAX; i++) {
		hw_mgr_res = &ctx->res_list_ife_out[i];
		for (j = 0; j < CAM_ISP_HW_SPLIT_MAX; j++) {
		if (!hw_mgr_res->hw_res[j])
		continue;
		hw_intf = hw_mgr_res->hw_res[j]->hw_intf;
		cmd_update.res = hw_mgr_res->hw_res[j];
		cmd_update.cmd_type =
		CAM_ISP_HW_CMD_SET_STATS_DMI_DUMP;
		cmd_update.data = &enable_dmi_dump;
		hw_intf->hw_ops.process_cmd(hw_intf->hw_priv,
		CAM_ISP_HW_CMD_SET_STATS_DMI_DUMP,
		&cmd_update,
		sizeof(cmd_update));
		}
		}

		rc = cam_ife_hw_mgr_init_hw(ctx);
		if (rc) {
		CAM_ERR(CAM_ISP, "Init failed");
		@@ -6075,6 +6096,27 @@ DEFINE_SIMPLE_ATTRIBUTE(cam_ife_camif_debug,
		cam_ife_get_camif_debug,
		cam_ife_set_camif_debug, "%16llu");

		static int cam_ife_set_bus_dmi_debug(void *data, u64 val)
		{
		g_ife_hw_mgr.debug_cfg.enable_dmi_dump = val;
		CAM_DBG(CAM_ISP,
		"Set bus enable_dmi_dump_status value :%lld", val);
		return 0;
		}

		static int cam_ife_get_bus_dmi_debug(void data, u64 val)
		{
		*val = g_ife_hw_mgr.debug_cfg.enable_dmi_dump;
		CAM_DBG(CAM_ISP,
		"Get bus enable_dmi_dump_status value :%lld",
		g_ife_hw_mgr.debug_cfg.enable_dmi_dump);
		return 0;
		}

		DEFINE_SIMPLE_ATTRIBUTE(cam_ife_bus_dmi_debug,
		cam_ife_get_bus_dmi_debug,
		cam_ife_set_bus_dmi_debug, "%16llu");

		static int cam_ife_hw_mgr_debug_register(void)
		{
		g_ife_hw_mgr.debug_cfg.dentry = debugfs_create_dir("camera_ife",
		@@ -6116,6 +6158,15 @@ static int cam_ife_hw_mgr_debug_register(void)
		CAM_ERR(CAM_ISP, "failed to create cam_ife_camif_debug");
		goto err;
		}

		if (!debugfs_create_file("ife_dmi_dump",
		0644,
		g_ife_hw_mgr.debug_cfg.dentry, NULL,
		&cam_ife_bus_dmi_debug)) {
		CAM_ERR(CAM_ISP, "failed to create cam_ife_dmi_dump");
		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

+2 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ struct ctx_base_info {
		* @enable_recovery: enable recovery
		* @enable_diag_sensor_status: enable sensor diagnosis status
		* @enable_reg_dump: enable register dump on error
		* @enable_dmi_dump: enable stats dmi and cfg reg dump
		*
		*/
		struct cam_ife_hw_mgr_debug {
		@@ -97,6 +98,7 @@ struct cam_ife_hw_mgr_debug {
		uint32_t enable_recovery;
		uint32_t camif_debug;
		uint32_t enable_reg_dump;
		uint32_t enable_dmi_dump;
		};

		/**

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/include/cam_isp_hw.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ enum cam_isp_hw_cmd_type {
		CAM_ISP_HW_CMD_GET_IRQ_REGISTER_DUMP,
		CAM_ISP_HW_CMD_FPS_CONFIG,
		CAM_ISP_HW_CMD_DUMP_HW,
		CAM_ISP_HW_CMD_SET_STATS_DMI_DUMP,
		CAM_ISP_HW_CMD_MAX,
		};

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/include/cam_vfe_hw_intf.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,7 @@ struct cam_vfe_bus_irq_evt_payload {
		uint32_t error_type;
		struct cam_isp_timestamp ts;
		void *ctx;
		uint32_t enable_dump;
		};

		/*

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -774,6 +774,7 @@ int cam_vfe_process_cmd(void *hw_priv, uint32_t cmd_type,
		case CAM_ISP_HW_CMD_STRIPE_UPDATE:
		case CAM_ISP_HW_CMD_STOP_BUS_ERR_IRQ:
		case CAM_ISP_HW_CMD_UBWC_UPDATE:
		case CAM_ISP_HW_CMD_SET_STATS_DMI_DUMP:
		rc = core_info->vfe_bus->hw_ops.process_cmd(
		core_info->vfe_bus->bus_priv, cmd_type, cmd_args,
		arg_size);