samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

video: driver: amend xo reset clock as shared resource

Bladeren bron 
Use devm_reset_control_get_exclusive_released() instead of
devm_reset_control_get() to get the reset control of video_xo_reset
clock as it is shared reset clock between eva and video drivers.
Use reset_control_acquire() before assert and reset_control_release()
after de-assert video_xo_reset clock to avoid eva driver operating on
it in parallel.

Change-Id: I4936ed7a4556bb56d4b28546084fc877080308ef
Signed-off-by: Deepa Guthyappa Madivalara <quic_dmadival@quicinc.com>
Signed-off-by: Darshana Patil <quic_darshana@quicinc.com>
This commit is contained in:
Darshana Patil
2023-01-04 12:58:31 -08:00
bovenliggende 179b38a1ec
commit a0082a4c81
8 gewijzigde bestanden met toevoegingen van 126 en 14 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

5
driver/vidc/inc/resources.h
Bestand weergeven

@@ -136,6 +136,7 @@ struct clock_set {
struct reset_info {
struct reset_control *rst;
const char *name;
bool exclusive_release;
};
struct reset_set {
@@ -208,6 +209,10 @@ struct msm_vidc_resources_ops {
int (*init)(struct msm_vidc_core *core);
int (*reset_bridge)(struct msm_vidc_core *core);
int (*reset_control_acquire)(struct msm_vidc_core *core,
const char *name);
int (*reset_control_release)(struct msm_vidc_core *core,
const char *name);
int (*reset_control_assert)(struct msm_vidc_core *core,
const char *name);
int (*reset_control_deassert)(struct msm_vidc_core *core,

82
driver/vidc/src/resources.c
Bestand weergeven

@@ -401,17 +401,24 @@ static int __init_reset_clocks(struct msm_vidc_core *core)
rsts->count = rst_count;
/* populate clock field from platform data */
for (cnt = 0; cnt < rsts->count; cnt++)
for (cnt = 0; cnt < rsts->count; cnt++) {
rsts->reset_tbl[cnt].name = rst_tbl[cnt].name;
rsts->reset_tbl[cnt].exclusive_release = rst_tbl[cnt].exclusive_release;
}
/* print reset clock fields */
venus_hfi_for_each_reset_clock(core, rinfo) {
d_vpr_h("%s: reset clk %s\n", __func__, rinfo->name);
d_vpr_h("%s: reset clk %s, exclusive %d\n",
__func__, rinfo->name, rinfo->exclusive_release);
}
/* get reset clock handle */
venus_hfi_for_each_reset_clock(core, rinfo) {
rinfo->rst = devm_reset_control_get(&core->pdev->dev, rinfo->name);
if (rinfo->exclusive_release)
rinfo->rst = devm_reset_control_get_exclusive_released(
&core->pdev->dev, rinfo->name);
else
rinfo->rst = devm_reset_control_get(&core->pdev->dev, rinfo->name);
if (IS_ERR_OR_NULL(rinfo->rst)) {
d_vpr_e("%s: failed to get reset clock: %s\n", __func__, rinfo->name);
rc = PTR_ERR(rinfo->rst) ?
@@ -1323,6 +1330,73 @@ static int __init_resources(struct msm_vidc_core *core)
return rc;
}
static int __reset_control_acquire_name(struct msm_vidc_core *core,
const char *name)
{
struct reset_info *rcinfo = NULL;
int rc = 0;
bool found = false;
venus_hfi_for_each_reset_clock(core, rcinfo) {
if (strcmp(rcinfo->name, name))
continue;
/* this function is valid only for exclusive_release reset clocks*/
if (!rcinfo->exclusive_release) {
d_vpr_e("%s: unsupported reset control (%s), exclusive %d\n",
__func__, name, rcinfo->exclusive_release);
return -EINVAL;
}
found = true;
rc = reset_control_acquire(rcinfo->rst);
if (rc)
d_vpr_e("%s: failed to acquire reset control (%s), rc = %d\n",
__func__, rcinfo->name, rc);
else
d_vpr_h("%s: acquire reset control (%s)\n",
__func__, rcinfo->name);
break;
}
if (!found) {
d_vpr_e("%s: reset control (%s) not found\n", __func__, name);
rc = -EINVAL;
}
return rc;
}
static int __reset_control_release_name(struct msm_vidc_core *core,
const char *name)
{
struct reset_info *rcinfo = NULL;
int rc = 0;
bool found = false;
venus_hfi_for_each_reset_clock(core, rcinfo) {
if (strcmp(rcinfo->name, name))
continue;
/* this function is valid only for exclusive_release reset clocks*/
if (!rcinfo->exclusive_release) {
d_vpr_e("%s: unsupported reset control (%s), exclusive %d\n",
__func__, name, rcinfo->exclusive_release);
return -EINVAL;
}
found = true;
reset_control_release(rcinfo->rst);
d_vpr_h("%s: release reset control (%s)\n", __func__, rcinfo->name);
break;
}
if (!found) {
d_vpr_e("%s: reset control (%s) not found\n", __func__, name);
rc = -EINVAL;
}
return rc;
}
static int __reset_control_assert_name(struct msm_vidc_core *core,
const char *name)
{
@@ -1448,6 +1522,8 @@ static int __reset_ahb2axi_bridge(struct msm_vidc_core *core)
static const struct msm_vidc_resources_ops res_ops = {
.init = __init_resources,
.reset_bridge = __reset_ahb2axi_bridge,
.reset_control_acquire = __reset_control_acquire_name,
.reset_control_release = __reset_control_release_name,
.reset_control_assert = __reset_control_assert_name,
.reset_control_deassert = __reset_control_deassert_name,
.gdsc_on = __enable_regulator,