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

Merge "msm: cvp: Avoid interrupting FW after WFI"

Browse Source
This commit is contained in:
qctecmdr
2021-09-13 11:22:00 -07:00
committed by Gerrit - the friendly Code Review server
parent b758d5f436 bc49527660
commit b9eddedc29
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msm/eva/cvp_hfi.c
View File

@@ -2452,6 +2452,8 @@ static int __power_collapse(struct iris_hfi_device *device, bool force)
else if (rc) else if (rc)
goto skip_power_off; goto skip_power_off;
__flush_debug_queue(device, device->raw_packet);
pc_ready = __read_register(device, CVP_CTRL_STATUS) & pc_ready = __read_register(device, CVP_CTRL_STATUS) &
CVP_CTRL_STATUS_PC_READY; CVP_CTRL_STATUS_PC_READY;
if (!pc_ready) { if (!pc_ready) {
@@ -2506,8 +2508,6 @@ static int __power_collapse(struct iris_hfi_device *device, bool force)
} }
} }
__flush_debug_queue(device, device->raw_packet);
rc = __suspend(device); rc = __suspend(device);
if (rc) if (rc)
dprintk(CVP_ERR, "Failed __suspend\n"); dprintk(CVP_ERR, "Failed __suspend\n");

5
msm/eva/msm_cvp_common.c
View File

@@ -1315,8 +1315,9 @@ int msm_cvp_noc_error_info(struct msm_cvp_core *core)
last_fault_count = core->smmu_fault_count; last_fault_count = core->smmu_fault_count;
core->ssr_count++; core->ssr_count++;
dprintk(CVP_ERR, "cvp ssr count %d %d\n", core->ssr_count, dprintk(CVP_ERR, "cvp ssr count %d %d %d\n", core->ssr_count,
core->resources.max_ssr_allowed); core->resources.max_ssr_allowed,
core->smmu_fault_count);
hdev = core->device; hdev = core->device;
call_hfi_op(hdev, noc_error_info, hdev->hfi_device_data); call_hfi_op(hdev, noc_error_info, hdev->hfi_device_data);