2016-03-22 16:05:23

by Corentin Labbe

Subject: [PATCH] crypto: sun4i-ss: use spin_lock_irq{save|restore}

The current sun4i-ss driver is subject to data corruption when
ciphering/deciphering.
It occurs randomly on end of handled data.
No root cause have been found and the only way to remove it is to replace
all spin_lock_bh by they irq counterparts.

Signed-off-by: LABBE Corentin <[email protected]>
Cc: stable <[email protected]>
---
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
index a19ee12..e72fea73 100644
--- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
@@ -35,6 +35,7 @@ static int sun4i_ss_opti_poll(struct ablkcipher_request *areq)
unsigned int todo;
struct sg_mapping_iter mi, mo;
unsigned int oi, oo; /* offset for in and out */
+ unsigned long flags;

if (areq->nbytes == 0)
return 0;
@@ -49,7 +50,7 @@ static int sun4i_ss_opti_poll(struct ablkcipher_request *areq)
return -EINVAL;
}

- spin_lock_bh(&ss->slock);
+ spin_lock_irqsave(&ss->slock, flags);

for (i = 0; i < op->keylen; i += 4)
writel(*(op->key + i / 4), ss->base + SS_KEY0 + i);
@@ -117,7 +118,7 @@ release_ss:
sg_miter_stop(&mi);
sg_miter_stop(&mo);
writel(0, ss->base + SS_CTL);
- spin_unlock_bh(&ss->slock);
+ spin_unlock_irqrestore(&ss->slock, flags);
return err;
}

@@ -149,6 +150,7 @@ static int sun4i_ss_cipher_poll(struct ablkcipher_request *areq)
unsigned int ob = 0; /* offset in buf */
unsigned int obo = 0; /* offset in bufo*/
unsigned int obl = 0; /* length of data in bufo */
+ unsigned long flags;

if (areq->nbytes == 0)
return 0;
@@ -181,7 +183,7 @@ static int sun4i_ss_cipher_poll(struct ablkcipher_request *areq)
if (no_chunk == 1)
return sun4i_ss_opti_poll(areq);

- spin_lock_bh(&ss->slock);
+ spin_lock_irqsave(&ss->slock, flags);

for (i = 0; i < op->keylen; i += 4)
writel(*(op->key + i / 4), ss->base + SS_KEY0 + i);
@@ -308,7 +310,7 @@ release_ss:
sg_miter_stop(&mi);
sg_miter_stop(&mo);
writel(0, ss->base + SS_CTL);
- spin_unlock_bh(&ss->slock);
+ spin_unlock_irqrestore(&ss->slock, flags);

return err;
}
--
2.7.3

2016-03-22 17:48:10

by Corentin Labbe

Subject: Re: [PATCH] crypto: sun4i-ss: use spin_lock_irq{save|restore}

Le 22/03/2016 17:04, LABBE Corentin a ?crit :
> The current sun4i-ss driver is subject to data corruption when
> ciphering/deciphering.
> It occurs randomly on end of handled data.
> No root cause have been found and the only way to remove it is to replace
> all spin_lock_bh by they irq counterparts.
>
> Signed-off-by: LABBE Corentin <[email protected]>
> Cc: stable <[email protected]>
> ---
> drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>

Hello

I have made a huge spelling problem, and didn't added Fixes tag.
I will resend it.
Sorry for the noise.

Regards