samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

Merge "msm: camera: common: modify ipe bps reset to use common read poll" into camera-kernel.lnx.5.0

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Camera Software Integration
2021-06-03 17:54:19 -07:00
committet von Gerrit - the friendly Code Review server
Ursprung 97c6ec1a44 ee83e6afc7
Commit 8501fd8d3d
3 geänderte Dateien mit 22 neuen und 18 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

17
drivers/cam_icp/icp_hw/bps_hw/bps_core.c
Datei anzeigen

@@ -24,8 +24,7 @@
#include "cam_cpas_api.h"
#include "cam_debug_util.h"
#include "hfi_reg.h"
#define HFI_MAX_POLL_TRY 5
#include "cam_common_util.h"
static int cam_bps_cpas_vote(struct cam_bps_device_core_info *core_info,
struct cam_icp_cpas_vote *cpas_vote)
@@ -291,10 +290,11 @@ static int cam_bps_cmd_reset(struct cam_hw_soc_info *soc_info,
cam_io_w_mb(hw_info->cdm_rst_val,
soc_info->reg_map[0].mem_base + hw_info->cdm_rst_cmd);
while (retry_cnt < HFI_MAX_POLL_TRY) {
readw_poll_timeout((soc_info->reg_map[0].mem_base +
cam_common_read_poll_timeout((soc_info->reg_map[0].mem_base +
hw_info->cdm_irq_status),
status, ((status & BPS_RST_DONE_IRQ_STATUS_BIT) == 0x1),
100, 10000);
PC_POLL_DELAY_US, PC_POLL_TIMEOUT_US,
BPS_RST_DONE_IRQ_STATUS_BIT, BPS_RST_DONE_IRQ_STATUS_BIT,
&status);
CAM_DBG(CAM_ICP, "bps_cdm_irq_status = %u", status);
@@ -314,10 +314,11 @@ static int cam_bps_cmd_reset(struct cam_hw_soc_info *soc_info,
cam_io_w_mb((uint32_t)0x3,
soc_info->reg_map[0].mem_base + hw_info->top_rst_cmd);
while (retry_cnt < HFI_MAX_POLL_TRY) {
readw_poll_timeout((soc_info->reg_map[0].mem_base +
cam_common_read_poll_timeout((soc_info->reg_map[0].mem_base +
hw_info->top_irq_status),
status, ((status & BPS_RST_DONE_IRQ_STATUS_BIT) == 0x1),
100, 10000);
PC_POLL_DELAY_US, PC_POLL_TIMEOUT_US,
BPS_RST_DONE_IRQ_STATUS_BIT, BPS_RST_DONE_IRQ_STATUS_BIT,
&status);
CAM_DBG(CAM_ICP, "bps_top_irq_status = %u", status);

4
drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_icp_hw_intf.h
Datei anzeigen

@@ -15,6 +15,10 @@
#define CAM_ICP_UBWC_COMP_EN BIT(1)
#define HFI_MAX_POLL_TRY 5
#define PC_POLL_DELAY_US 100
#define PC_POLL_TIMEOUT_US 10000
enum cam_icp_hw_type {
CAM_ICP_DEV_A5,
CAM_ICP_DEV_LX7,

19
drivers/cam_icp/icp_hw/ipe_hw/ipe_core.c
Datei anzeigen

@@ -23,8 +23,7 @@
#include "cam_cpas_api.h"
#include "cam_debug_util.h"
#include "hfi_reg.h"
#define HFI_MAX_POLL_TRY 5
#include "cam_common_util.h"
static int cam_ipe_cpas_vote(struct cam_ipe_device_core_info *core_info,
struct cam_icp_cpas_vote *cpas_vote)
@@ -288,13 +287,13 @@ static int cam_ipe_cmd_reset(struct cam_hw_soc_info *soc_info,
cam_io_w_mb(hw_info->cdm_rst_val,
soc_info->reg_map[0].mem_base + hw_info->cdm_rst_cmd);
while (retry_cnt < HFI_MAX_POLL_TRY) {
readw_poll_timeout((soc_info->reg_map[0].mem_base +
cam_common_read_poll_timeout((soc_info->reg_map[0].mem_base +
hw_info->cdm_irq_status),
status, ((status & IPE_RST_DONE_IRQ_STATUS_BIT) == 0x1),
100, 10000);
PC_POLL_DELAY_US, PC_POLL_TIMEOUT_US,
IPE_RST_DONE_IRQ_STATUS_BIT, IPE_RST_DONE_IRQ_STATUS_BIT,
&status);
CAM_DBG(CAM_HFI, "ipe_cdm_irq_status = %u", status);
if ((status & IPE_RST_DONE_IRQ_STATUS_BIT) == 0x1)
break;
retry_cnt++;
@@ -311,14 +310,14 @@ static int cam_ipe_cmd_reset(struct cam_hw_soc_info *soc_info,
cam_io_w_mb((uint32_t)0x3,
soc_info->reg_map[0].mem_base + hw_info->top_rst_cmd);
while (retry_cnt < HFI_MAX_POLL_TRY) {
readw_poll_timeout((soc_info->reg_map[0].mem_base +
cam_common_read_poll_timeout((soc_info->reg_map[0].mem_base +
hw_info->top_irq_status),
status, ((status & IPE_RST_DONE_IRQ_STATUS_BIT) == 0x1),
100, 10000);
PC_POLL_DELAY_US, PC_POLL_TIMEOUT_US,
IPE_RST_DONE_IRQ_STATUS_BIT, IPE_RST_DONE_IRQ_STATUS_BIT,
&status);
CAM_DBG(CAM_HFI, "ipe_top_irq_status = %u", status);
if ((status & IPE_RST_DONE_IRQ_STATUS_BIT) == 0x1)
break;
retry_cnt++;