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

msm: eva: Condition ready check for IRQ_MASK

Browse Source 
Core shall be powered on and WRAPPER_SPARE bit 1 shall be clear.

Change-Id: Id225c44f4a245482a8b9387109211461d03042e9
Signed-off-by: George Shen <quic_sqiao@quicinc.com>
This commit is contained in:
George Shen
2023-06-16 12:11:21 -07:00
parent 18d64ef8af
commit aafc38db81
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
msm/eva/cvp_hfi.c
View File

@@ -4441,7 +4441,7 @@ static int __power_on_core(struct iris_hfi_device *device)
static int __iris_power_on(struct iris_hfi_device *device) static int __iris_power_on(struct iris_hfi_device *device)
{ {
int rc = 0; int rc = 0;
u32 reg_gdsc, reg_cbcr, spare_val;
if (device->power_enabled) if (device->power_enabled)
return 0; return 0;
@@ -4484,6 +4484,36 @@ static int __iris_power_on(struct iris_hfi_device *device)
goto fail_enable_core; goto fail_enable_core;
dprintk(CVP_CORE, "Done with register set\n"); dprintk(CVP_CORE, "Done with register set\n");
reg_gdsc = __read_register(device, CVP_CC_MVS1_GDSCR);
reg_cbcr = __read_register(device, CVP_CC_MVS1_CBCR);
if (!(reg_gdsc & 0x80000000) || (reg_cbcr & 0x80000000)) {
rc = -EINVAL;
dprintk(CVP_ERR, "CORE power on failed gdsc %x cbcr %x\n",
reg_gdsc, reg_cbcr);
goto fail_enable_core;
}
reg_gdsc = __read_register(device, CVP_CC_MVS1C_GDSCR);
reg_cbcr = __read_register(device, CVP_CC_MVS1C_CBCR);
if (!(reg_gdsc & 0x80000000) || (reg_cbcr & 0x80000000)) {
rc = -EINVAL;
dprintk(CVP_ERR, "CTRL power on failed gdsc %x cbcr %x\n",
reg_gdsc, reg_cbcr);
goto fail_enable_core;
}
spare_val = __read_register(device, CVP_AON_WRAPPER_SPARE);
if ((spare_val & 0x2) != 0) {
usleep_range(2000, 3000);
spare_val = __read_register(device, CVP_AON_WRAPPER_SPARE);
if ((spare_val & 0x2) != 0) {
dprintk(CVP_ERR, "WRAPPER_SPARE non-zero %#x\n", spare_val);
rc = -EINVAL;
goto fail_enable_core;
}
}
call_iris_op(device, interrupt_init, device); call_iris_op(device, interrupt_init, device);
dprintk(CVP_CORE, "Done with interrupt enabling\n"); dprintk(CVP_CORE, "Done with interrupt enabling\n");
device->intr_status = 0; device->intr_status = 0;
@@ -4878,7 +4908,6 @@ static void power_off_iris2(struct iris_hfi_device *device)
static inline int __resume(struct iris_hfi_device *device) static inline int __resume(struct iris_hfi_device *device)
{ {
int rc = 0; int rc = 0;
u32 reg_gdsc, reg_cbcr;
struct msm_cvp_core *core; struct msm_cvp_core *core;
if (!device) { if (!device) {
@@ -4900,12 +4929,6 @@ static inline int __resume(struct iris_hfi_device *device)
goto err_iris_power_on; goto err_iris_power_on;
} }
reg_gdsc = __read_register(device, CVP_CC_MVS1C_GDSCR);
reg_cbcr = __read_register(device, CVP_CC_MVS1C_CBCR);
if (!(reg_gdsc & 0x80000000) || (reg_cbcr & 0x80000000))
dprintk(CVP_ERR, "CVP power on failed gdsc %x cbcr %x\n",
reg_gdsc, reg_cbcr);
__setup_ucregion_memory_map(device); __setup_ucregion_memory_map(device);
/* RUMI: set CVP_CTRL_INIT register to disable synx in FW */ /* RUMI: set CVP_CTRL_INIT register to disable synx in FW */