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

Merge "msm: camera: isp: fix KMD prevent issues like OOB" into camera-kernel.lnx.7.0

Browse Source
This commit is contained in:
Camera Software Integration
2023-12-07 21:18:05 -08:00
committed by Gerrit - the friendly Code Review server
parent c5f0f907fd 9a45cdd009
commit 46c3009877
2 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3955,7 +3955,8 @@ static int cam_ife_csid_ver2_path_irq_subscribe(
struct cam_isp_resource_node *res, struct cam_isp_resource_node *res,
uint32_t irq_mask, uint32_t err_irq_mask) uint32_t irq_mask, uint32_t err_irq_mask)
{ {
uint32_t top_irq_mask = 0; uint32_t num_register = 0;
uint32_t *top_irq_mask = NULL;
struct cam_ife_csid_ver2_path_cfg *path_cfg = res->res_priv; struct cam_ife_csid_ver2_path_cfg *path_cfg = res->res_priv;
struct cam_ife_csid_ver2_reg_info *csid_reg = csid_hw->core_info->csid_reg; struct cam_ife_csid_ver2_reg_info *csid_reg = csid_hw->core_info->csid_reg;
int i, rc; int i, rc;
@@ -3974,7 +3975,15 @@ static int cam_ife_csid_ver2_path_irq_subscribe(
return -EINVAL; return -EINVAL;
} }
top_irq_mask = csid_reg->path_reg[res->res_id]->top_irq_mask[top_index]; num_register = csid_reg->top_irq_reg_info[top_index].num_registers;
top_irq_mask = vmalloc(sizeof(uint32_t) * num_register);
if (!top_irq_mask) {
CAM_ERR(CAM_ISP, "csid top_irq_mask allocation failed");
return -ENOMEM;
}
top_irq_mask[0] = csid_reg->path_reg[res->res_id]->top_irq_mask[top_index];
if (csid_reg->path_reg[res->res_id]->capabilities & CAM_IFE_CSID_CAP_MULTI_CTXT) { if (csid_reg->path_reg[res->res_id]->capabilities & CAM_IFE_CSID_CAP_MULTI_CTXT) {
rc = cam_ife_csid_ver2_mc_irq_subscribe(csid_hw, res, top_index); rc = cam_ife_csid_ver2_mc_irq_subscribe(csid_hw, res, top_index);
if (rc || csid_hw->top_mc_irq_handle < 1) { if (rc || csid_hw->top_mc_irq_handle < 1) {
@@ -3987,7 +3996,7 @@ static int cam_ife_csid_ver2_path_irq_subscribe(
path_cfg->top_irq_handle = cam_irq_controller_subscribe_irq( path_cfg->top_irq_handle = cam_irq_controller_subscribe_irq(
csid_hw->top_irq_controller[top_index], csid_hw->top_irq_controller[top_index],
CAM_IRQ_PRIORITY_0, CAM_IRQ_PRIORITY_0,
&top_irq_mask, top_irq_mask,
res, res,
cam_ife_csid_ver2_handle_path_irq, cam_ife_csid_ver2_handle_path_irq,
NULL, NULL, NULL, CAM_IRQ_EVT_GROUP_0); NULL, NULL, NULL, CAM_IRQ_EVT_GROUP_0);
@@ -4000,7 +4009,7 @@ static int cam_ife_csid_ver2_path_irq_subscribe(
} }
rc = cam_irq_controller_register_dependent(csid_hw->top_irq_controller[top_index], rc = cam_irq_controller_register_dependent(csid_hw->top_irq_controller[top_index],
csid_hw->path_irq_controller[res->res_id], &top_irq_mask); csid_hw->path_irq_controller[res->res_id], top_irq_mask);
if (rc) if (rc)
goto unsub_top; goto unsub_top;
@@ -4040,7 +4049,7 @@ static int cam_ife_csid_ver2_path_irq_subscribe(
rc = -EINVAL; rc = -EINVAL;
goto unsub_path; goto unsub_path;
} }
vfree(top_irq_mask);
return 0; return 0;
unsub_path: unsub_path:
@@ -4059,6 +4068,7 @@ unsub_mc:
csid_hw->top_mc_irq_handle); csid_hw->top_mc_irq_handle);
csid_hw->top_mc_irq_handle = 0; csid_hw->top_mc_irq_handle = 0;
end: end:
vfree(top_irq_mask);
return rc; return rc;
} }
@@ -4501,7 +4511,8 @@ static int cam_ife_csid_ver2_csi2_irq_subscribe(struct cam_ife_csid_ver2_hw *csi
uint32_t irq_mask, uint32_t err_irq_mask) uint32_t irq_mask, uint32_t err_irq_mask)
{ {
struct cam_ife_csid_ver2_reg_info *csid_reg = csid_hw->core_info->csid_reg; struct cam_ife_csid_ver2_reg_info *csid_reg = csid_hw->core_info->csid_reg;
uint32_t top_irq_mask = 0; uint32_t num_register = 0;
uint32_t *top_irq_mask = NULL;
int top_index = -1; int top_index = -1;
int i, rc; int i, rc;
@@ -4519,11 +4530,19 @@ static int cam_ife_csid_ver2_csi2_irq_subscribe(struct cam_ife_csid_ver2_hw *csi
return rc; return rc;
} }
top_irq_mask = csid_reg->csi2_reg->top_irq_mask[top_index]; num_register = csid_reg->top_irq_reg_info[top_index].num_registers;
top_irq_mask = vmalloc(sizeof(uint32_t) * num_register);
if (!top_irq_mask) {
CAM_ERR(CAM_ISP, "csid top_irq_mask allocation failed");
return -ENOMEM;
}
top_irq_mask[0] = csid_reg->csi2_reg->top_irq_mask[top_index];
csid_hw->rx_cfg.top_irq_handle = cam_irq_controller_subscribe_irq( csid_hw->rx_cfg.top_irq_handle = cam_irq_controller_subscribe_irq(
csid_hw->top_irq_controller[top_index], csid_hw->top_irq_controller[top_index],
CAM_IRQ_PRIORITY_0, CAM_IRQ_PRIORITY_0,
&top_irq_mask, top_irq_mask,
csid_hw, csid_hw,
cam_ife_csid_ver2_handle_rx_irq, cam_ife_csid_ver2_handle_rx_irq,
NULL, NULL, NULL, CAM_IRQ_EVT_GROUP_0); NULL, NULL, NULL, CAM_IRQ_EVT_GROUP_0);
@@ -4537,7 +4556,7 @@ static int cam_ife_csid_ver2_csi2_irq_subscribe(struct cam_ife_csid_ver2_hw *csi
rc = cam_irq_controller_register_dependent(csid_hw->top_irq_controller[top_index], rc = cam_irq_controller_register_dependent(csid_hw->top_irq_controller[top_index],
csid_hw->rx_irq_controller[CAM_IFE_CSID_RX_IRQ_STATUS_REG0], csid_hw->rx_irq_controller[CAM_IFE_CSID_RX_IRQ_STATUS_REG0],
&top_irq_mask); top_irq_mask);
if (rc) if (rc)
goto unsub_top; goto unsub_top;
@@ -4582,7 +4601,7 @@ static int cam_ife_csid_ver2_csi2_irq_subscribe(struct cam_ife_csid_ver2_hw *csi
rc = -EINVAL; rc = -EINVAL;
goto unsub_rx; goto unsub_rx;
} }
vfree(top_irq_mask);
return 0; return 0;
unsub_rx: unsub_rx:
@@ -4599,6 +4618,7 @@ unsub_top:
csid_hw->rx_cfg.top_irq_handle); csid_hw->rx_cfg.top_irq_handle);
csid_hw->rx_cfg.top_irq_handle = 0; csid_hw->rx_cfg.top_irq_handle = 0;
err: err:
vfree(top_irq_mask);
return rc; return rc;
} }
@@ -4911,8 +4931,9 @@ static int cam_ife_csid_ver2_enable_hw(
int i, rc; int i, rc;
void __iomem *mem_base; void __iomem *mem_base;
const struct cam_ife_csid_ver2_path_reg_info *path_reg = NULL; const struct cam_ife_csid_ver2_path_reg_info *path_reg = NULL;
uint32_t num_register = 0;
uint32_t top_err_irq_mask = 0; uint32_t top_err_irq_mask = 0;
uint32_t buf_done_irq_mask = 0; uint32_t *buf_done_irq_mask = NULL;
uint32_t top_info_irq_mask = 0; uint32_t top_info_irq_mask = 0;
if (csid_hw->flags.device_enabled) { if (csid_hw->flags.device_enabled) {
@@ -4953,16 +4974,22 @@ static int cam_ife_csid_ver2_enable_hw(
/* Read hw version */ /* Read hw version */
val = cam_io_r_mb(mem_base + csid_reg->cmn_reg->hw_version_addr); val = cam_io_r_mb(mem_base + csid_reg->cmn_reg->hw_version_addr);
buf_done_irq_mask = csid_reg->cmn_reg->top_buf_done_irq_mask; num_register = csid_reg->top_irq_reg_info[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0].num_registers;
buf_done_irq_mask = vmalloc(sizeof(uint32_t) * num_register);
if (!buf_done_irq_mask) {
CAM_ERR(CAM_ISP, "csid buf_done_irq_mask allocation failed");
return -ENOMEM;
}
buf_done_irq_mask[0] = csid_reg->cmn_reg->top_buf_done_irq_mask;
if (csid_reg->ipp_mc_reg) if (csid_reg->ipp_mc_reg)
buf_done_irq_mask |= csid_reg->ipp_mc_reg->comp_subgrp0_mask | buf_done_irq_mask[0] |= csid_reg->ipp_mc_reg->comp_subgrp0_mask |
csid_reg->ipp_mc_reg->comp_subgrp2_mask; csid_reg->ipp_mc_reg->comp_subgrp2_mask;
csid_hw->buf_done_irq_handle = cam_irq_controller_subscribe_irq( csid_hw->buf_done_irq_handle = cam_irq_controller_subscribe_irq(
csid_hw->top_irq_controller[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0], csid_hw->top_irq_controller[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0],
CAM_IRQ_PRIORITY_4, CAM_IRQ_PRIORITY_4,
&buf_done_irq_mask, buf_done_irq_mask,
csid_hw, csid_hw,
cam_ife_csid_ver2_handle_buf_done_irq, cam_ife_csid_ver2_handle_buf_done_irq,
NULL, NULL,
@@ -4974,7 +5001,8 @@ static int cam_ife_csid_ver2_enable_hw(
if (csid_hw->buf_done_irq_handle < 1) { if (csid_hw->buf_done_irq_handle < 1) {
CAM_ERR(CAM_ISP, "CSID[%u] buf done irq subscribe fail", CAM_ERR(CAM_ISP, "CSID[%u] buf done irq subscribe fail",
csid_hw->hw_intf->hw_idx); csid_hw->hw_intf->hw_idx);
return -EINVAL; rc = -EINVAL;
goto free_buf_done_mask;
} }
top_err_irq_mask = csid_reg->cmn_reg->top_err_irq_mask[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0]; top_err_irq_mask = csid_reg->cmn_reg->top_err_irq_mask[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0];
@@ -4999,7 +5027,7 @@ static int cam_ife_csid_ver2_enable_hw(
rc = cam_irq_controller_register_dependent(csid_hw->top_irq_controller rc = cam_irq_controller_register_dependent(csid_hw->top_irq_controller
[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0], [CAM_IFE_CSID_TOP_IRQ_STATUS_REG0],
csid_hw->buf_done_irq_controller, &buf_done_irq_mask); csid_hw->buf_done_irq_controller, buf_done_irq_mask);
if (rc) { if (rc) {
cam_irq_controller_unsubscribe_irq( cam_irq_controller_unsubscribe_irq(
@@ -5036,6 +5064,7 @@ static int cam_ife_csid_ver2_enable_hw(
csid_hw->flags.fatal_err_detected = false; csid_hw->flags.fatal_err_detected = false;
CAM_DBG(CAM_ISP, "CSID:%u CSID HW version: 0x%x", CAM_DBG(CAM_ISP, "CSID:%u CSID HW version: 0x%x",
csid_hw->hw_intf->hw_idx, val); csid_hw->hw_intf->hw_idx, val);
vfree(buf_done_irq_mask);
return 0; return 0;
@@ -5050,6 +5079,8 @@ unsubscribe_buf_done:
csid_hw->top_irq_controller[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0], csid_hw->top_irq_controller[CAM_IFE_CSID_TOP_IRQ_STATUS_REG0],
csid_hw->buf_done_irq_handle); csid_hw->buf_done_irq_handle);
csid_hw->buf_done_irq_handle = 0; csid_hw->buf_done_irq_handle = 0;
free_buf_done_mask:
vfree(buf_done_irq_mask);
return rc; return rc;
} }

2
drivers/cam_utils/cam_compat.c
View File

@@ -558,7 +558,7 @@ static int inline cam_subdev_list_cmp(struct cam_subdev *entry_1, struct cam_sub
#if (KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE) #if (KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE)
int cam_compat_util_get_dmabuf_va(struct dma_buf *dmabuf, uintptr_t *vaddr) int cam_compat_util_get_dmabuf_va(struct dma_buf *dmabuf, uintptr_t *vaddr)
{ {
struct iosys_map mapping; struct iosys_map mapping = {0};
int error_code = dma_buf_vmap(dmabuf, &mapping); int error_code = dma_buf_vmap(dmabuf, &mapping);
if (error_code) { if (error_code) {