media: mali-c55: add missing of_reserved_mem_device_release()
Subsystems (2)
PATCH v4 1/3 media: mali-c55: add missing of_reserved_mem_device_release()
mali_c55_probe() calls of_reserved_mem_device_init() to associate reserved memory regions with the device. This function allocates a struct rmem_assigned_device and adds it to a global linked list, which must be explicitly released via of_reserved_mem_device_release() — there is no devm variant of this API.
However, neither the probe error paths nor mali_c55_remove() called of_reserved_mem_device_release(). Any probe failure after the of_reserved_mem_device_init() call, as well as every normal device removal, leaked the reserved memory association on the global list.
Fix this by adding an err_release_mem label at the end of the probe error chain and calling of_reserved_mem_device_release() in mali_c55_remove(). The remove teardown order is also corrected to call mali_c55_media_frameworks_deinit() before kfree(), mirroring the probe init order in reverse.
--- drivers/media/platform/arm/mali-c55/mali-c55-core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/media/platform/arm/mali-c55/mali-c55-core.c +8 -3
@@ -806,8 +806,10 @@ static int mali_c55_probe(struct platform_device *pdev)vb2_dma_contig_set_max_seg_size (dev,UINT_MAX ); ret =__mali_c55_power_on (mali_c55); -if (ret) -return dev_err_probe (dev, ret,"failed to power on\n" ); +if (ret) { +dev_err_probe (dev, ret,"failed to power on\n" ); + goto err_release_mem; + } ret =mali_c55_check_hwcfg (mali_c55);if (ret)
@@ -846,6 +848,8 @@ static int mali_c55_probe(struct platform_device *pdev)kfree (mali_c55->context.registers); err_power_off:__mali_c55_power_off (mali_c55); +err_release_mem: +of_reserved_mem_device_release (dev);return ret; }
@@ -854,8 +858,9 @@ static void mali_c55_remove(struct platform_device *pdev) {struct mali_c55 *mali_c55 =platform_get_drvdata (pdev); -kfree (mali_c55->context.registers);mali_c55_media_frameworks_deinit (mali_c55); +kfree (mali_c55->context.registers); +of_reserved_mem_device_release (&pdev->dev); }static const struct of_device_id mali_c55_of_match[] = {
Signature · 1 line
2.53.0
PATCH v4 2/3 media: mali-c55: Power-off the peripheral in remove()
The Mali C55 driver doesn't depend on PM. For this reason, if pm_runtime is not compiled in it is required to manually power-off the peripheral during the driver's remove() handler.
Also pm_runtime_enable() is called during probe but mali_c55_remove() never calls pm_runtime_disable(), leaving the device's runtime PM state enabled after the driver is unbound.
Manually power-off the peripheral in remove() if the peripheral has not been suspended using runtime_pm and disable runtime pm.
--- drivers/media/platform/arm/mali-c55/mali-c55-core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/platform/arm/mali-c55/mali-c55-core.c +5 -0
@@ -859,6 +859,11 @@ static void mali_c55_remove(struct platform_device *pdev)struct mali_c55 *mali_c55 =platform_get_drvdata (pdev);mali_c55_media_frameworks_deinit (mali_c55); +if (!pm_runtime_suspended (&pdev->dev)) { +__mali_c55_power_off (mali_c55); +pm_runtime_set_suspended (&pdev->dev); + } +pm_runtime_disable (&pdev->dev);kfree (mali_c55->context.registers);of_reserved_mem_device_release (&pdev->dev); }
Signature · 1 line
2.53.0
PATCH v4 3/3 media: mali-c55: fix probe error path skipping pm_runtime_disable()
In reply to David CarlierWhen mali_c55_media_frameworks_init() fails, the goto target jumps to err_free_context_registers, skipping pm_runtime_disable() despite pm_runtime having already been enabled earlier in the function.
Fix this by adding an err_pm_runtime_disable label and redirecting the frameworks init failure to it, so pm_runtime is properly unwound on that error path. The runtime PM status is also set back to suspended before disabling, to undo the pm_runtime_set_active() from probe.
--- drivers/media/platform/arm/mali-c55/mali-c55-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/platform/arm/mali-c55/mali-c55-core.c +3 -2
@@ -828,7 +828,7 @@ static int mali_c55_probe(struct platform_device *pdev) ret =mali_c55_media_frameworks_init (mali_c55);if (ret) - goto err_free_context_registers; + goto err_pm_runtime_disable;pm_runtime_idle (&pdev->dev);
@@ -843,8 +843,9 @@ static int mali_c55_probe(struct platform_device *pdev) err_deinit_media_frameworks:mali_c55_media_frameworks_deinit (mali_c55); +err_pm_runtime_disable: +pm_runtime_set_suspended (&pdev->dev);pm_runtime_disable (&pdev->dev); -err_free_context_registers:kfree (mali_c55->context.registers); err_power_off:__mali_c55_power_off (mali_c55);
Signature · 1 line
2.53.0
Hi David
Quoted 11 lines · David Carlier
mali_c55_probe()callsof_reserved_mem_device_init()to associate reserved memory regions with the device. This function allocates a structrmem_assigned_deviceand adds it to a global linked list, which must be explicitly released viaof_reserved_mem_device_release()— there is no devm variant of this API.However, neither the probe error paths nor
mali_c55_remove()calledof_reserved_mem_device_release(). Any probe failure after theof_reserved_mem_device_init()call, as well as every normal device removal, leaked the reserved memory association on the global list.
Quoted 8 lines
Fix this by adding an
err_release_memlabel at the end of the probe error chain and callingof_reserved_mem_device_release()inmali_c55_remove(). The remove teardown order is also corrected to callmali_c55_media_frameworks_deinit()beforekfree(), mirroring the probe init order in reverse.Fixes d5f281f3dd29 ("media: mali-c55: Add Mali-C55 ISP driver")Signed-off-by David Carlier <[email protected]>
Seems like you forgot my tag here:
Thanks
j
Quoted 44 lines
--- drivers/media/platform/arm/mali-c55/mali-c55-core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)drivers/media/platform/arm/mali-c55/mali-c55-core.c +8
-4@@ -806,8 +806,10 @@ static int mali_c55_probe(struct platform_device *pdev)vb2_dma_contig_set_max_seg_size (dev,UINT_MAX ); ret =__mali_c55_power_on (mali_c55); -if (ret) -return dev_err_probe (dev, ret,"failed to power on\n" ); +if (ret) { +dev_err_probe (dev, ret,"failed to power on\n" ); + goto err_release_mem; + } ret =mali_c55_check_hwcfg (mali_c55);if (ret)@@ -846,6 +848,8 @@ static int mali_c55_probe(struct platform_device *pdev)kfree (mali_c55->context.registers); err_power_off:__mali_c55_power_off (mali_c55); +err_release_mem: +of_reserved_mem_device_release (dev);return ret; }@@ -854,8 +858,9 @@ static void mali_c55_remove(struct platform_device *pdev) {struct mali_c55 *mali_c55 =platform_get_drvdata (pdev); -kfree (mali_c55->context.registers);mali_c55_media_frameworks_deinit (mali_c55); +kfree (mali_c55->context.registers); +of_reserved_mem_device_release (&pdev->dev); }static const struct of_device_id mali_c55_of_match[] = { --2.53.0
Re: [PATCH v4 3/3] media: mali-c55: fix probe error path skipping pm_runtime_disable()
In reply to David CarlierHi David
Quoted 8 lines · David Carlier
When
mali_c55_media_frameworks_init()fails, the goto target jumps toerr_free_context_registers, skippingpm_runtime_disable()despitepm_runtimehaving already been enabled earlier in the function.Fix this by adding an
err_pm_runtime_disablelabel and redirecting the frameworks init failure to it, sopm_runtimeis properly unwound on that error path. The runtime PM status is also set back to suspended before disabling, to undo thepm_runtime_set_active()from probe.
Thanks
Quoted 3 lines
Fixes d5f281f3dd29 ("media: mali-c55: Add Mali-C55 ISP driver")Signed-off-by David Carlier <[email protected]>
Thanks
j
Quoted 31 lines
--- drivers/media/platform/arm/mali-c55/mali-c55-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/media/platform/arm/mali-c55/mali-c55-core.c +3
-3@@ -828,7 +828,7 @@ static int mali_c55_probe(struct platform_device *pdev) ret =mali_c55_media_frameworks_init (mali_c55);if (ret) - goto err_free_context_registers; + goto err_pm_runtime_disable;pm_runtime_idle (&pdev->dev);@@ -843,8 +843,9 @@ static int mali_c55_probe(struct platform_device *pdev) err_deinit_media_frameworks:mali_c55_media_frameworks_deinit (mali_c55); +err_pm_runtime_disable: +pm_runtime_set_suspended (&pdev->dev);pm_runtime_disable (&pdev->dev); -err_free_context_registers:kfree (mali_c55->context.registers); err_power_off:__mali_c55_power_off (mali_c55); --2.53.0