[PATCH 00/11] crypto: omap-sham driver fixes
Hi, Recently we got crashes few times after some other patches to 2.6.32 kernel. This patch set greatly prevents race condition situations. No crashes are noticed any more. Now the driver should be ok for multi core as well. Regards, Dmitry Dmitry Kasatkin (11): omap-sham: remove extra reference omap-sham: remove unused code omap-sham: replace flags bit mask with bit number omap-sham: replace flags operation with atomic bit operations omap-sham: move some flags to device context omap-sham: remove unnecessary local variable omap-sham: remove dedicated queue handling tasklet omap-sham: irq and dma handling changes omap-sham: irq handler must not clear error code omap-sham: clear device flags when finishing request omap-sham: do not schedule tasklet if there is no active requests drivers/crypto/omap-sham.c | 180 ++-- 1 files changed, 90 insertions(+), 90 deletions(-) -- 1.7.4.1 -- To unsubscribe from this list: send the line unsubscribe linux-crypto in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 01/11] omap-sham: remove extra reference
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
Request pointer is already available in the function.
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index ba8f1ea..8a45fb7 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -639,7 +639,7 @@ static void omap_sham_finish_req(struct ahash_request *req,
int err)
struct omap_sham_dev *dd = ctx-dd;
if (!err) {
- omap_sham_copy_hash(ctx-dd-req, 1);
+ omap_sham_copy_hash(req, 1);
if (ctx-flags FLAGS_FINAL)
err = omap_sham_finish(req);
} else {
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 04/11] omap-sham: replace flags operation with atomic bit operations
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
Some flags are changed in interrupt handlers and verified in the tasklet.
There might be a race condition when tasklet is interrupted or another
cpu/core will run IRQ handler and tasklet in parallel.
Atomic bitops functions are now used instead of bitmask operations.
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c | 29 +
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 64698ad..208404e 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -240,7 +240,7 @@ static int omap_sham_hw_init(struct omap_sham_dev *dd)
{
clk_enable(dd-iclk);
- if (!(dd-flags BIT(FLAGS_INIT))) {
+ if (!test_bit(FLAGS_INIT, dd-flags)) {
omap_sham_write_mask(dd, SHA_REG_MASK,
SHA_REG_MASK_SOFTRESET, SHA_REG_MASK_SOFTRESET);
@@ -248,7 +248,7 @@ static int omap_sham_hw_init(struct omap_sham_dev *dd)
SHA_REG_SYSSTATUS_RESETDONE))
return -ETIMEDOUT;
- dd-flags |= BIT(FLAGS_INIT);
+ set_bit(FLAGS_INIT, dd-flags);
dd-err = 0;
}
@@ -303,7 +303,7 @@ static int omap_sham_xmit_cpu(struct omap_sham_dev *dd,
const u8 *buf,
return -ETIMEDOUT;
if (final)
- ctx-flags |= BIT(FLAGS_FINAL); /* catch last interrupt */
+ set_bit(FLAGS_FINAL, ctx-flags); /* catch last interrupt */
len32 = DIV_ROUND_UP(length, sizeof(u32));
@@ -336,9 +336,9 @@ static int omap_sham_xmit_dma(struct omap_sham_dev *dd,
dma_addr_t dma_addr,
ctx-digcnt += length;
if (final)
- ctx-flags |= BIT(FLAGS_FINAL); /* catch last interrupt */
+ set_bit(FLAGS_FINAL, ctx-flags); /* catch last interrupt */
- dd-flags |= BIT(FLAGS_DMA_ACTIVE);
+ set_bit(FLAGS_DMA_ACTIVE, dd-flags);
omap_start_dma(dd-dma_lch);
@@ -642,7 +642,7 @@ static void omap_sham_finish_req(struct ahash_request *req,
int err)
if (!err) {
omap_sham_copy_hash(req, 1);
- if (ctx-flags BIT(FLAGS_FINAL))
+ if (test_bit(FLAGS_FINAL, ctx-flags))
err = omap_sham_finish(req);
} else {
ctx-flags |= BIT(FLAGS_ERROR);
@@ -666,14 +666,14 @@ static int omap_sham_handle_queue(struct omap_sham_dev
*dd,
spin_lock_irqsave(dd-lock, flags);
if (req)
ret = ahash_enqueue_request(dd-queue, req);
- if (dd-flags BIT(FLAGS_BUSY)) {
+ if (test_bit(FLAGS_BUSY, dd-flags)) {
spin_unlock_irqrestore(dd-lock, flags);
return ret;
}
backlog = crypto_get_backlog(dd-queue);
async_req = crypto_dequeue_request(dd-queue);
if (async_req)
- dd-flags |= BIT(FLAGS_BUSY);
+ set_bit(FLAGS_BUSY, dd-flags);
spin_unlock_irqrestore(dd-lock, flags);
if (!async_req)
@@ -1037,13 +1037,10 @@ static void omap_sham_done_task(unsigned long data)
struct omap_sham_reqctx *ctx = ahash_request_ctx(req);
int ready = 0, err = 0;
- if (ctx-flags BIT(FLAGS_OUTPUT_READY)) {
- ctx-flags = ~BIT(FLAGS_OUTPUT_READY);
+ if (test_and_clear_bit(FLAGS_OUTPUT_READY, ctx-flags))
ready = 1;
- }
- if (dd-flags BIT(FLAGS_DMA_ACTIVE)) {
- dd-flags = ~BIT(FLAGS_DMA_ACTIVE);
+ if (test_and_clear_bit(FLAGS_DMA_ACTIVE, dd-flags)) {
omap_sham_update_dma_stop(dd);
if (!dd-err)
err = omap_sham_update_dma_start(dd);
@@ -1077,7 +1074,7 @@ static irqreturn_t omap_sham_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
- if (unlikely(ctx-flags BIT(FLAGS_FINAL)))
+ if (unlikely(test_bit(FLAGS_FINAL, ctx-flags)))
/* final - allow device to go to power-saving mode */
omap_sham_write_mask(dd, SHA_REG_CTRL, 0, SHA_REG_CTRL_LENGTH);
@@ -1085,7 +1082,7 @@ static irqreturn_t omap_sham_irq(int irq, void *dev_id)
SHA_REG_CTRL_OUTPUT_READY);
omap_sham_read(dd, SHA_REG_CTRL);
- ctx-flags |= BIT(FLAGS_OUTPUT_READY);
+ set_bit(FLAGS_OUTPUT_READY, ctx-flags);
dd-err = 0;
tasklet_schedule(dd-done_task);
@@ -1099,7 +1096,7 @@ static void omap_sham_dma_callback(int lch, u16
ch_status, void *data)
if (ch_status != OMAP_DMA_BLOCK_IRQ) {
pr_err(omap-sham DMA error status: 0x%hx\n, ch_status);
dd-err = -EIO;
- dd-flags = ~BIT(FLAGS_INIT); /* request to re-initialize */
+ clear_bit(FLAGS_INIT, dd-flags);/* request to re-initialize */
}
[PATCH 03/11] omap-sham: replace flags bit mask with bit number
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
Flags mask cannot be used with atomic bit operations.
This patch changes masks to bit numbers.
Atomic bit operations will be used by following patches.
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c | 102 ++-
1 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index ac12a60..64698ad 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -72,17 +72,19 @@
#define DEFAULT_TIMEOUT_INTERVAL HZ
-#define FLAGS_FINUP0x0002
-#define FLAGS_FINAL0x0004
-#define FLAGS_SG 0x0008
-#define FLAGS_SHA1 0x0010
-#define FLAGS_DMA_ACTIVE 0x0020
-#define FLAGS_OUTPUT_READY 0x0040
-#define FLAGS_INIT 0x0100
-#define FLAGS_CPU 0x0200
-#define FLAGS_HMAC 0x0400
-#define FLAGS_ERROR0x0800
-#define FLAGS_BUSY 0x1000
+/* mostly device flags */
+#define FLAGS_BUSY 0
+#define FLAGS_FINAL1
+#define FLAGS_DMA_ACTIVE 2
+#define FLAGS_OUTPUT_READY 3
+#define FLAGS_INIT 4
+#define FLAGS_CPU 5
+/* context flags */
+#define FLAGS_FINUP16
+#define FLAGS_SG 17
+#define FLAGS_SHA1 18
+#define FLAGS_HMAC 19
+#define FLAGS_ERROR20
#define OP_UPDATE 1
#define OP_FINAL 2
@@ -223,7 +225,7 @@ static void omap_sham_copy_ready_hash(struct ahash_request
*req)
if (!hash)
return;
- if (likely(ctx-flags FLAGS_SHA1)) {
+ if (likely(ctx-flags BIT(FLAGS_SHA1))) {
/* SHA1 results are in big endian */
for (i = 0; i SHA1_DIGEST_SIZE / sizeof(u32); i++)
hash[i] = be32_to_cpu(in[i]);
@@ -238,7 +240,7 @@ static int omap_sham_hw_init(struct omap_sham_dev *dd)
{
clk_enable(dd-iclk);
- if (!(dd-flags FLAGS_INIT)) {
+ if (!(dd-flags BIT(FLAGS_INIT))) {
omap_sham_write_mask(dd, SHA_REG_MASK,
SHA_REG_MASK_SOFTRESET, SHA_REG_MASK_SOFTRESET);
@@ -246,7 +248,7 @@ static int omap_sham_hw_init(struct omap_sham_dev *dd)
SHA_REG_SYSSTATUS_RESETDONE))
return -ETIMEDOUT;
- dd-flags |= FLAGS_INIT;
+ dd-flags |= BIT(FLAGS_INIT);
dd-err = 0;
}
@@ -269,7 +271,7 @@ static void omap_sham_write_ctrl(struct omap_sham_dev *dd,
size_t length,
* Setting ALGO_CONST only for the first iteration
* and CLOSE_HASH only for the last one.
*/
- if (ctx-flags FLAGS_SHA1)
+ if (ctx-flags BIT(FLAGS_SHA1))
val |= SHA_REG_CTRL_ALGO;
if (!ctx-digcnt)
val |= SHA_REG_CTRL_ALGO_CONST;
@@ -301,7 +303,7 @@ static int omap_sham_xmit_cpu(struct omap_sham_dev *dd,
const u8 *buf,
return -ETIMEDOUT;
if (final)
- ctx-flags |= FLAGS_FINAL; /* catch last interrupt */
+ ctx-flags |= BIT(FLAGS_FINAL); /* catch last interrupt */
len32 = DIV_ROUND_UP(length, sizeof(u32));
@@ -334,9 +336,9 @@ static int omap_sham_xmit_dma(struct omap_sham_dev *dd,
dma_addr_t dma_addr,
ctx-digcnt += length;
if (final)
- ctx-flags |= FLAGS_FINAL; /* catch last interrupt */
+ ctx-flags |= BIT(FLAGS_FINAL); /* catch last interrupt */
- dd-flags |= FLAGS_DMA_ACTIVE;
+ dd-flags |= BIT(FLAGS_DMA_ACTIVE);
omap_start_dma(dd-dma_lch);
@@ -392,7 +394,7 @@ static int omap_sham_xmit_dma_map(struct omap_sham_dev *dd,
return -EINVAL;
}
- ctx-flags = ~FLAGS_SG;
+ ctx-flags = ~BIT(FLAGS_SG);
/* next call does not fail... so no unmap in the case of error */
return omap_sham_xmit_dma(dd, ctx-dma_addr, length, final);
@@ -406,7 +408,7 @@ static int omap_sham_update_dma_slow(struct omap_sham_dev
*dd)
omap_sham_append_sg(ctx);
- final = (ctx-flags FLAGS_FINUP) !ctx-total;
+ final = (ctx-flags BIT(FLAGS_FINUP)) !ctx-total;
dev_dbg(dd-dev, slow: bufcnt: %u, digcnt: %d, final: %d\n,
ctx-bufcnt, ctx-digcnt, final);
@@ -452,7 +454,7 @@ static int omap_sham_update_dma_start(struct omap_sham_dev
*dd)
length = min(ctx-total, sg-length);
if (sg_is_last(sg)) {
- if (!(ctx-flags FLAGS_FINUP)) {
+ if (!(ctx-flags BIT(FLAGS_FINUP))) {
/* not last sg must be SHA1_MD5_BLOCK_SIZE aligned */
tail = length (SHA1_MD5_BLOCK_SIZE - 1);
/* without finup() we need one block to close hash */
@@ -467,12 +469,12 @@ static int
[PATCH 06/11] omap-sham: remove unnecessary local variable
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index b959dc6..84e5890 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1033,7 +1033,6 @@ static struct ahash_alg algs[] = {
static void omap_sham_done_task(unsigned long data)
{
struct omap_sham_dev *dd = (struct omap_sham_dev *)data;
- struct ahash_request *req = dd-req;
int ready = 0, err = 0;
if (test_and_clear_bit(FLAGS_OUTPUT_READY, dd-flags))
@@ -1050,7 +1049,7 @@ static void omap_sham_done_task(unsigned long data)
if (err != -EINPROGRESS (ready || err)) {
dev_dbg(dd-dev, update done: err: %d\n, err);
/* finish curent request */
- omap_sham_finish_req(req, err);
+ omap_sham_finish_req(dd-req, err);
/* start new request */
omap_sham_handle_queue(dd, NULL);
}
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 08/11] omap-sham: irq and dma handling changes
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
It could be a situation, that tasklet is executed twice because of
certain delay between dma callback and irq handler execution.
In that case, second tasklet execution could actually corrupt the data
of the new started dma transactions.
This patch improves tasklet logic and prevents above described cases.
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c | 40 +++-
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 24de4ace..a8de7b8 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -79,6 +79,7 @@
#define FLAGS_OUTPUT_READY 3
#define FLAGS_INIT 4
#define FLAGS_CPU 5
+#define FLAGS_DMA_READY6
/* context flags */
#define FLAGS_FINUP16
#define FLAGS_SG 17
@@ -304,6 +305,8 @@ static int omap_sham_xmit_cpu(struct omap_sham_dev *dd,
const u8 *buf,
if (final)
set_bit(FLAGS_FINAL, dd-flags); /* catch last interrupt */
+ set_bit(FLAGS_CPU, dd-flags);
+
len32 = DIV_ROUND_UP(length, sizeof(u32));
for (count = 0; count len32; count++)
@@ -1033,29 +1036,39 @@ static struct ahash_alg algs[] = {
static void omap_sham_done_task(unsigned long data)
{
struct omap_sham_dev *dd = (struct omap_sham_dev *)data;
- int ready = 0, err = 0;
+ int err = 0;
if (!test_bit(FLAGS_BUSY, dd-flags)) {
omap_sham_handle_queue(dd, NULL);
return;
}
- if (test_and_clear_bit(FLAGS_OUTPUT_READY, dd-flags))
- ready = 1;
-
- if (test_and_clear_bit(FLAGS_DMA_ACTIVE, dd-flags)) {
- omap_sham_update_dma_stop(dd);
- if (!dd-err)
+ if (test_bit(FLAGS_CPU, dd-flags)) {
+ if (test_and_clear_bit(FLAGS_OUTPUT_READY, dd-flags))
+ goto finish;
+ } else if (test_bit(FLAGS_DMA_READY, dd-flags)) {
+ if (test_and_clear_bit(FLAGS_DMA_ACTIVE, dd-flags)) {
+ omap_sham_update_dma_stop(dd);
+ if (dd-err) {
+ err = dd-err;
+ goto finish;
+ }
+ }
+ if (test_and_clear_bit(FLAGS_OUTPUT_READY, dd-flags)) {
+ /* hash or semi-hash ready */
+ clear_bit(FLAGS_DMA_READY, dd-flags);
err = omap_sham_update_dma_start(dd);
+ if (err != -EINPROGRESS)
+ goto finish;
+ }
}
- err = dd-err ? : err;
+ return;
- if (err != -EINPROGRESS (ready || err)) {
- dev_dbg(dd-dev, update done: err: %d\n, err);
- /* finish curent request */
- omap_sham_finish_req(dd-req, err);
- }
+finish:
+ dev_dbg(dd-dev, update done: err: %d\n, err);
+ /* finish curent request */
+ omap_sham_finish_req(dd-req, err);
}
static irqreturn_t omap_sham_irq(int irq, void *dev_id)
@@ -1087,6 +1100,7 @@ static void omap_sham_dma_callback(int lch, u16
ch_status, void *data)
clear_bit(FLAGS_INIT, dd-flags);/* request to re-initialize */
}
+ set_bit(FLAGS_DMA_READY, dd-flags);
tasklet_schedule(dd-done_task);
}
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 07/11] omap-sham: remove dedicated queue handling tasklet
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
Calling omap_sham_handle_queue from done tasklet should be done
after irq scheduled tasklet completes.
Having additional tasklet does not solve that issue because it might
be execute before.
So queue handling tasklet has been removed and functionality integrated
into single tasklet.
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c | 24 +---
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 84e5890..24de4ace 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -146,7 +146,6 @@ struct omap_sham_dev {
int dma;
int dma_lch;
struct tasklet_struct done_task;
- struct tasklet_struct queue_task;
unsigned long flags;
struct crypto_queue queue;
@@ -653,6 +652,9 @@ static void omap_sham_finish_req(struct ahash_request *req,
int err)
if (req-base.complete)
req-base.complete(req-base, err);
+
+ /* handle new request */
+ tasklet_schedule(dd-done_task);
}
static int omap_sham_handle_queue(struct omap_sham_dev *dd,
@@ -716,11 +718,9 @@ static int omap_sham_handle_queue(struct omap_sham_dev *dd,
err = omap_sham_final_req(dd);
}
err1:
- if (err != -EINPROGRESS) {
+ if (err != -EINPROGRESS)
/* done_task will not finish it, so do it here */
omap_sham_finish_req(req, err);
- tasklet_schedule(dd-queue_task);
- }
dev_dbg(dd-dev, exit, err: %d\n, err);
@@ -1035,6 +1035,11 @@ static void omap_sham_done_task(unsigned long data)
struct omap_sham_dev *dd = (struct omap_sham_dev *)data;
int ready = 0, err = 0;
+ if (!test_bit(FLAGS_BUSY, dd-flags)) {
+ omap_sham_handle_queue(dd, NULL);
+ return;
+ }
+
if (test_and_clear_bit(FLAGS_OUTPUT_READY, dd-flags))
ready = 1;
@@ -1050,18 +1055,9 @@ static void omap_sham_done_task(unsigned long data)
dev_dbg(dd-dev, update done: err: %d\n, err);
/* finish curent request */
omap_sham_finish_req(dd-req, err);
- /* start new request */
- omap_sham_handle_queue(dd, NULL);
}
}
-static void omap_sham_queue_task(unsigned long data)
-{
- struct omap_sham_dev *dd = (struct omap_sham_dev *)data;
-
- omap_sham_handle_queue(dd, NULL);
-}
-
static irqreturn_t omap_sham_irq(int irq, void *dev_id)
{
struct omap_sham_dev *dd = dev_id;
@@ -1137,7 +1133,6 @@ static int __devinit omap_sham_probe(struct
platform_device *pdev)
INIT_LIST_HEAD(dd-list);
spin_lock_init(dd-lock);
tasklet_init(dd-done_task, omap_sham_done_task, (unsigned long)dd);
- tasklet_init(dd-queue_task, omap_sham_queue_task, (unsigned long)dd);
crypto_init_queue(dd-queue, OMAP_SHAM_QUEUE_LENGTH);
dd-irq = -1;
@@ -1246,7 +1241,6 @@ static int __devexit omap_sham_remove(struct
platform_device *pdev)
for (i = 0; i ARRAY_SIZE(algs); i++)
crypto_unregister_ahash(algs[i]);
tasklet_kill(dd-done_task);
- tasklet_kill(dd-queue_task);
iounmap(dd-io_base);
clk_put(dd-iclk);
omap_sham_dma_cleanup(dd);
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 10/11] omap-sham: clear device flags when finishing request
From: Dmitry Kasatkin dmitry.kasat...@nokia.com Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com --- drivers/crypto/omap-sham.c |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index 7ca7075..804c16b 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -650,8 +650,10 @@ static void omap_sham_finish_req(struct ahash_request *req, int err) ctx-flags |= BIT(FLAGS_ERROR); } + /* atomic operation is not needed here */ + dd-flags = ~(BIT(FLAGS_BUSY) | BIT(FLAGS_FINAL) | BIT(FLAGS_CPU) | + BIT(FLAGS_DMA_READY) | BIT(FLAGS_OUTPUT_READY)); clk_disable(dd-iclk); - dd-flags = ~BIT(FLAGS_BUSY); if (req-base.complete) req-base.complete(req-base, err); -- 1.7.4.1 -- To unsubscribe from this list: send the line unsubscribe linux-crypto in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 11/11] omap-sham: do not schedule tasklet if there is no active requests
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 804c16b..6399a8f 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1085,6 +1085,11 @@ static irqreturn_t omap_sham_irq(int irq, void *dev_id)
SHA_REG_CTRL_OUTPUT_READY);
omap_sham_read(dd, SHA_REG_CTRL);
+ if (!test_bit(FLAGS_BUSY, dd-flags)) {
+ dev_warn(dd-dev, Interrupt when no active requests.\n);
+ return IRQ_HANDLED;
+ }
+
set_bit(FLAGS_OUTPUT_READY, dd-flags);
tasklet_schedule(dd-done_task);
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 09/11] omap-sham: irq handler must not clear error code
From: Dmitry Kasatkin dmitry.kasat...@nokia.com Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com --- drivers/crypto/omap-sham.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index a8de7b8..7ca7075 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -1084,7 +1084,6 @@ static irqreturn_t omap_sham_irq(int irq, void *dev_id) omap_sham_read(dd, SHA_REG_CTRL); set_bit(FLAGS_OUTPUT_READY, dd-flags); - dd-err = 0; tasklet_schedule(dd-done_task); return IRQ_HANDLED; -- 1.7.4.1 -- To unsubscribe from this list: send the line unsubscribe linux-crypto in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 05/11] omap-sham: move some flags to device context
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
Couple of context flags have been moved to device flags.
IRQ and tasklet handlers does not need to access request
context anymore.
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c | 19 ++-
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 208404e..b959dc6 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -303,7 +303,7 @@ static int omap_sham_xmit_cpu(struct omap_sham_dev *dd,
const u8 *buf,
return -ETIMEDOUT;
if (final)
- set_bit(FLAGS_FINAL, ctx-flags); /* catch last interrupt */
+ set_bit(FLAGS_FINAL, dd-flags); /* catch last interrupt */
len32 = DIV_ROUND_UP(length, sizeof(u32));
@@ -336,7 +336,7 @@ static int omap_sham_xmit_dma(struct omap_sham_dev *dd,
dma_addr_t dma_addr,
ctx-digcnt += length;
if (final)
- set_bit(FLAGS_FINAL, ctx-flags); /* catch last interrupt */
+ set_bit(FLAGS_FINAL, dd-flags); /* catch last interrupt */
set_bit(FLAGS_DMA_ACTIVE, dd-flags);
@@ -642,7 +642,7 @@ static void omap_sham_finish_req(struct ahash_request *req,
int err)
if (!err) {
omap_sham_copy_hash(req, 1);
- if (test_bit(FLAGS_FINAL, ctx-flags))
+ if (test_bit(FLAGS_FINAL, dd-flags))
err = omap_sham_finish(req);
} else {
ctx-flags |= BIT(FLAGS_ERROR);
@@ -1034,10 +1034,9 @@ static void omap_sham_done_task(unsigned long data)
{
struct omap_sham_dev *dd = (struct omap_sham_dev *)data;
struct ahash_request *req = dd-req;
- struct omap_sham_reqctx *ctx = ahash_request_ctx(req);
int ready = 0, err = 0;
- if (test_and_clear_bit(FLAGS_OUTPUT_READY, ctx-flags))
+ if (test_and_clear_bit(FLAGS_OUTPUT_READY, dd-flags))
ready = 1;
if (test_and_clear_bit(FLAGS_DMA_ACTIVE, dd-flags)) {
@@ -1067,14 +1066,8 @@ static void omap_sham_queue_task(unsigned long data)
static irqreturn_t omap_sham_irq(int irq, void *dev_id)
{
struct omap_sham_dev *dd = dev_id;
- struct omap_sham_reqctx *ctx = ahash_request_ctx(dd-req);
-
- if (!ctx) {
- dev_err(dd-dev, unknown interrupt.\n);
- return IRQ_HANDLED;
- }
- if (unlikely(test_bit(FLAGS_FINAL, ctx-flags)))
+ if (unlikely(test_bit(FLAGS_FINAL, dd-flags)))
/* final - allow device to go to power-saving mode */
omap_sham_write_mask(dd, SHA_REG_CTRL, 0, SHA_REG_CTRL_LENGTH);
@@ -1082,7 +1075,7 @@ static irqreturn_t omap_sham_irq(int irq, void *dev_id)
SHA_REG_CTRL_OUTPUT_READY);
omap_sham_read(dd, SHA_REG_CTRL);
- set_bit(FLAGS_OUTPUT_READY, ctx-flags);
+ set_bit(FLAGS_OUTPUT_READY, dd-flags);
dd-err = 0;
tasklet_schedule(dd-done_task);
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 02/11] omap-sham: remove unused code
From: Dmitry Kasatkin dmitry.kasat...@nokia.com
Signed-off-by: Dmitry Kasatkin dmitry.kasat...@nokia.com
---
drivers/crypto/omap-sham.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 8a45fb7..ac12a60 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -658,7 +658,6 @@ static int omap_sham_handle_queue(struct omap_sham_dev *dd,
{
struct crypto_async_request *async_req, *backlog;
struct omap_sham_reqctx *ctx;
- struct ahash_request *prev_req;
unsigned long flags;
int err = 0, ret = 0;
@@ -682,16 +681,12 @@ static int omap_sham_handle_queue(struct omap_sham_dev
*dd,
backlog-complete(backlog, -EINPROGRESS);
req = ahash_request_cast(async_req);
-
- prev_req = dd-req;
dd-req = req;
-
ctx = ahash_request_ctx(req);
dev_dbg(dd-dev, handling new req, op: %lu, nbytes: %d\n,
ctx-op, req-nbytes);
-
err = omap_sham_hw_init(dd);
if (err)
goto err1;
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
