[PATCH 1/4] hwspinlock: omap: Remove unneeded check for OF node

[PATCH 1/4] hwspinlock: omap: Remove unneeded check for OF node

[Andrew Davis]

We do not use the OF node anymore, nor does it matter how
we got to probe, so remove the check for of_node.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 drivers/hwspinlock/omap_hwspinlock.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
index a9fd9ca45f2a8..cca55143d24d4 100644
--- a/drivers/hwspinlock/omap_hwspinlock.c
+++ b/drivers/hwspinlock/omap_hwspinlock.c
@@ -74,7 +74,6 @@ static const struct hwspinlock_ops omap_hwspinlock_ops = {
 
 static int omap_hwspinlock_probe(struct platform_device *pdev)
 {
-	struct device_node *node = pdev->dev.of_node;
 	struct hwspinlock_device *bank;
 	struct hwspinlock *hwlock;
 	void __iomem *io_base;
@@ -82,9 +81,6 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
 	/* Only a single hwspinlock block device is supported */
 	int base_id = 0;
 
-	if (!node)
-		return -ENODEV;
-
 	io_base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(io_base))
 		return PTR_ERR(io_base);
-- 
2.39.2

[PATCH 2/4] hwspinlock: omap: Use devm_pm_runtime_enable() helper

[Andrew Davis]

This disables runtime PM on module exit, allowing us to simplify
the probe exit path and remove callbacks. Do that here.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 drivers/hwspinlock/omap_hwspinlock.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
index cca55143d24d4..2f18ea6c05e3f 100644
--- a/drivers/hwspinlock/omap_hwspinlock.c
+++ b/drivers/hwspinlock/omap_hwspinlock.c
@@ -89,10 +89,10 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
 	 * make sure the module is enabled and clocked before reading
 	 * the module SYSSTATUS register
 	 */
-	pm_runtime_enable(&pdev->dev);
+	devm_pm_runtime_enable(&pdev->dev);
 	ret = pm_runtime_resume_and_get(&pdev->dev);
 	if (ret < 0)
-		goto runtime_err;
+		return ret;
 
 	/* Determine number of locks */
 	i = readl(io_base + SYSSTATUS_OFFSET);
@@ -104,22 +104,18 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
 	 */
 	ret = pm_runtime_put(&pdev->dev);
 	if (ret < 0)
-		goto runtime_err;
+		return ret;
 
 	/* one of the four lsb's must be set, and nothing else */
-	if (hweight_long(i & 0xf) != 1 || i > 8) {
-		ret = -EINVAL;
-		goto runtime_err;
-	}
+	if (hweight_long(i & 0xf) != 1 || i > 8)
+		return -EINVAL;
 
 	num_locks = i * 32; /* actual number of locks in this device */
 
 	bank = devm_kzalloc(&pdev->dev, struct_size(bank, lock, num_locks),
 			    GFP_KERNEL);
-	if (!bank) {
-		ret = -ENOMEM;
-		goto runtime_err;
-	}
+	if (!bank)
+		return -ENOMEM;
 
 	platform_set_drvdata(pdev, bank);
 
@@ -129,16 +125,12 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
 	ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
 						base_id, num_locks);
 	if (ret)
-		goto runtime_err;
+		return ret;
 
 	dev_dbg(&pdev->dev, "Registered %d locks with HwSpinlock core\n",
 		num_locks);
 
 	return 0;
-
-runtime_err:
-	pm_runtime_disable(&pdev->dev);
-	return ret;
 }
 
 static void omap_hwspinlock_remove(struct platform_device *pdev)
@@ -151,8 +143,6 @@ static void omap_hwspinlock_remove(struct platform_device *pdev)
 		dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
 		return;
 	}
-
-	pm_runtime_disable(&pdev->dev);
 }
 
 static const struct of_device_id omap_hwspinlock_of_match[] = {
-- 
2.39.2

[PATCH 3/4] hwspinlock: omap: Use devm_hwspin_lock_register() helper

[Andrew Davis]

This unregister the HW spinlock on module exit, allowing us to
remove the remove callback. Do this here.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 drivers/hwspinlock/omap_hwspinlock.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
index 2f18ea6c05e3f..1b0a1bea2b24a 100644
--- a/drivers/hwspinlock/omap_hwspinlock.c
+++ b/drivers/hwspinlock/omap_hwspinlock.c
@@ -117,12 +117,10 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
 	if (!bank)
 		return -ENOMEM;
 
-	platform_set_drvdata(pdev, bank);
-
 	for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
 		hwlock->priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
 
-	ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
+	ret = devm_hwspin_lock_register(&pdev->dev, bank, &omap_hwspinlock_ops,
 						base_id, num_locks);
 	if (ret)
 		return ret;
@@ -133,18 +131,6 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static void omap_hwspinlock_remove(struct platform_device *pdev)
-{
-	struct hwspinlock_device *bank = platform_get_drvdata(pdev);
-	int ret;
-
-	ret = hwspin_lock_unregister(bank);
-	if (ret) {
-		dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
-		return;
-	}
-}
-
 static const struct of_device_id omap_hwspinlock_of_match[] = {
 	{ .compatible = "ti,omap4-hwspinlock", },
 	{ .compatible = "ti,am64-hwspinlock", },
@@ -155,7 +141,6 @@ MODULE_DEVICE_TABLE(of, omap_hwspinlock_of_match);
 
 static struct platform_driver omap_hwspinlock_driver = {
 	.probe		= omap_hwspinlock_probe,
-	.remove_new	= omap_hwspinlock_remove,
 	.driver		= {
 		.name	= "omap_hwspinlock",
 		.of_match_table = omap_hwspinlock_of_match,
-- 
2.39.2

[PATCH 4/4] hwspinlock: omap: Use index to get hwspinlock pointer

[Andrew Davis]

For loops with multiple initializers and increments are hard to read
and reason about, simplify this by using the looping index to index
into the hwspinlock array.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 drivers/hwspinlock/omap_hwspinlock.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
index 1b0a1bea2b24a..a2555c41320d8 100644
--- a/drivers/hwspinlock/omap_hwspinlock.c
+++ b/drivers/hwspinlock/omap_hwspinlock.c
@@ -75,7 +75,6 @@ static const struct hwspinlock_ops omap_hwspinlock_ops = {
 static int omap_hwspinlock_probe(struct platform_device *pdev)
 {
 	struct hwspinlock_device *bank;
-	struct hwspinlock *hwlock;
 	void __iomem *io_base;
 	int num_locks, i, ret;
 	/* Only a single hwspinlock block device is supported */
@@ -117,8 +116,8 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
 	if (!bank)
 		return -ENOMEM;
 
-	for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
-		hwlock->priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
+	for (i = 0; i < num_locks; i++)
+		bank->lock[i].priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
 
 	ret = devm_hwspin_lock_register(&pdev->dev, bank, &omap_hwspinlock_ops,
 						base_id, num_locks);
-- 
2.39.2

Re: [PATCH 3/4] hwspinlock: omap: Use devm_hwspin_lock_register() helper

[Bjorn Andersson]

On Tue, Jan 23, 2024 at 10:04:04AM -0600, Andrew Davis wrote:
> This unregister the HW spinlock on module exit, allowing us to
> remove the remove callback. Do this here.
> 

I interpret this as stating that the driver currently doesn't unregister
the spinlocks, but as far as I can see it does, and that the patch has
no functional change.

Can you please rewrite this commit message to clearly express which
"problem" you're solving, and unless I'm mistaken clarify that there's
no functional change.


Patch itself looks good.

Regards,
Bjorn

> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  drivers/hwspinlock/omap_hwspinlock.c | 17 +----------------
>  1 file changed, 1 insertion(+), 16 deletions(-)
> 
> diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
> index 2f18ea6c05e3f..1b0a1bea2b24a 100644
> --- a/drivers/hwspinlock/omap_hwspinlock.c
> +++ b/drivers/hwspinlock/omap_hwspinlock.c
> @@ -117,12 +117,10 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
>  	if (!bank)
>  		return -ENOMEM;
>  
> -	platform_set_drvdata(pdev, bank);
> -
>  	for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
>  		hwlock->priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
>  
> -	ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
> +	ret = devm_hwspin_lock_register(&pdev->dev, bank, &omap_hwspinlock_ops,
>  						base_id, num_locks);
>  	if (ret)
>  		return ret;
> @@ -133,18 +131,6 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static void omap_hwspinlock_remove(struct platform_device *pdev)
> -{
> -	struct hwspinlock_device *bank = platform_get_drvdata(pdev);
> -	int ret;
> -
> -	ret = hwspin_lock_unregister(bank);
> -	if (ret) {
> -		dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
> -		return;
> -	}
> -}
> -
>  static const struct of_device_id omap_hwspinlock_of_match[] = {
>  	{ .compatible = "ti,omap4-hwspinlock", },
>  	{ .compatible = "ti,am64-hwspinlock", },
> @@ -155,7 +141,6 @@ MODULE_DEVICE_TABLE(of, omap_hwspinlock_of_match);
>  
>  static struct platform_driver omap_hwspinlock_driver = {
>  	.probe		= omap_hwspinlock_probe,
> -	.remove_new	= omap_hwspinlock_remove,
>  	.driver		= {
>  		.name	= "omap_hwspinlock",
>  		.of_match_table = omap_hwspinlock_of_match,
> -- 
> 2.39.2
> 

Re: [PATCH 2/4] hwspinlock: omap: Use devm_pm_runtime_enable() helper

[Bjorn Andersson]

On Tue, Jan 23, 2024 at 10:04:03AM -0600, Andrew Davis wrote:
> This disables runtime PM on module exit, allowing us to simplify
> the probe exit path and remove callbacks. Do that here.

As with the later patch, unless I'm misreading the code, you already do
disable runtime PM in omap_hwspinlock_remove().

> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  drivers/hwspinlock/omap_hwspinlock.c | 26 ++++++++------------------
>  1 file changed, 8 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
[..]
> @@ -129,16 +125,12 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
>  	ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
>  						base_id, num_locks);
>  	if (ret)
> -		goto runtime_err;
> +		return ret;
>  
>  	dev_dbg(&pdev->dev, "Registered %d locks with HwSpinlock core\n",
>  		num_locks);

I don't fancy these debug information messages, there are other ways to
confirm that the device probed successfully etc.

Now that you don't need the goto runtime_err, I'd prefer the tail of
this function:

	return hwspin_lock_register(...);

Regards,
Bjorn

>  
>  	return 0;
> -
> -runtime_err:
> -	pm_runtime_disable(&pdev->dev);
> -	return ret;
>  }
>  
>  static void omap_hwspinlock_remove(struct platform_device *pdev)
> @@ -151,8 +143,6 @@ static void omap_hwspinlock_remove(struct platform_device *pdev)
>  		dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
>  		return;
>  	}
> -
> -	pm_runtime_disable(&pdev->dev);
>  }
>  
>  static const struct of_device_id omap_hwspinlock_of_match[] = {
> -- 
> 2.39.2
> 

Re: [PATCH 2/4] hwspinlock: omap: Use devm_pm_runtime_enable() helper

[Andrew Davis]

On 2/6/24 1:06 PM, Bjorn Andersson wrote:
> On Tue, Jan 23, 2024 at 10:04:03AM -0600, Andrew Davis wrote:
>> This disables runtime PM on module exit, allowing us to simplify
>> the probe exit path and remove callbacks. Do that here.
> 
> As with the later patch, unless I'm misreading the code, you already do
> disable runtime PM in omap_hwspinlock_remove().
> 

Right, what I meant to say in the commit message was

"This disables runtime PM on module exit *automatically for us*.."

As in we don't have to manually do it anymore, and that simplifies
the code, which is the "fix" that this patch does.

Will update the commit message to make that more clear in this
and the next patch.

>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   drivers/hwspinlock/omap_hwspinlock.c | 26 ++++++++------------------
>>   1 file changed, 8 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
> [..]
>> @@ -129,16 +125,12 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
>>   	ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
>>   						base_id, num_locks);
>>   	if (ret)
>> -		goto runtime_err;
>> +		return ret;
>>   
>>   	dev_dbg(&pdev->dev, "Registered %d locks with HwSpinlock core\n",
>>   		num_locks);
> 
> I don't fancy these debug information messages, there are other ways to
> confirm that the device probed successfully etc.
> 
> Now that you don't need the goto runtime_err, I'd prefer the tail of
> this function:
> 
> 	return hwspin_lock_register(...);
> 

Sure, will update.

Thanks,
Andrew

> Regards,
> Bjorn
> 
>>   
>>   	return 0;
>> -
>> -runtime_err:
>> -	pm_runtime_disable(&pdev->dev);
>> -	return ret;
>>   }
>>   
>>   static void omap_hwspinlock_remove(struct platform_device *pdev)
>> @@ -151,8 +143,6 @@ static void omap_hwspinlock_remove(struct platform_device *pdev)
>>   		dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
>>   		return;
>>   	}
>> -
>> -	pm_runtime_disable(&pdev->dev);
>>   }
>>   
>>   static const struct of_device_id omap_hwspinlock_of_match[] = {
>> -- 
>> 2.39.2
>>