A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

fogo: fix tombstone when use secure camera

Browse source 
details:
keep qcom's original call flow

Change-Id: I4ec83f60ab9d3a8bd2960c8c0f14e7dba16ba14d
Reviewed-on: https://gerrit.mot.com/2782622
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Binsheng Que <quebs2@motorola.com>
Reviewed-by: <yanglp10@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Xuehui Ye 2023-11-01 15:39:14 +08:00 • committed by PDO SCM Team
commit b111c17738
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c
View file

@ -1317,14 +1317,13 @@ retry_a:
goto retry_a;
} else if (rc <0 && retry_count > QCOM_SCM_EBUSY_MAX_RETRY){
CAM_INFO(CAM_CSIPHY, "CAM_STOP_PHYDEV: notify secure mode finally failed scm call with count: %d,",retry_count);
goto release_mutex;
} else {
csiphy_dev->csiphy_info[offset].secure_mode =
CAM_SECURE_MODE_NON_SECURE;
}
}
csiphy_dev->csiphy_info[offset].secure_mode =
CAM_SECURE_MODE_NON_SECURE;
#endif
csiphy_dev->csiphy_info[offset].csiphy_cpas_cp_reg_mask = 0x0;
@ -1399,17 +1398,15 @@ retry_b:
csiphy_dev,
CAM_SECURE_MODE_NON_SECURE, offset);
if (rc <0 && retry_count <= QCOM_SCM_EBUSY_MAX_RETRY) {
CAM_INFO(CAM_CSIPHY, "CAM_RELEASE_PHYDEV: zhp scm call with count: %d,",retry_count);
CAM_INFO(CAM_CSIPHY, "CAM_RELEASE_PHYDEV: scm call with count: %d,",retry_count);
goto retry_b;
} else if (rc <0 && retry_count > QCOM_SCM_EBUSY_MAX_RETRY){
CAM_INFO(CAM_CSIPHY, "CAM_RELEASE_PHYDEV: zhp notify secure mode finally failed scm call with count: %d,",retry_count);
goto release_mutex;
} else {
csiphy_dev->csiphy_info[offset].secure_mode =
CAM_SECURE_MODE_NON_SECURE;
CAM_INFO(CAM_CSIPHY, "CAM_RELEASE_PHYDEV: notify secure mode finally failed scm call with count: %d,",retry_count);
}
}
csiphy_dev->csiphy_info[offset].secure_mode =
CAM_SECURE_MODE_NON_SECURE;
#endif
csiphy_dev->csiphy_cpas_cp_reg_mask[offset] = 0x0;