remoteproc: keystone: Use devm_kasprintf() to build name string
PATCH 1/7 remoteproc: keystone: Use devm_kasprintf() to build name string
This is simpler and removes the need to assume the id length to be 1 digit, which then removes a W=1 compile warning about the same.
--- drivers/remoteproc/keystone_remoteproc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/remoteproc/keystone_remoteproc.c +1 -5
@@ -366,8 +366,6 @@ static int keystone_rproc_probe(struct platform_device *pdev)struct rproc *rproc;int dsp_id;char *fw_name =NULL ; -char *template ="keystone-dsp%d-fw" ; -int name_len =0 ;int ret =0 ;if (!np) {
@@ -382,11 +380,9 @@ static int keystone_rproc_probe(struct platform_device *pdev) }/* construct a custom default fw name - subject to change in future */ - name_len =strlen (template);/* assuming a single digit alias */ - fw_name =devm_kzalloc (dev, name_len,GFP_KERNEL ); + fw_name =devm_kasprintf (dev,GFP_KERNEL ,"keystone-dsp%d-fw" , dsp_id);if (!fw_name)return -ENOMEM ; -snprintf (fw_name, name_len, template, dsp_id); rproc =rproc_alloc (dev,dev_name (dev), &keystone_rproc_ops, fw_name,sizeof (*ksproc));
Signature · 1 line
2.39.2
PATCH 2/7 remoteproc: keystone: Use devm_rproc_alloc() helper
Use the device lifecycle managed allocation function. This helps prevent mistakes like freeing out of order in cleanup functions and forgetting to free on error paths.
--- drivers/remoteproc/keystone_remoteproc.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/remoteproc/keystone_remoteproc.c +5 -10
@@ -384,8 +384,8 @@ static int keystone_rproc_probe(struct platform_device *pdev)if (!fw_name)return -ENOMEM ; - rproc =rproc_alloc (dev,dev_name (dev), &keystone_rproc_ops, fw_name, -sizeof (*ksproc)); + rproc =devm_rproc_alloc (dev,dev_name (dev), &keystone_rproc_ops, + fw_name,sizeof (*ksproc));if (!rproc)return -ENOMEM ;
@@ -396,13 +396,11 @@ static int keystone_rproc_probe(struct platform_device *pdev) ret =keystone_rproc_of_get_dev_syscon (pdev, ksproc);if (ret) - goto free_rproc; +return ret; ksproc->reset =devm_reset_control_get_exclusive (dev,NULL ); -if (IS_ERR (ksproc->reset)) { - ret =PTR_ERR (ksproc->reset); - goto free_rproc; - } +if (IS_ERR (ksproc->reset)) +return PTR_ERR (ksproc->reset);/* enable clock for accessing DSP internal memories */ pm_runtime_enable (dev);
@@ -467,8 +465,6 @@ static int keystone_rproc_probe(struct platform_device *pdev)pm_runtime_put_sync (dev); disable_rpm:pm_runtime_disable (dev); -free_rproc: -rproc_free (rproc);return ret; }
@@ -480,7 +476,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)gpiod_put (ksproc->kick_gpio);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev); -rproc_free (ksproc->rproc);of_reserved_mem_device_release (&pdev->dev); }
Signature · 1 line
2.39.2
PATCH 3/7 remoteproc: keystone: Use devm action to release reserved memory
In reply to Andrew DavisThis helps prevent mistakes like freeing out of order in cleanup functions and forgetting to free on error paths.
--- drivers/remoteproc/keystone_remoteproc.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/remoteproc/keystone_remoteproc.c +14 -3
@@ -358,6 +358,13 @@ static int keystone_rproc_of_get_dev_syscon(struct platform_device *pdev,return 0 ; } +static void keystone_rproc_mem_release (void *data) +{ +struct device *dev = data; + +of_reserved_mem_device_release (dev); +} +static int keystone_rproc_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -434,8 +441,14 @@ static int keystone_rproc_probe(struct platform_device *pdev) goto disable_clk; } -if (of_reserved_mem_device_init (dev)) + ret =of_reserved_mem_device_init (dev); +if (ret) {dev_warn (dev,"device does not have specific CMA pool\n" ); + }else { + ret =devm_add_action_or_reset (dev, keystone_rproc_mem_release, dev); +if (ret) +return ret; + }/* ensure the DSP is in reset before loading firmware */ ret =reset_control_status (ksproc->reset);
@@ -459,7 +472,6 @@ static int keystone_rproc_probe(struct platform_device *pdev)return 0 ; release_mem: -of_reserved_mem_device_release (dev);gpiod_put (ksproc->kick_gpio); disable_clk:pm_runtime_put_sync (dev);
@@ -476,7 +488,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)gpiod_put (ksproc->kick_gpio);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev); -of_reserved_mem_device_release (&pdev->dev); }static const struct of_device_id keystone_rproc_of_match[] = {
Signature · 1 line
2.39.2
Re: [PATCH 3/7] remoteproc: keystone: Use devm action to release reserved memory
Quoted 28 lines · Andrew Davis
This helps prevent mistakes like freeing out of order in cleanup functions and forgetting to free on error paths.
Signed-off-by Andrew Davis <[email protected]>--- drivers/remoteproc/keystone_remoteproc.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)drivers/remoteproc/keystone_remoteproc.c +7
-0@@ -358,6 +358,13 @@ static int keystone_rproc_of_get_dev_syscon(struct platform_device *pdev,return 0 ; } +static void keystone_rproc_mem_release (void *data) +{ +struct device *dev = data; + +of_reserved_mem_device_release (dev); +} +static int keystone_rproc_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;@@ -434,8 +441,14 @@ static int keystone_rproc_probe(struct platform_device *pdev) goto disable_clk;
drivers/remoteproc/keystone_remoteproc.c static int keystone_rproc_probe(struct platform_device *pdev) · line 450
Quoted 10 lines
drivers/remoteproc/keystone_remoteproc.c +6
-1} -if (of_reserved_mem_device_init (dev)) + ret =of_reserved_mem_device_init (dev); +if (ret) {dev_warn (dev,"device does not have specific CMA pool\n" ); + }else { + ret =devm_add_action_or_reset (dev, keystone_rproc_mem_release, dev); +if (ret) +return ret;
It gets sorted out in the next patches but we still need to "goto disable_clk" to avoid git-bisect problems.
I have applied the first two patches of this set so no need to resend them.
Thanks,
Mathieu
Quoted 23 lines
drivers/remoteproc/keystone_remoteproc.c +1
-2+ }/* ensure the DSP is in reset before loading firmware */ ret =reset_control_status (ksproc->reset);@@ -459,7 +472,6 @@ static int keystone_rproc_probe(struct platform_device *pdev)return 0 ; release_mem: -of_reserved_mem_device_release (dev);gpiod_put (ksproc->kick_gpio); disable_clk:pm_runtime_put_sync (dev);@@ -476,7 +488,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)gpiod_put (ksproc->kick_gpio);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev); -of_reserved_mem_device_release (&pdev->dev); }static const struct of_device_id keystone_rproc_of_match[] = {Signature · 1 line
2.39.2
PATCH 4/7 remoteproc: keystone: Use devm_pm_runtime_enable() helper
In reply to Andrew DavisUse device life-cycle managed runtime enable function to simplify probe and exit paths.
--- drivers/remoteproc/keystone_remoteproc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/remoteproc/keystone_remoteproc.c +6 -8
@@ -410,12 +410,13 @@ static int keystone_rproc_probe(struct platform_device *pdev)return PTR_ERR (ksproc->reset);/* enable clock for accessing DSP internal memories */ -pm_runtime_enable (dev); + ret =devm_pm_runtime_enable (dev); +if (ret <0 ) +return dev_err_probe (dev, ret,"Failed to enable runtime PM\n" ); + ret =pm_runtime_resume_and_get (dev); -if (ret <0 ) { -dev_err (dev,"failed to enable clock, status = %d\n" , ret); - goto disable_rpm; - } +if (ret <0 ) +return dev_err_probe (dev, ret,"failed to enable clock\n" ); ret =keystone_rproc_of_get_memories (pdev, ksproc);if (ret)
@@ -475,8 +476,6 @@ static int keystone_rproc_probe(struct platform_device *pdev)gpiod_put (ksproc->kick_gpio); disable_clk:pm_runtime_put_sync (dev); -disable_rpm: -pm_runtime_disable (dev);return ret; }
@@ -487,7 +486,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)rproc_del (ksproc->rproc);gpiod_put (ksproc->kick_gpio);pm_runtime_put_sync (&pdev->dev); -pm_runtime_disable (&pdev->dev); }static const struct of_device_id keystone_rproc_of_match[] = {
Signature · 1 line
2.39.2
PATCH 5/7 remoteproc: keystone: Use devm action to call PM runtime put sync
In reply to Andrew DavisThis helps prevent mistakes like putting out of order in cleanup functions and forgetting to put sync on error paths.
--- drivers/remoteproc/keystone_remoteproc.c | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/remoteproc/keystone_remoteproc.c +17 -17
@@ -365,6 +365,13 @@ static void keystone_rproc_mem_release(void *data)of_reserved_mem_device_release (dev); } +static void keystone_rproc_pm_runtime_put (void *data) +{ +struct device *dev = data; + +pm_runtime_put_sync (dev); +} +static int keystone_rproc_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -417,30 +424,26 @@ static int keystone_rproc_probe(struct platform_device *pdev) ret =pm_runtime_resume_and_get (dev);if (ret <0 )return dev_err_probe (dev, ret,"failed to enable clock\n" ); + ret =devm_add_action_or_reset (dev, keystone_rproc_pm_runtime_put, dev); +if (ret) +return dev_err_probe (dev, ret,"failed to add disable pm devm action\n" ); ret =keystone_rproc_of_get_memories (pdev, ksproc);if (ret) - goto disable_clk; +return ret; ksproc->irq_ring =platform_get_irq_byname (pdev,"vring" ); -if (ksproc->irq_ring <0 ) { - ret = ksproc->irq_ring; - goto disable_clk; - } +if (ksproc->irq_ring <0 ) +return ksproc->irq_ring; ksproc->irq_fault =platform_get_irq_byname (pdev,"exception" ); -if (ksproc->irq_fault <0 ) { - ret = ksproc->irq_fault; - goto disable_clk; - } +if (ksproc->irq_fault <0 ) +return ksproc->irq_fault; ksproc->kick_gpio =gpiod_get (dev,"kick" ,GPIOD_ASIS ); ret =PTR_ERR_OR_ZERO (ksproc->kick_gpio); -if (ret) { -dev_err (dev,"failed to get gpio for virtio kicks, status = %d\n" , - ret); - goto disable_clk; - } +if (ret) +return dev_err_probe (dev, ret,"failed to get gpio for virtio kicks\n" ); ret =of_reserved_mem_device_init (dev);if (ret) {
@@ -474,8 +477,6 @@ static int keystone_rproc_probe(struct platform_device *pdev) release_mem:gpiod_put (ksproc->kick_gpio); -disable_clk: -pm_runtime_put_sync (dev);return ret; }
@@ -485,7 +486,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)rproc_del (ksproc->rproc);gpiod_put (ksproc->kick_gpio); -pm_runtime_put_sync (&pdev->dev); }static const struct of_device_id keystone_rproc_of_match[] = {
Signature · 1 line
2.39.2
PATCH 6/7 remoteproc: keystone: Use devm_gpiod_get() helper
In reply to Andrew DavisUse device life-cycle managed GPIO get function to simplify probe and exit paths.
--- drivers/remoteproc/keystone_remoteproc.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
drivers/remoteproc/keystone_remoteproc.c +4 -13
@@ -440,7 +440,7 @@ static int keystone_rproc_probe(struct platform_device *pdev)if (ksproc->irq_fault <0 )return ksproc->irq_fault; - ksproc->kick_gpio =gpiod_get (dev,"kick" ,GPIOD_ASIS ); + ksproc->kick_gpio =devm_gpiod_get (dev,"kick" ,GPIOD_ASIS ); ret =PTR_ERR_OR_ZERO (ksproc->kick_gpio);if (ret)return dev_err_probe (dev, ret,"failed to get gpio for virtio kicks\n" );
@@ -457,27 +457,19 @@ static int keystone_rproc_probe(struct platform_device *pdev)/* ensure the DSP is in reset before loading firmware */ ret =reset_control_status (ksproc->reset);if (ret <0 ) { -dev_err (dev,"failed to get reset status, status = %d\n" , ret); - goto release_mem; +return dev_err_probe (dev, ret,"failed to get reset status\n" ); }else if (ret ==0 ) {WARN (1 ,"device is not in reset\n" );keystone_rproc_dsp_reset (ksproc); } ret =rproc_add (rproc); -if (ret) { -dev_err (dev,"failed to add register device with remoteproc core, status = %d\n" , - ret); - goto release_mem; - } +if (ret) +return dev_err_probe (dev, ret,"failed to register device with remoteproc core\n" );platform_set_drvdata (pdev, ksproc);return 0 ; - -release_mem: -gpiod_put (ksproc->kick_gpio); -return ret; }static void keystone_rproc_remove (struct platform_device *pdev)
@@ -485,7 +477,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)struct keystone_rproc *ksproc =platform_get_drvdata (pdev);rproc_del (ksproc->rproc); -gpiod_put (ksproc->kick_gpio); }static const struct of_device_id keystone_rproc_of_match[] = {
Signature · 1 line
2.39.2
PATCH 7/7 remoteproc: keystone: Use devm_rproc_add() helper
In reply to Andrew DavisUse the device lifecycle managed add function. This helps prevent mistakes like deleting out of order in cleanup functions and forgetting to delete on error paths.
--- drivers/remoteproc/keystone_remoteproc.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/remoteproc/keystone_remoteproc.c +1 -11
@@ -463,22 +463,13 @@ static int keystone_rproc_probe(struct platform_device *pdev)keystone_rproc_dsp_reset (ksproc); } - ret =rproc_add (rproc); + ret =devm_rproc_add (dev, rproc);if (ret)return dev_err_probe (dev, ret,"failed to register device with remoteproc core\n" ); -platform_set_drvdata (pdev, ksproc); -return 0 ; } -static void keystone_rproc_remove (struct platform_device *pdev) -{ -struct keystone_rproc *ksproc =platform_get_drvdata (pdev); - -rproc_del (ksproc->rproc); -} -static const struct of_device_id keystone_rproc_of_match[] = { { .compatible ="ti,k2hk-dsp" , }, { .compatible ="ti,k2l-dsp" , },
@@ -490,7 +481,6 @@ MODULE_DEVICE_TABLE(of, keystone_rproc_of_match);static struct platform_driver keystone_rproc_driver = { .probe = keystone_rproc_probe, - .remove_new = keystone_rproc_remove, .driver = { .name ="keystone-rproc" , .of_match_table = keystone_rproc_of_match,
Signature · 1 line
2.39.2
Quoted 4 lines · Andrew Davis
This is simpler and removes the need to assume the id length to be 1 digit, which then removes a W=1 compile warning about the same.
Signed-off-by Andrew Davis <[email protected]>
Acked/Tested-by: Hari Nagalla <[email protected]>
Quoted 30 lines
--- drivers/remoteproc/keystone_remoteproc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/remoteproc/keystone_remoteproc.c +1
-5@@ -366,8 +366,6 @@ static int keystone_rproc_probe(struct platform_device *pdev)struct rproc *rproc;int dsp_id;char *fw_name =NULL ; -char *template ="keystone-dsp%d-fw" ; -int name_len =0 ;int ret =0 ;if (!np) {@@ -382,11 +380,9 @@ static int keystone_rproc_probe(struct platform_device *pdev) }/* construct a custom default fw name - subject to change in future */ - name_len =strlen (template);/* assuming a single digit alias */ - fw_name =devm_kzalloc (dev, name_len,GFP_KERNEL ); + fw_name =devm_kasprintf (dev,GFP_KERNEL ,"keystone-dsp%d-fw" , dsp_id);if (!fw_name)return -ENOMEM ; -snprintf (fw_name, name_len, template, dsp_id); rproc =rproc_alloc (dev,dev_name (dev), &keystone_rproc_ops, fw_name,sizeof (*ksproc));