2014-04-11 05:08:38

by Sonic Zhang

Subject: [PATCH v2 1/2] crypto: bfin_crc: ignore duplicated registration of the same algorithm

From: Sonic Zhang <[email protected]>

in case of multiple crc devices are probed.
Call platform_set_drvdata() before adding new CRC device into the list.

Signed-off-by: Sonic Zhang <[email protected]>
---
v2-chagnes:
- check the CRC list and avoid call crypto_register_ahash() if not empty
- move platform_set_drvdata() before adding CRC device into the list

drivers/crypto/bfin_crc.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/crypto/bfin_crc.c b/drivers/crypto/bfin_crc.c
index cea3e8c..7154d68 100644
--- a/drivers/crypto/bfin_crc.c
+++ b/drivers/crypto/bfin_crc.c
@@ -665,20 +665,23 @@ static int bfin_crypto_crc_probe(struct platform_device *pdev)
if (timeout == 0)
dev_info(&pdev->dev, "init crc poly timeout\n");

+ platform_set_drvdata(pdev, crc);
+
spin_lock(&crc_list.lock);
- list_add(&crc->list, &crc_list.dev_list);
- spin_unlock(&crc_list.lock);

- platform_set_drvdata(pdev, crc);
+ if (list_empty(&crc_list.dev_list)) {
+ list_add(&crc->list, &crc_list.dev_list);
+ ret = crypto_register_ahash(&algs);
+ if (ret) {
+ spin_unlock(&crc_list.lock);
+ dev_err(&pdev->dev,
+ "Cann't register crypto ahash device\n");
+ goto out_error_dma;
+ }
+ } else
+ list_add(&crc->list, &crc_list.dev_list);

- ret = crypto_register_ahash(&algs);
- if (ret) {
- spin_lock(&crc_list.lock);
- list_del(&crc->list);
- spin_unlock(&crc_list.lock);
- dev_err(&pdev->dev, "Cann't register crypto ahash device\n");
- goto out_error_dma;
- }
+ spin_unlock(&crc_list.lock);

dev_info(&pdev->dev, "initialized\n");

--
1.8.2.3

2014-04-11 08:17:36

by Marek Vasut

Subject: Re: [PATCH v2 1/2] crypto: bfin_crc: ignore duplicated registration of the same algorithm

On Friday, April 11, 2014 at 07:10:24 AM, Sonic Zhang wrote:
> From: Sonic Zhang <[email protected]>
>
> in case of multiple crc devices are probed.
> Call platform_set_drvdata() before adding new CRC device into the list.
>
> Signed-off-by: Sonic Zhang <[email protected]>
> ---
> v2-chagnes:
> - check the CRC list and avoid call crypto_register_ahash() if not empty
> - move platform_set_drvdata() before adding CRC device into the list
>
> drivers/crypto/bfin_crc.c | 25 ++++++++++++++-----------
> 1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/crypto/bfin_crc.c b/drivers/crypto/bfin_crc.c
> index cea3e8c..7154d68 100644
> --- a/drivers/crypto/bfin_crc.c
> +++ b/drivers/crypto/bfin_crc.c
> @@ -665,20 +665,23 @@ static int bfin_crypto_crc_probe(struct
> platform_device *pdev) if (timeout == 0)
> dev_info(&pdev->dev, "init crc poly timeout\n");
>
> + platform_set_drvdata(pdev, crc);
> +
> spin_lock(&crc_list.lock);
> - list_add(&crc->list, &crc_list.dev_list);
> - spin_unlock(&crc_list.lock);
>
> - platform_set_drvdata(pdev, crc);
> + if (list_empty(&crc_list.dev_list)) {

Try the following, which would remove the need for the else{} branch altogether:

list_add(...);
if (list_is_singular(...)) {
crypto_register_....
...
}


Other than that

Reviewed-by: Marek Vasut <[email protected]>

Best regards,
Marek Vasut