samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: common: Fix isp log errs and format errs

Browse Source 
Fix isp log errs and format errs.

CRs-Fixed: 3499636
Change-Id: Ieb5b81b95dea440b1da17cb5bc9be86f75b7c4f6
Signed-off-by: Wang Kan <quic_wkan@quicinc.com>
This commit is contained in:
Wang Kan
2023-05-18 19:26:08 +08:00
committed by Camera Software Integration
parent 16652c1360
commit 56e0bcc8ee
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/cam_isp/cam_isp_context.c
View File

@@ -837,7 +837,7 @@ static int __cam_isp_ctx_notify_v4l2_error_event(
if (rc) if (rc)
CAM_ERR(CAM_ISP, CAM_ERR(CAM_ISP,
"Notifying v4l2 error [type: %u code: %u] failed for req id:%llu in ctx %u on link: 0x%x", "Notifying v4l2 error [type: %u code: %u] failed for req id:%llu in ctx %u on link: 0x%x",
error_request_id, ctx->ctx_id); error_type, error_code, error_request_id, ctx->ctx_id, ctx->link_hdl);
return rc; return rc;
} }
@@ -8486,8 +8486,8 @@ static int cam_isp_context_validate_event_notify_injection(struct cam_context *c
if (!non_fatal_en) { if (!non_fatal_en) {
CAM_ERR(CAM_ISP, CAM_ERR(CAM_ISP,
"Fail to inject pagefault event notif. Pagefault fatal for ISP,ctx:%u link:0x%x", "Fail to inject pagefault event notif. Pagefault fatal for ISP,ctx:%u link:0x%x",
ctx->ctx_id, ctx->link_hdl); ctx->ctx_id, ctx->link_hdl);
return -EINVAL; return -EINVAL;
} }

4
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
View File

@@ -13614,7 +13614,7 @@ static int cam_ife_hw_mgr_find_affected_ctx(
if (notify_err_cb) if (notify_err_cb)
notify_err_cb(ife_hwr_mgr_ctx->common.cb_priv, notify_err_cb(ife_hwr_mgr_ctx->common.cb_priv,
CAM_ISP_HW_EVENT_ERROR, CAM_ISP_HW_EVENT_ERROR,
(void *)error_event_data); (void *)error_event_data);
else { else {
CAM_WARN(CAM_ISP, "Error call back is not set, ctx_idx: %u", CAM_WARN(CAM_ISP, "Error call back is not set, ctx_idx: %u",
ife_hwr_mgr_ctx->ctx_index); ife_hwr_mgr_ctx->ctx_index);
@@ -13626,7 +13626,7 @@ static int cam_ife_hw_mgr_find_affected_ctx(
for (i = 0; i < CAM_IFE_HW_NUM_MAX; i++) { for (i = 0; i < CAM_IFE_HW_NUM_MAX; i++) {
recovery_data->affected_core[i] = affected_core[i]; recovery_data->affected_core[i] = affected_core[i];
CAM_DBG(CAM_ISP, "Vfe core %d is affected (%d)", CAM_DBG(CAM_ISP, "Vfe core %d is affected (%d)",
i, recovery_data->affected_core[i]); i, recovery_data->affected_core[i]);
} }
end: end:
return 0; return 0;

4
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c
View File

@@ -1743,7 +1743,7 @@ static int cam_ife_csid_ver2_parse_path_irq_status(
uint8_t *log_buf = NULL; uint8_t *log_buf = NULL;
csid_reg = (struct cam_ife_csid_ver2_reg_info *) csid_reg = (struct cam_ife_csid_ver2_reg_info *)
csid_hw->core_info->csid_reg; csid_hw->core_info->csid_reg;
log_buf = csid_hw->log_buf; log_buf = csid_hw->log_buf;
@@ -2126,7 +2126,7 @@ static int cam_ife_csid_ver2_ppp_bottom_half(
irq_status_ppp = payload->irq_reg_val; irq_status_ppp = payload->irq_reg_val;
csid_reg = (struct cam_ife_csid_ver2_reg_info *) csid_reg = (struct cam_ife_csid_ver2_reg_info *)
csid_hw->core_info->csid_reg; csid_hw->core_info->csid_reg;
path_reg = csid_reg->path_reg[res->res_id]; path_reg = csid_reg->path_reg[res->res_id];
err_mask = path_reg->fatal_err_mask | path_reg->non_fatal_err_mask; err_mask = path_reg->fatal_err_mask | path_reg->non_fatal_err_mask;

6
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver4.c
View File

@@ -556,10 +556,10 @@ static int cam_vfe_top_ver4_print_overflow_debug_info(
soc_info = top_priv->top_common.soc_info; soc_info = top_priv->top_common.soc_info;
soc_private = soc_info->soc_private; soc_private = soc_info->soc_private;
bus_overflow_status = cam_io_r(soc_info->reg_map[VFE_CORE_BASE_IDX].mem_base + bus_overflow_status = cam_io_r(soc_info->reg_map[VFE_CORE_BASE_IDX].mem_base +
common_data->common_reg->bus_overflow_status); common_data->common_reg->bus_overflow_status);
violation_status = cam_io_r(soc_info->reg_map[VFE_CORE_BASE_IDX].mem_base + violation_status = cam_io_r(soc_info->reg_map[VFE_CORE_BASE_IDX].mem_base +
common_data->common_reg->bus_violation_status); common_data->common_reg->bus_violation_status);
if (soc_private->is_ife_lite) if (soc_private->is_ife_lite)
CAM_ERR(CAM_ISP, CAM_ERR(CAM_ISP,

2
drivers/cam_sensor_module/cam_tpg/cam_tpg_core.c
View File

@@ -118,7 +118,7 @@ static int cam_tpg_apply_req(
apply->request_id); apply->request_id);
mutex_lock(&tpg_dev->mutex); mutex_lock(&tpg_dev->mutex);
tpg_hw_apply(&tpg_dev->tpg_hw, tpg_hw_apply(&tpg_dev->tpg_hw,
apply->request_id); apply->request_id);
mutex_unlock(&tpg_dev->mutex); mutex_unlock(&tpg_dev->mutex);
return 0; return 0;

2
drivers/cam_sync/cam_sync.c
View File

@@ -1443,7 +1443,7 @@ int cam_sync_synx_core_recovery(
int rc = -EOPNOTSUPP; int rc = -EOPNOTSUPP;
#if IS_ENABLED(CONFIG_TARGET_SYNX_ENABLE) #if IS_ENABLED(CONFIG_TARGET_SYNX_ENABLE)
rc = cam_synx_core_recovery(core_id); rc = cam_synx_core_recovery(core_id);
#endif #endif
return rc; return rc;