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

Merge "msm: camera: common: Add condition for presil read poll" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Camera Software Integration
2021-09-27 17:10:54 -07:00
committed by Gerrit - the friendly Code Review server
parent 740459b9f8 d7b6770119
commit 627ca795c4
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/cam_utils/cam_common_util.c
View File

@@ -13,11 +13,14 @@
#include <linux/moduleparam.h>
#include "cam_common_util.h"
#include "cam_debug_util.h"
#include "cam_presil_hw_access.h"
#if IS_REACHABLE(CONFIG_QCOM_VA_MINIDUMP)
#include <soc/qcom/minidump.h>
static struct cam_common_mini_dump_dev_info g_minidump_dev_info;
#endif
#define CAM_PRESIL_POLL_DELAY 20
static uint timeout_multiplier = 1;
module_param(timeout_multiplier, uint, 0644);
@@ -76,8 +79,7 @@ unsigned long cam_common_wait_for_completion_timeout(
timeout_multiplier = 1;
wait_jiffies = timeout_jiffies * timeout_multiplier;
rem_jiffies = wait_for_completion_timeout(
complete, wait_jiffies);
rem_jiffies = wait_for_completion_timeout(complete, wait_jiffies);
return rem_jiffies;
}
@@ -103,8 +105,14 @@ int cam_common_read_poll_timeout(
timeout_multiplier = 1;
wait_time_us = timeout * timeout_multiplier;
rc = readl_poll_timeout(addr,
*status, (*status & mask) == check_val, delay, wait_time_us);
if (false == cam_presil_mode_enabled()) {
rc = readl_poll_timeout(addr, *status, (*status & mask) == check_val, delay,
wait_time_us);
} else {
rc = cam_presil_readl_poll_timeout(addr, mask,
wait_time_us/(CAM_PRESIL_POLL_DELAY * 1000), CAM_PRESIL_POLL_DELAY);
}
return rc;
}