Evolution-X-Devices/kernel_oneplus_sm8550-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: req_mgr: Print request state at LDAR

Browse Source 
This commit prints request state for which recovery is
triggered.

CRs-Fixed: 3607216
Change-Id: I85dd0920643c3fdc44b3e96b83c6cf72d516e20e
Signed-off-by: Ayush Kumar <quic_ayushkr@quicinc.com>
This commit is contained in:
Ayush Kumar
2023-09-19 14:38:38 +05:30
parent 16a214a0cd
commit 597a429cb4
3 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/cam_isp/cam_isp_context.c
View File

@@ -5012,19 +5012,22 @@ static int __cam_isp_ctx_dump_in_top_state(
struct cam_isp_hw_cmd_args isp_hw_cmd_args;
spin_lock_bh(&ctx->lock);
ctx_isp = (struct cam_isp_context *) ctx->ctx_priv;
list_for_each_entry_safe(req, req_temp,
&ctx->active_req_list, list) {
if (req->request_id == dump_info->req_id) {
CAM_INFO(CAM_ISP, "isp dump active list req: %lld",
dump_info->req_id);
CAM_INFO(CAM_ISP, "isp dump active list req: %lld init timestamp %lld",
dump_info->req_id, ctx_isp->init_timestamp);
goto hw_dump;
}
}
list_for_each_entry_safe(req, req_temp,
&ctx->wait_req_list, list) {
if (req->request_id == dump_info->req_id) {
CAM_INFO(CAM_ISP, "isp dump wait list req: %lld",
dump_info->req_id);
CAM_INFO(CAM_ISP, "isp dump wait list req: %lld init timestamp %lld",
dump_info->req_id, ctx_isp->init_timestamp);
goto hw_dump;
}
}
@@ -5057,7 +5060,6 @@ hw_dump:
return -ENOSPC;
}
ctx_isp = (struct cam_isp_context *) ctx->ctx_priv;
req_isp = (struct cam_isp_ctx_req *) req->req_priv;
cur_time = ktime_get();
diff = ktime_us_delta(

42
drivers/cam_req_mgr/cam_req_mgr_core.c
View File

@@ -78,6 +78,7 @@ void cam_req_mgr_core_link_reset(struct cam_req_mgr_core_link *link)
link->cont_empty_slots = 0;
link->is_shdr = false;
link->wait_for_dual_trigger = false;
link->debug_data.num_skip_frames = 0;
__cam_req_mgr_reset_apply_data(link);
for (i = 0; i < MAXIMUM_LINKS_PER_SESSION - 1; i++)
@@ -1430,12 +1431,14 @@ static int __cam_req_mgr_check_link_is_ready(struct cam_req_mgr_core_link *link,
apply_data[2].req_id,
apply_data[1].req_id,
apply_data[0].req_id);
link->debug_data.num_skip_frames = 0;
} else {
rc = -EAGAIN;
__cam_req_mgr_find_dev_name(link,
traverse_data.result_data.req_id,
traverse_data.result_data.pd,
traverse_data.result_data.masked_value);
link->debug_data.num_skip_frames++;
}
return rc;
@@ -3386,10 +3389,11 @@ int cam_req_mgr_process_add_req(void *priv, void *data)
trace_cam_req_mgr_add_req(link, idx, add_req, tbl, device);
if (slot->req_ready_map == tbl->dev_mask) {
CAM_DBG(CAM_REQ,
"link 0x%x idx %d req_id %lld pd %d SLOT READY",
link->link_hdl, idx, add_req->req_id, tbl->pd);
slot->state = CRM_REQ_STATE_READY;
slot->ready_state_timestamp = jiffies_to_msecs(jiffies);
CAM_DBG(CAM_REQ,
"link 0x%x idx %d req_id %lld pd %d SLOT READY timestamp %lld",
link->link_hdl, idx, add_req->req_id, tbl->pd, slot->ready_state_timestamp);
}
if (!link->is_shdr && !device->dev_info.trigger_on) {
@@ -3406,6 +3410,7 @@ int cam_req_mgr_process_add_req(void *priv, void *data)
slot->req_ready_map |= (1 << dev_l->dev_bit);
if (slot->req_ready_map == tbl->dev_mask) {
slot->state = CRM_REQ_STATE_READY;
slot->ready_state_timestamp = jiffies_to_msecs(jiffies);
CAM_DBG(CAM_REQ,
"SHDR link %x idx %d req_id %lld pd %d SLOT READY",
link->link_hdl, idx, add_req->req_id, tbl->pd);
@@ -3421,6 +3426,7 @@ int cam_req_mgr_process_add_req(void *priv, void *data)
tbl->dev_mask |= (1 << device->dev_bit);
if (slot->req_ready_map == tbl->dev_mask) {
slot->state = CRM_REQ_STATE_READY;
slot->ready_state_timestamp = jiffies_to_msecs(jiffies);
CAM_DBG(CAM_REQ,
"SHDR link 0x%x idx %d req_id %lld pd %d SLOT READY",
link->link_hdl, idx, add_req->req_id, tbl->pd);
@@ -5395,11 +5401,12 @@ end:
int cam_req_mgr_dump_request(struct cam_dump_req_cmd *dump_req)
{
int rc = 0;
int i;
int i, idx;
struct cam_req_mgr_dump_info info;
struct cam_req_mgr_core_link *link = NULL;
struct cam_req_mgr_core_session *session = NULL;
struct cam_req_mgr_connected_device *device = NULL;
struct cam_req_mgr_tbl_slot *slot = NULL;
if (!dump_req) {
CAM_ERR(CAM_CRM, "dump req is NULL");
@@ -5447,8 +5454,31 @@ int cam_req_mgr_dump_request(struct cam_dump_req_cmd *dump_req)
}
}
dump_req->offset = info.offset;
CAM_INFO(CAM_REQ, "req %llu, offset %zu",
dump_req->issue_req_id, dump_req->offset);
CAM_INFO(CAM_REQ, "req %llu, offset %zu num of skip frame %lld",
dump_req->issue_req_id, dump_req->offset, link->debug_data.num_skip_frames);
idx = __cam_req_mgr_find_slot_for_req(link->req.in_q, dump_req->issue_req_id);
if (idx < 0) {
CAM_ERR(CAM_CRM,
"Req_id %lld not found in in_q on link 0x%x",
dump_req->issue_req_id, link->link_hdl);
goto end;
}
for (i = 0; i < link->num_devs; i++) {
device = &link->l_dev[i];
if (device->dev_info.p_delay == 2) {
__cam_req_mgr_inc_idx(&idx, 1, device->pd_tbl->num_slots);
slot = &device->pd_tbl->slot[idx];
CAM_INFO(CAM_CRM, "pd %d req %lld state %d timestamp %lld",
device->dev_info.p_delay, dump_req->issue_req_id + 1, slot->state,
slot->ready_state_timestamp);
} else {
slot = &device->pd_tbl->slot[idx];
CAM_INFO(CAM_CRM, "pd %d req %lld state %d timestamp %lld",
device->dev_info.p_delay, dump_req->issue_req_id, slot->state,
slot->ready_state_timestamp);
}
}
end:
mutex_unlock(&g_crm_core_dev->crm_lock);
return 0;

30
drivers/cam_req_mgr/cam_req_mgr_core.h
View File

@@ -230,16 +230,17 @@ struct crm_tbl_slot_special_ops {
/**
* struct cam_req_mgr_tbl_slot
* @idx : slot index
* @req_ready_map : mask tracking which all devices have request ready
* @state : state machine for life cycle of a slot
* @inject_delay_at_sof : insert extra bubbling for flash type of use cases
* @inject_delay_at_eof : insert extra bubbling for flash type of use cases
* @ops : special operation for the table slot
* e.g.
* skip_next frame: in case of applying one device
* and skip others
* apply_at_eof: device that needs to apply at EOF
* @idx : slot index
* @req_ready_map : mask tracking which all devices have request ready
* @state : state machine for life cycle of a slot
* @inject_delay_at_sof : insert extra bubbling for flash type of use cases
* @inject_delay_at_eof : insert extra bubbling for flash type of use cases
* @ops : special operation for the table slot
* e.g.
* skip_next frame: in case of applying one device
* and skip others
* apply_at_eof: device that needs to apply at EOF
* @ready_state_timestamp : timestamp at which slot state becomes ready
*/
struct cam_req_mgr_tbl_slot {
int32_t idx;
@@ -248,6 +249,7 @@ struct cam_req_mgr_tbl_slot {
uint32_t inject_delay_at_sof;
uint32_t inject_delay_at_eof;
struct crm_tbl_slot_special_ops ops;
uint64_t ready_state_timestamp;
};
/**
@@ -361,6 +363,12 @@ struct cam_req_mgr_connected_device {
bool is_active;
};
struct cam_req_mgr_debug_data {
uint32_t num_skip_frames;
uint64_t last_open_req;
uint64_t last_applied_req;
};
/**
* struct cam_req_mgr_core_link
* - Link Properties
@@ -421,6 +429,7 @@ struct cam_req_mgr_connected_device {
* @cont_empty_slots : Continuous empty slots
* @is_shdr : flag to indicate auto shdr usecase without SFE
* @wait_for_dual_trigger: Flag to indicate whether to wait for second epoch in dual trigger
* @debug_data : Debug data to be dump in case of receovery
*/
struct cam_req_mgr_core_link {
int32_t link_hdl;
@@ -466,6 +475,7 @@ struct cam_req_mgr_core_link {
uint32_t cont_empty_slots;
bool is_shdr;
bool wait_for_dual_trigger;
struct cam_req_mgr_debug_data debug_data;
};
/**