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

Commit a82c58be authored by Vishalsingh Hajeri's avatar Vishalsingh Hajeri Committed by Pavan Kumar Chilamkurthi
Browse files

msm: camera: isp: Add trace events across ISP 



Add trace events for IRQ's on IFE top side and IFE
BUS side in top half. These traces when enabled
will help to gather relative timing information of
the IRQ's with systrace.

CRs-Fixed: 2538876
Change-Id: I856a9df1978f90e260da7c62cadf02fa2fe53202
Signed-off-by: default avatarVishalsingh Hajeri <vhajeri@codeaurora.org>
Signed-off-by: default avatarPavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
parent 26227e27

drivers/cam_cdm/cam_cdm_hw_core.c

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "cam_cdm_soc.h"

#include "cam_io_util.h"

#include "cam_hw_cdm170_reg.h"

#include "cam_trace.h"



#define CAM_HW_CDM_CPAS_0_NAME "qcom,cam170-cpas-cdm0"

#define CAM_HW_CDM_IPE_0_NAME "qcom,cam170-ipe0-cdm"
@@ -380,6 +381,8 @@ int cam_hw_cdm_submit_gen_irq(struct cam_hw_info *cdm_hw, 
		rc = -EIO;

	}



	trace_cam_log_event("CDM_START", "CDM_START_IRQ", req->data->cookie, 0);



end:

	return rc;

}
@@ -679,6 +682,9 @@ irqreturn_t cam_hw_cdm_irq(int irq_num, void *data) 
					"Failed to read CDM HW IRQ data");

			}

		}

		trace_cam_log_event("CDM_DONE", "CDM_DONE_IRQ",

			payload->irq_status,

			cdm_hw->soc_info.index);

		CAM_DBG(CAM_CDM, "Got payload=%d", payload->irq_status);

		payload->hw = cdm_hw;

		INIT_WORK((struct work_struct *)&payload->work,

drivers/cam_isp/cam_isp_context.c

+11 −0
Original line number Diff line number Diff line
@@ -723,6 +723,11 @@ static void __cam_isp_ctx_handle_buf_done_fail_log( 
		"Resource Handles that fail to generate buf_done in prev frame");

	for (i = 0; i < req_isp->num_fence_map_out; i++) {

		if (req_isp->fence_map_out[i].sync_id != -1) {

			trace_cam_log_event("Buf_done Congestion",

				__cam_isp_resource_handle_id_to_type(

				req_isp->fence_map_out[i].resource_handle),

				request_id, req_isp->fence_map_out[i].sync_id);



			CAM_WARN(CAM_ISP,

			"Resource_Handle: [%s][0x%x] Sync_ID: [0x%x]",

			__cam_isp_resource_handle_id_to_type(
@@ -779,6 +784,10 @@ static int __cam_isp_ctx_handle_buf_done_for_request( 
				req->request_id, i, j,

				__cam_isp_resource_handle_id_to_type(

				done->resource_handle[i]));

			trace_cam_log_event("Duplicate BufDone",

				__cam_isp_resource_handle_id_to_type(

				done->resource_handle[i]),

				req->request_id, ctx->ctx_id);



			if (done_next_req) {

				done_next_req->resource_handle
@@ -1459,6 +1468,8 @@ static int __cam_isp_ctx_epoch_in_applied(struct cam_isp_context *ctx_isp, 
		CAM_WARN(CAM_ISP,

			"Notify CRM about Bubble req %lld frame %lld, ctx %u",

			req->request_id, ctx_isp->frame_id, ctx->ctx_id);

		trace_cam_log_event("Bubble", "Rcvd epoch in applied state",

			req->request_id, ctx->ctx_id);

		ctx->ctx_crm_intf->notify_err(&notify);

		atomic_set(&ctx_isp->process_bubble, 1);

	} else {

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cdm/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/include

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c

+23 −1
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ 
#include "cam_vfe_soc.h"

#include "cam_debug_util.h"

#include "cam_cpas_api.h"

#include "cam_trace.h"



static const char drv_name[] = "vfe_bus";

static char rup_controller_name[32] = "";



#define CAM_VFE_BUS_VER3_IRQ_REG0                0

#define CAM_VFE_BUS_VER3_IRQ_REG1                1
@@ -916,6 +918,7 @@ static int cam_vfe_bus_ver3_handle_rup_top_half(uint32_t evt_id, 
	struct cam_isp_resource_node               *vfe_out = NULL;

	struct cam_vfe_bus_ver3_vfe_out_data       *rsrc_data = NULL;

	struct cam_vfe_bus_irq_evt_payload         *evt_payload;

	uint32_t irq_status;



	vfe_out = th_payload->handler_priv;

	if (!vfe_out) {
@@ -944,6 +947,12 @@ static int cam_vfe_bus_ver3_handle_rup_top_half(uint32_t evt_id, 
	evt_payload->evt_id  = evt_id;

	for (i = 0; i < th_payload->num_registers; i++)

		evt_payload->irq_reg_val[i] = th_payload->evt_status_arr[i];



	irq_status =

		th_payload->evt_status_arr[CAM_IFE_IRQ_BUS_VER3_REG_STATUS0];



	trace_cam_log_event("RUP", "RUP_IRQ", irq_status, 0);



	th_payload->evt_payload_priv = evt_payload;



	return rc;
@@ -2237,6 +2246,8 @@ static int cam_vfe_bus_ver3_handle_vfe_out_done_top_half(uint32_t evt_id, 
	struct cam_isp_resource_node               *vfe_out = NULL;

	struct cam_vfe_bus_ver3_vfe_out_data       *rsrc_data = NULL;

	struct cam_vfe_bus_irq_evt_payload         *evt_payload;

	struct cam_vfe_bus_ver3_comp_grp_data      *resource_data;

	uint32_t                                    status_0;



	vfe_out = th_payload->handler_priv;

	if (!vfe_out) {
@@ -2245,6 +2256,7 @@ static int cam_vfe_bus_ver3_handle_vfe_out_done_top_half(uint32_t evt_id, 
	}



	rsrc_data = vfe_out->res_priv;

	resource_data = rsrc_data->comp_grp->res_priv;



	CAM_DBG(CAM_ISP, "VFE:%d Bus IRQ status_0: 0x%X status_1: 0x%X",

		rsrc_data->common_data->core_index,
@@ -2273,6 +2285,17 @@ static int cam_vfe_bus_ver3_handle_vfe_out_done_top_half(uint32_t evt_id, 


	th_payload->evt_payload_priv = evt_payload;



	status_0 = th_payload->evt_status_arr[CAM_IFE_IRQ_BUS_VER3_REG_STATUS0];



	if (status_0 & BIT(resource_data->comp_grp_type +

		rsrc_data->common_data->comp_done_shift)) {

		trace_cam_log_event("bufdone", "bufdone_IRQ",

			status_0, resource_data->comp_grp_type);

	}



	if (status_0 & 0x1)

		trace_cam_log_event("UnexpectedRUP", "RUP_IRQ", status_0, 40);



	CAM_DBG(CAM_ISP, "Exit");

	return rc;

}
@@ -3744,7 +3767,6 @@ int cam_vfe_bus_ver3_init( 
	struct cam_vfe_bus              *vfe_bus_local;

	struct cam_vfe_bus_ver3_hw_info *ver3_hw_info = bus_hw_info;

	struct cam_vfe_soc_private      *soc_private = NULL;

	char rup_controller_name[12] = "";



	CAM_DBG(CAM_ISP, "Enter");

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils/ 
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cdm/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/include

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/include