leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: venus: hfi: Check for sys error on session hfi functions

Browse Source 
Check sys error flag for all hfi_session_xxx functions and
exit with EIO in case of an error.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Tested-by: Vikash Garodia <vgarodia@codeaurora.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Stanimir Varbanov 2021-04-23 08:29:31 +01:00 committed by Mauro Carvalho Chehab
parent b46ff4eb34
commit 3efc5204dd
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/media/platform/qcom/venus/hfi.c
View File

@ -187,6 +187,11 @@ int hfi_session_create(struct venus_inst *inst, const struct hfi_inst_ops *ops)
mutex_lock(&core->lock);
if (test_bit(0, &inst->core->sys_error)) {
ret = -EIO;
goto unlock;
}
max = atomic_add_unless(&core->insts_count, 1,
core->max_sessions_supported);
if (!max) {
@ -196,6 +201,7 @@ int hfi_session_create(struct venus_inst *inst, const struct hfi_inst_ops *ops)
ret = 0;
}
unlock:
mutex_unlock(&core->lock);
return ret;
@ -263,6 +269,9 @@ int hfi_session_deinit(struct venus_inst *inst)
if (inst->state < INST_INIT)
return -EINVAL;
if (test_bit(0, &inst->core->sys_error))
goto done;
reinit_completion(&inst->done);
ret = ops->session_end(inst);
@ -273,6 +282,7 @@ int hfi_session_deinit(struct venus_inst *inst)
if (ret)
return ret;
done:
inst->state = INST_UNINIT;
return 0;
@ -284,6 +294,9 @@ int hfi_session_start(struct venus_inst *inst)
const struct hfi_ops *ops = inst->core->ops;
int ret;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
if (inst->state != INST_LOAD_RESOURCES)
return -EINVAL;
@ -308,6 +321,9 @@ int hfi_session_stop(struct venus_inst *inst)
const struct hfi_ops *ops = inst->core->ops;
int ret;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
if (inst->state != INST_START)
return -EINVAL;
@ -331,6 +347,9 @@ int hfi_session_continue(struct venus_inst *inst)
{
struct venus_core *core = inst->core;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
if (core->res->hfi_version == HFI_VERSION_1XX)
return 0;
@ -343,6 +362,9 @@ int hfi_session_abort(struct venus_inst *inst)
const struct hfi_ops *ops = inst->core->ops;
int ret;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
reinit_completion(&inst->done);
ret = ops->session_abort(inst);
@ -362,6 +384,9 @@ int hfi_session_load_res(struct venus_inst *inst)
const struct hfi_ops *ops = inst->core->ops;
int ret;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
if (inst->state != INST_INIT)
return -EINVAL;
@ -385,6 +410,9 @@ int hfi_session_unload_res(struct venus_inst *inst)
const struct hfi_ops *ops = inst->core->ops;
int ret;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
if (inst->state != INST_STOP)
return -EINVAL;
@ -409,6 +437,9 @@ int hfi_session_flush(struct venus_inst *inst, u32 type, bool block)
const struct hfi_ops *ops = inst->core->ops;
int ret;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
reinit_completion(&inst->done);
ret = ops->session_flush(inst, type);
@ -429,6 +460,9 @@ int hfi_session_set_buffers(struct venus_inst *inst, struct hfi_buffer_desc *bd)
{
const struct hfi_ops *ops = inst->core->ops;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
return ops->session_set_buffers(inst, bd);
}
@ -438,6 +472,9 @@ int hfi_session_unset_buffers(struct venus_inst *inst,
const struct hfi_ops *ops = inst->core->ops;
int ret;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
reinit_completion(&inst->done);
ret = ops->session_unset_buffers(inst, bd);
@ -460,6 +497,9 @@ int hfi_session_get_property(struct venus_inst *inst, u32 ptype,
const struct hfi_ops *ops = inst->core->ops;
int ret;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
if (inst->state < INST_INIT || inst->state >= INST_STOP)
return -EINVAL;
@ -483,6 +523,9 @@ int hfi_session_set_property(struct venus_inst *inst, u32 ptype, void *pdata)
{
const struct hfi_ops *ops = inst->core->ops;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
if (inst->state < INST_INIT || inst->state >= INST_STOP)
return -EINVAL;
@ -494,6 +537,9 @@ int hfi_session_process_buf(struct venus_inst *inst, struct hfi_frame_data *fd)
{
const struct hfi_ops *ops = inst->core->ops;
if (test_bit(0, &inst->core->sys_error))
return -EIO;
if (fd->buffer_type == HFI_BUFFER_INPUT)
return ops->session_etb(inst, fd);
else if (fd->buffer_type == HFI_BUFFER_OUTPUT ||