|
@@ -45,7 +45,7 @@ int cam_req_mgr_util_init(void)
|
|
hdl_tbl = hdl_tbl_local;
|
|
hdl_tbl = hdl_tbl_local;
|
|
spin_unlock_bh(&hdl_tbl_lock);
|
|
spin_unlock_bh(&hdl_tbl_lock);
|
|
|
|
|
|
- bitmap_size = BITS_TO_LONGS(CAM_REQ_MGR_MAX_HANDLES) * sizeof(long);
|
|
|
|
|
|
+ bitmap_size = BITS_TO_LONGS(CAM_REQ_MGR_MAX_HANDLES_V2) * sizeof(long);
|
|
hdl_tbl->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
|
|
hdl_tbl->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
|
|
if (!hdl_tbl->bitmap) {
|
|
if (!hdl_tbl->bitmap) {
|
|
rc = -ENOMEM;
|
|
rc = -ENOMEM;
|
|
@@ -92,7 +92,7 @@ int cam_req_mgr_util_free_hdls(void)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
- for (i = 0; i < CAM_REQ_MGR_MAX_HANDLES; i++) {
|
|
|
|
|
|
+ for (i = 0; i < CAM_REQ_MGR_MAX_HANDLES_V2; i++) {
|
|
if (hdl_tbl->hdl[i].state == HDL_ACTIVE) {
|
|
if (hdl_tbl->hdl[i].state == HDL_ACTIVE) {
|
|
CAM_WARN(CAM_CRM, "Dev handle = %x session_handle = %x",
|
|
CAM_WARN(CAM_CRM, "Dev handle = %x session_handle = %x",
|
|
hdl_tbl->hdl[i].hdl_value,
|
|
hdl_tbl->hdl[i].hdl_value,
|
|
@@ -101,7 +101,7 @@ int cam_req_mgr_util_free_hdls(void)
|
|
clear_bit(i, hdl_tbl->bitmap);
|
|
clear_bit(i, hdl_tbl->bitmap);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- bitmap_zero(hdl_tbl->bitmap, CAM_REQ_MGR_MAX_HANDLES);
|
|
|
|
|
|
+ bitmap_zero(hdl_tbl->bitmap, CAM_REQ_MGR_MAX_HANDLES_V2);
|
|
spin_unlock_bh(&hdl_tbl_lock);
|
|
spin_unlock_bh(&hdl_tbl_lock);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -113,7 +113,7 @@ static int32_t cam_get_free_handle_index(void)
|
|
|
|
|
|
idx = find_first_zero_bit(hdl_tbl->bitmap, hdl_tbl->bits);
|
|
idx = find_first_zero_bit(hdl_tbl->bitmap, hdl_tbl->bits);
|
|
|
|
|
|
- if (idx >= CAM_REQ_MGR_MAX_HANDLES || idx < 0)
|
|
|
|
|
|
+ if (idx >= CAM_REQ_MGR_MAX_HANDLES_V2 || idx < 0)
|
|
return -ENOSR;
|
|
return -ENOSR;
|
|
|
|
|
|
set_bit(idx, hdl_tbl->bitmap);
|
|
set_bit(idx, hdl_tbl->bitmap);
|
|
@@ -201,7 +201,7 @@ void *cam_get_device_priv(int32_t dev_hdl)
|
|
}
|
|
}
|
|
|
|
|
|
idx = CAM_REQ_MGR_GET_HDL_IDX(dev_hdl);
|
|
idx = CAM_REQ_MGR_GET_HDL_IDX(dev_hdl);
|
|
- if (idx >= CAM_REQ_MGR_MAX_HANDLES) {
|
|
|
|
|
|
+ if (idx >= CAM_REQ_MGR_MAX_HANDLES_V2) {
|
|
CAM_ERR_RATE_LIMIT(CAM_CRM, "Invalid idx");
|
|
CAM_ERR_RATE_LIMIT(CAM_CRM, "Invalid idx");
|
|
goto device_priv_fail;
|
|
goto device_priv_fail;
|
|
}
|
|
}
|
|
@@ -245,7 +245,7 @@ void *cam_get_device_ops(int32_t dev_hdl)
|
|
}
|
|
}
|
|
|
|
|
|
idx = CAM_REQ_MGR_GET_HDL_IDX(dev_hdl);
|
|
idx = CAM_REQ_MGR_GET_HDL_IDX(dev_hdl);
|
|
- if (idx >= CAM_REQ_MGR_MAX_HANDLES) {
|
|
|
|
|
|
+ if (idx >= CAM_REQ_MGR_MAX_HANDLES_V2) {
|
|
CAM_ERR(CAM_CRM, "Invalid idx");
|
|
CAM_ERR(CAM_CRM, "Invalid idx");
|
|
goto device_ops_fail;
|
|
goto device_ops_fail;
|
|
}
|
|
}
|
|
@@ -288,7 +288,7 @@ static int cam_destroy_hdl(int32_t dev_hdl, int dev_hdl_type)
|
|
}
|
|
}
|
|
|
|
|
|
idx = CAM_REQ_MGR_GET_HDL_IDX(dev_hdl);
|
|
idx = CAM_REQ_MGR_GET_HDL_IDX(dev_hdl);
|
|
- if (idx >= CAM_REQ_MGR_MAX_HANDLES) {
|
|
|
|
|
|
+ if (idx >= CAM_REQ_MGR_MAX_HANDLES_V2) {
|
|
CAM_ERR(CAM_CRM, "Invalid idx %d", idx);
|
|
CAM_ERR(CAM_CRM, "Invalid idx %d", idx);
|
|
goto destroy_hdl_fail;
|
|
goto destroy_hdl_fail;
|
|
}
|
|
}
|