[PATCH 0/4] Some optimization for Spreadtrum hwlock controller

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/4] Some optimization for Spreadtrum hwlock controller
@ 2019-09-27  7:10 Baolin Wang
  2019-09-27  7:10 ` [PATCH 1/4] hwspinlock: sprd: Change to use devm_platform_ioremap_resource() Baolin Wang
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Baolin Wang @ 2019-09-27  7:10 UTC (permalink / raw)
  To: ohad, bjorn.andersson
  Cc: orsonzhai, baolin.wang, zhang.lyra, linux-remoteproc,
	linux-kernel

This patch set did some optimization for Spreadtrum hwlock controller,
including using some devm_xxx APIs to simplify code and validating the
return value when enabling clock.

Baolin Wang (4):
  hwspinlock: sprd: Change to use devm_platform_ioremap_resource()
  hwspinlock: sprd: Check the return value of clk_prepare_enable()
  hwspinlock: sprd: Use devm_add_action_or_reset() for calls to
    clk_disable_unprepare()
  hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock
    controller

 drivers/hwspinlock/sprd_hwspinlock.c |   33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/4] hwspinlock: sprd: Change to use devm_platform_ioremap_resource()
  2019-09-27  7:10 [PATCH 0/4] Some optimization for Spreadtrum hwlock controller Baolin Wang
@ 2019-09-27  7:10 ` Baolin Wang
  2019-09-27  7:10 ` [PATCH 2/4] hwspinlock: sprd: Check the return value of clk_prepare_enable() Baolin Wang
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Baolin Wang @ 2019-09-27  7:10 UTC (permalink / raw)
  To: ohad, bjorn.andersson
  Cc: orsonzhai, baolin.wang, zhang.lyra, linux-remoteproc,
	linux-kernel

Use the new helper that wraps the calls to platform_get_resource()
and devm_ioremap_resource() together, which can simpify the code.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/hwspinlock/sprd_hwspinlock.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/hwspinlock/sprd_hwspinlock.c b/drivers/hwspinlock/sprd_hwspinlock.c
index dc42bf5..7a8534f 100644
--- a/drivers/hwspinlock/sprd_hwspinlock.c
+++ b/drivers/hwspinlock/sprd_hwspinlock.c
@@ -83,7 +83,6 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
 {
 	struct sprd_hwspinlock_dev *sprd_hwlock;
 	struct hwspinlock *lock;
-	struct resource *res;
 	int i, ret;
 
 	if (!pdev->dev.of_node)
@@ -96,8 +95,7 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
 	if (!sprd_hwlock)
 		return -ENOMEM;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	sprd_hwlock->base = devm_ioremap_resource(&pdev->dev, res);
+	sprd_hwlock->base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(sprd_hwlock->base))
 		return PTR_ERR(sprd_hwlock->base);
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/4] hwspinlock: sprd: Check the return value of clk_prepare_enable()
  2019-09-27  7:10 [PATCH 0/4] Some optimization for Spreadtrum hwlock controller Baolin Wang
  2019-09-27  7:10 ` [PATCH 1/4] hwspinlock: sprd: Change to use devm_platform_ioremap_resource() Baolin Wang
@ 2019-09-27  7:10 ` Baolin Wang
  2019-09-27  7:10 ` [PATCH 3/4] hwspinlock: sprd: Use devm_add_action_or_reset() for calls to clk_disable_unprepare() Baolin Wang
  2019-09-27  7:10 ` [PATCH 4/4] hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller Baolin Wang
  3 siblings, 0 replies; 6+ messages in thread
From: Baolin Wang @ 2019-09-27  7:10 UTC (permalink / raw)
  To: ohad, bjorn.andersson
  Cc: orsonzhai, baolin.wang, zhang.lyra, linux-remoteproc,
	linux-kernel

We must check the return value of clk_prepare_enable() to make sure the
hardware spinlock controller can be enabled successfully, otherwise we
should return error.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/hwspinlock/sprd_hwspinlock.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/hwspinlock/sprd_hwspinlock.c b/drivers/hwspinlock/sprd_hwspinlock.c
index 7a8534f..d210424 100644
--- a/drivers/hwspinlock/sprd_hwspinlock.c
+++ b/drivers/hwspinlock/sprd_hwspinlock.c
@@ -105,7 +105,9 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
 		return PTR_ERR(sprd_hwlock->clk);
 	}
 
-	clk_prepare_enable(sprd_hwlock->clk);
+	ret = clk_prepare_enable(sprd_hwlock->clk);
+	if (ret)
+		return ret;
 
 	/* set the hwspinlock to record user id to identify subsystems */
 	writel(HWSPINLOCK_USER_BITS, sprd_hwlock->base + HWSPINLOCK_RECCTRL);
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/4] hwspinlock: sprd: Use devm_add_action_or_reset() for calls to clk_disable_unprepare()
  2019-09-27  7:10 [PATCH 0/4] Some optimization for Spreadtrum hwlock controller Baolin Wang
  2019-09-27  7:10 ` [PATCH 1/4] hwspinlock: sprd: Change to use devm_platform_ioremap_resource() Baolin Wang
  2019-09-27  7:10 ` [PATCH 2/4] hwspinlock: sprd: Check the return value of clk_prepare_enable() Baolin Wang
@ 2019-09-27  7:10 ` Baolin Wang
  2019-09-27  7:10 ` [PATCH 4/4] hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller Baolin Wang
  3 siblings, 0 replies; 6+ messages in thread
From: Baolin Wang @ 2019-09-27  7:10 UTC (permalink / raw)
  To: ohad, bjorn.andersson
  Cc: orsonzhai, baolin.wang, zhang.lyra, linux-remoteproc,
	linux-kernel

Use devm_add_action_or_reset() for calls to clk_disable_unprepare(),
which can simplify the error handling.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/hwspinlock/sprd_hwspinlock.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/hwspinlock/sprd_hwspinlock.c b/drivers/hwspinlock/sprd_hwspinlock.c
index d210424..e76c702 100644
--- a/drivers/hwspinlock/sprd_hwspinlock.c
+++ b/drivers/hwspinlock/sprd_hwspinlock.c
@@ -79,6 +79,13 @@ static void sprd_hwspinlock_relax(struct hwspinlock *lock)
 	.relax = sprd_hwspinlock_relax,
 };
 
+static void sprd_hwspinlock_disable(void *data)
+{
+	struct sprd_hwspinlock_dev *sprd_hwlock = data;
+
+	clk_disable_unprepare(sprd_hwlock->clk);
+}
+
 static int sprd_hwspinlock_probe(struct platform_device *pdev)
 {
 	struct sprd_hwspinlock_dev *sprd_hwlock;
@@ -109,6 +116,14 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
+	ret = devm_add_action_or_reset(&pdev->dev, sprd_hwspinlock_disable,
+				       sprd_hwlock);
+	if (ret) {
+		dev_err(&pdev->dev,
+			"Failed to add hwspinlock disable action\n");
+		return ret;
+	}
+
 	/* set the hwspinlock to record user id to identify subsystems */
 	writel(HWSPINLOCK_USER_BITS, sprd_hwlock->base + HWSPINLOCK_RECCTRL);
 
@@ -124,7 +139,6 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
 				   &sprd_hwspinlock_ops, 0, SPRD_HWLOCKS_NUM);
 	if (ret) {
 		pm_runtime_disable(&pdev->dev);
-		clk_disable_unprepare(sprd_hwlock->clk);
 		return ret;
 	}
 
@@ -137,7 +151,6 @@ static int sprd_hwspinlock_remove(struct platform_device *pdev)
 
 	hwspin_lock_unregister(&sprd_hwlock->bank);
 	pm_runtime_disable(&pdev->dev);
-	clk_disable_unprepare(sprd_hwlock->clk);
 	return 0;
 }
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 4/4] hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller
  2019-09-27  7:10 [PATCH 0/4] Some optimization for Spreadtrum hwlock controller Baolin Wang
                   ` (2 preceding siblings ...)
  2019-09-27  7:10 ` [PATCH 3/4] hwspinlock: sprd: Use devm_add_action_or_reset() for calls to clk_disable_unprepare() Baolin Wang
@ 2019-09-27  7:10 ` Baolin Wang
  2019-10-05  4:11   ` Bjorn Andersson
  3 siblings, 1 reply; 6+ messages in thread
From: Baolin Wang @ 2019-09-27  7:10 UTC (permalink / raw)
  To: ohad, bjorn.andersson
  Cc: orsonzhai, baolin.wang, zhang.lyra, linux-remoteproc,
	linux-kernel

Use devm_hwspin_lock_register() to register the hwlock controller instead of
unregistering the hwlock controller explicitly when removing the device.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/hwspinlock/sprd_hwspinlock.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/hwspinlock/sprd_hwspinlock.c b/drivers/hwspinlock/sprd_hwspinlock.c
index e76c702..44d69db 100644
--- a/drivers/hwspinlock/sprd_hwspinlock.c
+++ b/drivers/hwspinlock/sprd_hwspinlock.c
@@ -135,8 +135,9 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, sprd_hwlock);
 	pm_runtime_enable(&pdev->dev);
 
-	ret = hwspin_lock_register(&sprd_hwlock->bank, &pdev->dev,
-				   &sprd_hwspinlock_ops, 0, SPRD_HWLOCKS_NUM);
+	ret = devm_hwspin_lock_register(&pdev->dev, &sprd_hwlock->bank,
+					&sprd_hwspinlock_ops, 0,
+					SPRD_HWLOCKS_NUM);
 	if (ret) {
 		pm_runtime_disable(&pdev->dev);
 		return ret;
@@ -147,9 +148,6 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
 
 static int sprd_hwspinlock_remove(struct platform_device *pdev)
 {
-	struct sprd_hwspinlock_dev *sprd_hwlock = platform_get_drvdata(pdev);
-
-	hwspin_lock_unregister(&sprd_hwlock->bank);
 	pm_runtime_disable(&pdev->dev);
 	return 0;
 }
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 4/4] hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller
  2019-09-27  7:10 ` [PATCH 4/4] hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller Baolin Wang
@ 2019-10-05  4:11   ` Bjorn Andersson
  0 siblings, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2019-10-05  4:11 UTC (permalink / raw)
  To: Baolin Wang; +Cc: ohad, orsonzhai, zhang.lyra, linux-remoteproc, linux-kernel

On Fri 27 Sep 00:10 PDT 2019, Baolin Wang wrote:

> Use devm_hwspin_lock_register() to register the hwlock controller instead of
> unregistering the hwlock controller explicitly when removing the device.
> 
> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>

Thanks Baolin, series applied.

Regards,
Bjorn

> ---
>  drivers/hwspinlock/sprd_hwspinlock.c |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/hwspinlock/sprd_hwspinlock.c b/drivers/hwspinlock/sprd_hwspinlock.c
> index e76c702..44d69db 100644
> --- a/drivers/hwspinlock/sprd_hwspinlock.c
> +++ b/drivers/hwspinlock/sprd_hwspinlock.c
> @@ -135,8 +135,9 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
>  	platform_set_drvdata(pdev, sprd_hwlock);
>  	pm_runtime_enable(&pdev->dev);
>  
> -	ret = hwspin_lock_register(&sprd_hwlock->bank, &pdev->dev,
> -				   &sprd_hwspinlock_ops, 0, SPRD_HWLOCKS_NUM);
> +	ret = devm_hwspin_lock_register(&pdev->dev, &sprd_hwlock->bank,
> +					&sprd_hwspinlock_ops, 0,
> +					SPRD_HWLOCKS_NUM);
>  	if (ret) {
>  		pm_runtime_disable(&pdev->dev);
>  		return ret;
> @@ -147,9 +148,6 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
>  
>  static int sprd_hwspinlock_remove(struct platform_device *pdev)
>  {
> -	struct sprd_hwspinlock_dev *sprd_hwlock = platform_get_drvdata(pdev);
> -
> -	hwspin_lock_unregister(&sprd_hwlock->bank);
>  	pm_runtime_disable(&pdev->dev);
>  	return 0;
>  }
> -- 
> 1.7.9.5
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-10-05  4:11 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-27  7:10 [PATCH 0/4] Some optimization for Spreadtrum hwlock controller Baolin Wang
2019-09-27  7:10 ` [PATCH 1/4] hwspinlock: sprd: Change to use devm_platform_ioremap_resource() Baolin Wang
2019-09-27  7:10 ` [PATCH 2/4] hwspinlock: sprd: Check the return value of clk_prepare_enable() Baolin Wang
2019-09-27  7:10 ` [PATCH 3/4] hwspinlock: sprd: Use devm_add_action_or_reset() for calls to clk_disable_unprepare() Baolin Wang
2019-09-27  7:10 ` [PATCH 4/4] hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller Baolin Wang
2019-10-05  4:11   ` Bjorn Andersson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox