From b111c17738dbbcf6b59fc27eb28654c5117aec77 Mon Sep 17 00:00:00 2001 From: Xuehui Ye Date: Wed, 1 Nov 2023 15:39:14 +0800 Subject: [PATCH] fogo: fix tombstone when use secure camera 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 Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- .../cam_csiphy/cam_csiphy_core.c | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c b/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c index f27b79cfa344..c06e867a185d 100644 --- a/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c +++ b/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c @@ -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;