samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

Merge "msm: camera: ife: dump bandwidth and clock for cpas and ife" into camera-kernel.lnx.4.0

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Camera Software Integration
2020-09-04 13:29:02 -07:00
committet von Gerrit - the friendly Code Review server
Ursprung 698123ee2c 1406c9f45b
Commit 162dad6beb
9 geänderte Dateien mit 106 neuen und 14 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

43
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
Datei anzeigen

@@ -7347,6 +7347,7 @@ static int cam_ife_hw_mgr_handle_hw_dump_info(
struct cam_isp_resource_node *rsrc_node = NULL;
struct cam_hw_intf *hw_intf;
uint32_t i, out_port_id;
uint64_t dummy_args;
int rc = 0;
list_for_each_entry(hw_mgr_res,
@@ -7373,6 +7374,24 @@ static int cam_ife_hw_mgr_handle_hw_dump_info(
}
}
list_for_each_entry(hw_mgr_res,
&ife_hw_mgr_ctx->res_list_ife_csid, list) {
for (i = 0; i < CAM_ISP_HW_SPLIT_MAX; i++) {
if (!hw_mgr_res->hw_res[i])
continue;
hw_intf = hw_mgr_res->hw_res[i]->hw_intf;
if (hw_intf->hw_ops.process_cmd) {
rc = hw_intf->hw_ops.process_cmd(
hw_intf->hw_priv,
CAM_ISP_HW_CMD_CSID_CLOCK_DUMP,
&dummy_args,
sizeof(uint64_t));
if (rc)
CAM_ERR(CAM_ISP,
"CSID Clock Dump failed");
}
}
}
out_port_id = event_info->res_id & 0xFF;
hw_mgr_res =
@@ -7431,18 +7450,6 @@ static int cam_ife_hw_mgr_handle_hw_err(
struct cam_ife_hw_event_recovery_data recovery_data = {0};
int rc = -EINVAL;
if (ctx) {
ife_hw_mgr_ctx =
(struct cam_ife_hw_mgr_ctx *)ctx;
if (event_info->res_type ==
CAM_ISP_RESOURCE_VFE_IN &&
!ife_hw_mgr_ctx->is_rdi_only_context &&
event_info->res_id !=
CAM_ISP_HW_VFE_IN_CAMIF)
cam_ife_hw_mgr_handle_hw_dump_info(
ife_hw_mgr_ctx, event_info);
}
if (event_info->err_type == CAM_VFE_IRQ_STATUS_VIOLATION)
error_event_data.error_type = CAM_ISP_HW_ERROR_VIOLATION;
else if (event_info->res_type == CAM_ISP_RESOURCE_VFE_IN)
@@ -7457,6 +7464,18 @@ static int cam_ife_hw_mgr_handle_hw_err(
return rc;
}
if (ctx) {
ife_hw_mgr_ctx =
(struct cam_ife_hw_mgr_ctx *)ctx;
if (event_info->res_type ==
CAM_ISP_RESOURCE_VFE_IN &&
!ife_hw_mgr_ctx->is_rdi_only_context &&
event_info->res_id !=
CAM_ISP_HW_VFE_IN_CAMIF)
cam_ife_hw_mgr_handle_hw_dump_info(
ife_hw_mgr_ctx, event_info);
}
core_idx = event_info->hw_idx;
if (g_ife_hw_mgr.debug_cfg.enable_recovery)

16
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
Datei anzeigen

@@ -3971,6 +3971,19 @@ static int cam_ife_csid_set_csid_clock(
return 0;
}
static int cam_ife_csid_dump_csid_clock(
struct cam_ife_csid_hw *csid_hw, void *cmd_args)
{
if (!csid_hw)
return -EINVAL;
CAM_INFO(CAM_ISP, "CSID:%d clock rate %llu",
csid_hw->hw_intf->hw_idx,
csid_hw->clk_rate);
return 0;
}
static int cam_ife_csid_set_sensor_dimension(
struct cam_ife_csid_hw *csid_hw, void *cmd_args)
{
@@ -4203,6 +4216,9 @@ static int cam_ife_csid_process_cmd(void *hw_priv,
case CAM_ISP_HW_CMD_CSID_CLOCK_UPDATE:
rc = cam_ife_csid_set_csid_clock(csid_hw, cmd_args);
break;
case CAM_ISP_HW_CMD_CSID_CLOCK_DUMP:
rc = cam_ife_csid_dump_csid_clock(csid_hw, cmd_args);
break;
case CAM_ISP_HW_CMD_CSID_QCFA_SUPPORTED:
rc = cam_ife_csid_set_csid_qcfa(csid_hw, cmd_args);
break;

1
drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_isp_hw.h
Datei anzeigen

@@ -125,6 +125,7 @@ enum cam_isp_hw_cmd_type {
CAM_ISP_HW_CMD_IS_CONSUMED_ADDR_SUPPORT,
CAM_ISP_HW_CMD_GET_RES_FOR_MID,
CAM_ISP_HW_CMD_BLANKING_UPDATE,
CAM_ISP_HW_CMD_CSID_CLOCK_DUMP,
CAM_ISP_HW_CMD_MAX,
};

9
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe_lite17x.h
Datei anzeigen

@@ -87,6 +87,14 @@ static struct cam_vfe_rdi_reg_data vfe17x_rdi_3_data = {
.reg_update_irq_mask = 0x100,
};
static struct cam_vfe_rdi_overflow_status vfe17x_rdi_irq_status = {
.rdi0_overflow_mask = 0x8,
.rdi1_overflow_mask = 0x10,
.rdi2_overflow_mask = 0x18,
.rdi3_overflow_mask = 0x20,
.rdi_overflow_mask = 0x3c,
};
static struct cam_vfe_top_ver2_hw_info vfe17x_top_hw_info = {
.common_reg = &vfe17x_top_common_reg,
.camif_hw_info = {
@@ -104,6 +112,7 @@ static struct cam_vfe_top_ver2_hw_info vfe17x_top_hw_info = {
&vfe17x_rdi_2_data,
&vfe17x_rdi_3_data,
},
.rdi_irq_status = &vfe17x_rdi_irq_status,
},
.num_mux = 4,
.mux_type = {

13
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_lite_ver3.c
Datei anzeigen

@@ -881,8 +881,13 @@ static void cam_vfe_camif_lite_print_status(uint32_t *status,
if (status_0 & 0x20000000)
CAM_INFO(CAM_ISP, "RDI0 OVERFLOW");
if (status_0 & 0x40000000)
if (status_0 & 0x40000000) {
CAM_INFO(CAM_ISP, "PD PIPE OVERFLOW");
cam_cpas_reg_read(soc_private->cpas_handle,
CAM_CPAS_REG_CAMNOC, 0x1010, true, &val3);
CAM_INFO(CAM_ISP, "ife_rdi_Rd: 0x%x", val3);
cam_cpas_log_votes();
}
}
if (err_type == CAM_VFE_IRQ_STATUS_OVERFLOW && bus_overflow_status) {
@@ -1207,6 +1212,9 @@ static int cam_vfe_camif_lite_handle_irq_bottom_half(
ret = CAM_VFE_IRQ_STATUS_OVERFLOW;
CAM_INFO(CAM_ISP, "ife_clk_src:%lld",
soc_private->ife_clk_src);
cam_vfe_camif_lite_print_status(irq_status, ret,
camif_lite_priv);
@@ -1226,6 +1234,9 @@ static int cam_vfe_camif_lite_handle_irq_bottom_half(
ret = CAM_VFE_IRQ_STATUS_VIOLATION;
CAM_INFO(CAM_ISP, "ife_clk_src:%lld",
soc_private->ife_clk_src);
cam_vfe_camif_lite_print_status(irq_status, ret,
camif_lite_priv);

17
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver2.c
Datei anzeigen

@@ -777,6 +777,8 @@ static int cam_vfe_camif_handle_irq_bottom_half(void *handler_priv,
struct cam_vfe_mux_camif_data *camif_priv;
struct cam_vfe_top_irq_evt_payload *payload;
struct cam_isp_hw_event_info evt_info;
struct cam_hw_soc_info *soc_info = NULL;
struct cam_vfe_soc_private *soc_private = NULL;
uint32_t irq_status0;
uint32_t irq_status1;
uint32_t val;
@@ -793,6 +795,9 @@ static int cam_vfe_camif_handle_irq_bottom_half(void *handler_priv,
irq_status0 = payload->irq_reg_val[CAM_IFE_IRQ_CAMIF_REG_STATUS0];
irq_status1 = payload->irq_reg_val[CAM_IFE_IRQ_CAMIF_REG_STATUS1];
soc_info = camif_priv->soc_info;
soc_private = (struct cam_vfe_soc_private *)soc_info->soc_private;
evt_info.hw_idx = camif_node->hw_intf->hw_idx;
evt_info.res_id = camif_node->res_id;
evt_info.res_type = camif_node->res_type;
@@ -882,6 +887,12 @@ static int cam_vfe_camif_handle_irq_bottom_half(void *handler_priv,
payload->irq_reg_val[2]);
ret = CAM_VFE_IRQ_STATUS_OVERFLOW;
CAM_INFO(CAM_ISP, "ife_clk_src:%lld",
soc_private->ife_clk_src);
cam_cpas_log_votes();
if (camif_priv->camif_debug & CAMIF_DEBUG_ENABLE_REG_DUMP)
cam_vfe_camif_reg_dump(camif_node->res_priv);
}
@@ -902,6 +913,12 @@ static int cam_vfe_camif_handle_irq_bottom_half(void *handler_priv,
payload->irq_reg_val[2]);
ret = CAM_VFE_IRQ_STATUS_OVERFLOW;
CAM_INFO(CAM_ISP, "ife_clk_src:%lld",
soc_private->ife_clk_src);
cam_cpas_log_votes();
if (camif_priv->camif_debug & CAMIF_DEBUG_ENABLE_REG_DUMP)
cam_vfe_camif_reg_dump(camif_node->res_priv);
}

12
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver3.c
Datei anzeigen

@@ -1366,6 +1366,8 @@ static int cam_vfe_camif_ver3_handle_irq_bottom_half(void *handler_priv,
struct cam_vfe_mux_camif_ver3_data *camif_priv;
struct cam_vfe_top_irq_evt_payload *payload;
struct cam_isp_hw_event_info evt_info;
struct cam_hw_soc_info *soc_info = NULL;
struct cam_vfe_soc_private *soc_private = NULL;
uint32_t irq_status[CAM_IFE_IRQ_REGISTERS_MAX] = {0};
struct timespec64 ts;
uint32_t val = 0;
@@ -1382,6 +1384,10 @@ static int cam_vfe_camif_ver3_handle_irq_bottom_half(void *handler_priv,
camif_priv = camif_node->res_priv;
payload = evt_payload_priv;
soc_info = camif_priv->soc_info;
soc_private =
(struct cam_vfe_soc_private *)soc_info->soc_private;
for (i = 0; i < CAM_IFE_IRQ_REGISTERS_MAX; i++)
irq_status[i] = payload->irq_reg_val[i];
@@ -1469,6 +1475,9 @@ static int cam_vfe_camif_ver3_handle_irq_bottom_half(void *handler_priv,
ret = CAM_VFE_IRQ_STATUS_OVERFLOW;
CAM_INFO(CAM_ISP, "ife_clk_src:%lld",
soc_private->ife_clk_src);
cam_vfe_camif_ver3_print_status(irq_status, ret, camif_priv);
if (camif_priv->camif_debug & CAMIF_DEBUG_ENABLE_REG_DUMP)
@@ -1498,6 +1507,9 @@ static int cam_vfe_camif_ver3_handle_irq_bottom_half(void *handler_priv,
ret = CAM_VFE_IRQ_STATUS_VIOLATION;
CAM_INFO(CAM_ISP, "ife_clk_src:%lld",
soc_private->ife_clk_src);
cam_vfe_camif_ver3_print_status(irq_status, ret, camif_priv);
if (camif_priv->camif_debug & CAMIF_DEBUG_ENABLE_REG_DUMP)

5
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_rdi.c
Datei anzeigen

@@ -523,6 +523,9 @@ static int cam_vfe_rdi_handle_irq_bottom_half(void *handler_priv,
ret = CAM_VFE_IRQ_STATUS_SUCCESS;
}
if (!rdi_priv->rdi_irq_status)
goto end;
irq_rdi_status =
(irq_status1 &
rdi_priv->rdi_irq_status->rdi_overflow_mask);
@@ -566,7 +569,7 @@ static int cam_vfe_rdi_handle_irq_bottom_half(void *handler_priv,
(void *)&evt_info);
cam_cpas_log_votes();
}
end:
cam_vfe_rdi_put_evt_payload(rdi_priv, &payload);
CAM_DBG(CAM_ISP, "returing status = %d", ret);
return ret;

4
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver3.c
Datei anzeigen

@@ -119,6 +119,7 @@ static int cam_vfe_top_ver3_set_hw_clk_rate(
rc = 0;
goto end;
}
ahb_vote.type = CAM_VOTE_ABSOLUTE;
ahb_vote.vote.level = clk_lvl;
cam_cpas_update_ahb_vote(soc_private->cpas_handle, &ahb_vote);
@@ -651,6 +652,9 @@ int cam_vfe_top_ver3_stop(void *device_priv,
soc_info = top_priv->common_data.soc_info;
soc_private = soc_info->soc_private;
soc_info = top_priv->common_data.soc_info;
soc_private = soc_info->soc_private;
if (mux_res->res_id < CAM_ISP_HW_VFE_IN_MAX) {
rc = mux_res->stop(mux_res);
} else {