|
@@ -682,7 +682,7 @@ int cam_hfi_resume(struct hfi_mem_info *hfi_mem)
|
|
if (cam_common_read_poll_timeout(icp_base +
|
|
if (cam_common_read_poll_timeout(icp_base +
|
|
HFI_REG_ICP_HOST_INIT_RESPONSE,
|
|
HFI_REG_ICP_HOST_INIT_RESPONSE,
|
|
HFI_POLL_DELAY_US, HFI_POLL_TIMEOUT_US,
|
|
HFI_POLL_DELAY_US, HFI_POLL_TIMEOUT_US,
|
|
- 0x1, ICP_INIT_RESP_SUCCESS, &status)) {
|
|
|
|
|
|
+ (uint32_t)UINT_MAX, ICP_INIT_RESP_SUCCESS, &status)) {
|
|
CAM_ERR(CAM_HFI, "response poll timed out: status=0x%08x",
|
|
CAM_ERR(CAM_HFI, "response poll timed out: status=0x%08x",
|
|
status);
|
|
status);
|
|
return -ETIMEDOUT;
|
|
return -ETIMEDOUT;
|
|
@@ -916,8 +916,6 @@ int cam_hfi_init(struct hfi_mem_info *hfi_mem, const struct hfi_ops *hfi_ops,
|
|
icp_base + HFI_REG_SECONDARY_HEAP_PTR);
|
|
icp_base + HFI_REG_SECONDARY_HEAP_PTR);
|
|
cam_io_w_mb((uint32_t)hfi_mem->sec_heap.len,
|
|
cam_io_w_mb((uint32_t)hfi_mem->sec_heap.len,
|
|
icp_base + HFI_REG_SECONDARY_HEAP_SIZE);
|
|
icp_base + HFI_REG_SECONDARY_HEAP_SIZE);
|
|
- cam_io_w_mb((uint32_t)ICP_INIT_REQUEST_SET,
|
|
|
|
- icp_base + HFI_REG_HOST_ICP_INIT_REQUEST);
|
|
|
|
cam_io_w_mb((uint32_t)hfi_mem->qdss.iova,
|
|
cam_io_w_mb((uint32_t)hfi_mem->qdss.iova,
|
|
icp_base + HFI_REG_QDSS_IOVA);
|
|
icp_base + HFI_REG_QDSS_IOVA);
|
|
cam_io_w_mb((uint32_t)hfi_mem->qdss.len,
|
|
cam_io_w_mb((uint32_t)hfi_mem->qdss.len,
|
|
@@ -934,6 +932,8 @@ int cam_hfi_init(struct hfi_mem_info *hfi_mem, const struct hfi_ops *hfi_ops,
|
|
icp_base + HFI_REG_FWUNCACHED_REGION_IOVA);
|
|
icp_base + HFI_REG_FWUNCACHED_REGION_IOVA);
|
|
cam_io_w_mb((uint32_t)hfi_mem->fw_uncached.len,
|
|
cam_io_w_mb((uint32_t)hfi_mem->fw_uncached.len,
|
|
icp_base + HFI_REG_FWUNCACHED_REGION_SIZE);
|
|
icp_base + HFI_REG_FWUNCACHED_REGION_SIZE);
|
|
|
|
+ cam_io_w_mb((uint32_t)ICP_INIT_REQUEST_SET,
|
|
|
|
+ icp_base + HFI_REG_HOST_ICP_INIT_REQUEST);
|
|
|
|
|
|
CAM_DBG(CAM_HFI, "IO1 : [0x%x 0x%x] IO2 [0x%x 0x%x]",
|
|
CAM_DBG(CAM_HFI, "IO1 : [0x%x 0x%x] IO2 [0x%x 0x%x]",
|
|
hfi_mem->io_mem.iova, hfi_mem->io_mem.len,
|
|
hfi_mem->io_mem.iova, hfi_mem->io_mem.len,
|
|
@@ -954,7 +954,7 @@ int cam_hfi_init(struct hfi_mem_info *hfi_mem, const struct hfi_ops *hfi_ops,
|
|
if (cam_common_read_poll_timeout(icp_base +
|
|
if (cam_common_read_poll_timeout(icp_base +
|
|
HFI_REG_ICP_HOST_INIT_RESPONSE,
|
|
HFI_REG_ICP_HOST_INIT_RESPONSE,
|
|
HFI_POLL_DELAY_US, HFI_POLL_TIMEOUT_US,
|
|
HFI_POLL_DELAY_US, HFI_POLL_TIMEOUT_US,
|
|
- 0x1, ICP_INIT_RESP_SUCCESS, &status)) {
|
|
|
|
|
|
+ (uint32_t)UINT_MAX, ICP_INIT_RESP_SUCCESS, &status)) {
|
|
CAM_ERR(CAM_HFI, "response poll timed out: status=0x%08x",
|
|
CAM_ERR(CAM_HFI, "response poll timed out: status=0x%08x",
|
|
status);
|
|
status);
|
|
rc = -ETIMEDOUT;
|
|
rc = -ETIMEDOUT;
|