| Message ID | bc2b9048d4ad510eec97988ce8f3fd0d2bb26f39.1619621413.git.mchehab+huawei@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Address some issues with PM runtime at media subsystem | expand |
28.04.2021 17:51, Mauro Carvalho Chehab пишет: > @@ -1069,11 +1071,17 @@ static int tegra_vde_probe(struct platform_device *pdev) > * power-cycle it in order to put hardware into a predictable lower > * power state. > */ > - pm_runtime_get_sync(dev); > + if (pm_runtime_resume_and_get(dev) < 0) > + goto err_pm_runtime; > + > pm_runtime_put(dev); > > return 0; > > +err_pm_runtime: > + pm_runtime_dont_use_autosuspend(dev); > + pm_runtime_disable(dev); > + > err_deinit_iommu: > tegra_vde_iommu_deinit(vde); This is incorrect error unwinding, the miscdev isn't unregistered.
On Wed, 28 Apr 2021 16:51:46 +0200 Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") > added pm_runtime_resume_and_get() in order to automatically handle > dev->power.usage_count decrement on errors. > > Use the new API, in order to cleanup the error check logic. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> LGTM Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/staging/media/tegra-vde/vde.c | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c > index 28845b5bafaf..1cdacb3f781c 100644 > --- a/drivers/staging/media/tegra-vde/vde.c > +++ b/drivers/staging/media/tegra-vde/vde.c > @@ -775,9 +775,9 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde, > if (ret) > goto release_dpb_frames; > > - ret = pm_runtime_get_sync(dev); > + ret = pm_runtime_resume_and_get(dev); > if (ret < 0) > - goto put_runtime_pm; > + goto unlock; > > /* > * We rely on the VDE registers reset value, otherwise VDE > @@ -843,6 +843,8 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde, > put_runtime_pm: > pm_runtime_mark_last_busy(dev); > pm_runtime_put_autosuspend(dev); > + > +unlock: > mutex_unlock(&vde->lock); > > release_dpb_frames: > @@ -1069,11 +1071,17 @@ static int tegra_vde_probe(struct platform_device *pdev) > * power-cycle it in order to put hardware into a predictable lower > * power state. > */ > - pm_runtime_get_sync(dev); > + if (pm_runtime_resume_and_get(dev) < 0) > + goto err_pm_runtime; > + > pm_runtime_put(dev); > > return 0; > > +err_pm_runtime: > + pm_runtime_dont_use_autosuspend(dev); > + pm_runtime_disable(dev); > + > err_deinit_iommu: > tegra_vde_iommu_deinit(vde); > > @@ -1089,7 +1097,12 @@ static int tegra_vde_remove(struct platform_device *pdev) > struct tegra_vde *vde = platform_get_drvdata(pdev); > struct device *dev = &pdev->dev; > > + /* > + * As it increments RPM usage_count even on errors, we don't need to > + * check the returned code here. > + */ > pm_runtime_get_sync(dev); > + > pm_runtime_dont_use_autosuspend(dev); > pm_runtime_disable(dev); >
On Fri, 30 Apr 2021 18:08:36 +0100 Jonathan Cameron <Jonathan.Cameron@Huawei.com> wrote: > On Wed, 28 Apr 2021 16:51:46 +0200 > Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > > > Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") > > added pm_runtime_resume_and_get() in order to automatically handle > > dev->power.usage_count decrement on errors. > > > > Use the new API, in order to cleanup the error check logic. > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > LGTM > > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> drop that. I missed the misc unwind thing caught in the other review. Too many patches without a break :( > > > --- > > drivers/staging/media/tegra-vde/vde.c | 19 ++++++++++++++++--- > > 1 file changed, 16 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c > > index 28845b5bafaf..1cdacb3f781c 100644 > > --- a/drivers/staging/media/tegra-vde/vde.c > > +++ b/drivers/staging/media/tegra-vde/vde.c > > @@ -775,9 +775,9 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde, > > if (ret) > > goto release_dpb_frames; > > > > - ret = pm_runtime_get_sync(dev); > > + ret = pm_runtime_resume_and_get(dev); > > if (ret < 0) > > - goto put_runtime_pm; > > + goto unlock; > > > > /* > > * We rely on the VDE registers reset value, otherwise VDE > > @@ -843,6 +843,8 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde, > > put_runtime_pm: > > pm_runtime_mark_last_busy(dev); > > pm_runtime_put_autosuspend(dev); > > + > > +unlock: > > mutex_unlock(&vde->lock); > > > > release_dpb_frames: > > @@ -1069,11 +1071,17 @@ static int tegra_vde_probe(struct platform_device *pdev) > > * power-cycle it in order to put hardware into a predictable lower > > * power state. > > */ > > - pm_runtime_get_sync(dev); > > + if (pm_runtime_resume_and_get(dev) < 0) > > + goto err_pm_runtime; > > + > > pm_runtime_put(dev); > > > > return 0; > > > > +err_pm_runtime: > > + pm_runtime_dont_use_autosuspend(dev); > > + pm_runtime_disable(dev); > > + > > err_deinit_iommu: > > tegra_vde_iommu_deinit(vde); > > > > @@ -1089,7 +1097,12 @@ static int tegra_vde_remove(struct platform_device *pdev) > > struct tegra_vde *vde = platform_get_drvdata(pdev); > > struct device *dev = &pdev->dev; > > > > + /* > > + * As it increments RPM usage_count even on errors, we don't need to > > + * check the returned code here. > > + */ > > pm_runtime_get_sync(dev); > > + > > pm_runtime_dont_use_autosuspend(dev); > > pm_runtime_disable(dev); > > >
diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c index 28845b5bafaf..1cdacb3f781c 100644 --- a/drivers/staging/media/tegra-vde/vde.c +++ b/drivers/staging/media/tegra-vde/vde.c @@ -775,9 +775,9 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde, if (ret) goto release_dpb_frames; - ret = pm_runtime_get_sync(dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) - goto put_runtime_pm; + goto unlock; /* * We rely on the VDE registers reset value, otherwise VDE @@ -843,6 +843,8 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde, put_runtime_pm: pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); + +unlock: mutex_unlock(&vde->lock); release_dpb_frames: @@ -1069,11 +1071,17 @@ static int tegra_vde_probe(struct platform_device *pdev) * power-cycle it in order to put hardware into a predictable lower * power state. */ - pm_runtime_get_sync(dev); + if (pm_runtime_resume_and_get(dev) < 0) + goto err_pm_runtime; + pm_runtime_put(dev); return 0; +err_pm_runtime: + pm_runtime_dont_use_autosuspend(dev); + pm_runtime_disable(dev); + err_deinit_iommu: tegra_vde_iommu_deinit(vde); @@ -1089,7 +1097,12 @@ static int tegra_vde_remove(struct platform_device *pdev) struct tegra_vde *vde = platform_get_drvdata(pdev); struct device *dev = &pdev->dev; + /* + * As it increments RPM usage_count even on errors, we don't need to + * check the returned code here. + */ pm_runtime_get_sync(dev); + pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev);
Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/media/tegra-vde/vde.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)