[PATCH v2 02/10] crypto: marvell: Check engine is not already running when enabling a req
From: Boris Brezillon <hidden>
Date: 2016-06-17 12:38:35
Also in:
linux-crypto
On Fri, 17 Jun 2016 13:24:01 +0200 Romain Perier [off-list ref] wrote:
Add a BUG_ON() call when the driver tries to launch a crypto request while the engine is still processing the previous one. This replaces a silent system hang by a verbose kernel panic with the associated backtrace to let the user know that something went wrong in the CESA driver. Signed-off-by: Romain Perier <redacted>
Acked-by: Boris Brezillon <redacted>
quoted hunk ↗ jump to hunk
--- Changes in v2: - Reworded the commit message - Fixed cosmetic changes drivers/crypto/marvell/cipher.c | 2 ++ drivers/crypto/marvell/hash.c | 2 ++ drivers/crypto/marvell/tdma.c | 2 ++ 3 files changed, 6 insertions(+)diff --git a/drivers/crypto/marvell/cipher.cb/drivers/crypto/marvell/cipher.c index dcf1fce..ec23609 100644--- a/drivers/crypto/marvell/cipher.c +++ b/drivers/crypto/marvell/cipher.c@@ -106,6 +106,8 @@ static void mv_cesa_ablkcipher_std_step(structablkcipher_request *req) mv_cesa_set_int_mask(engine, CESA_SA_INT_ACCEL0_DONE); writel_relaxed(CESA_SA_CFG_PARA_DIS, engine->regs + CESA_SA_CFG); + BUG_ON(readl(engine->regs + CESA_SA_CMD) & + CESA_SA_CMD_EN_CESA_SA_ACCL0);
Still incorrectly aligned ;).
quoted hunk ↗ jump to hunk
writel(CESA_SA_CMD_EN_CESA_SA_ACCL0, engine->regs + CESA_SA_CMD); }diff --git a/drivers/crypto/marvell/hash.cb/drivers/crypto/marvell/hash.c index 7ca2e0f..80bddd7 100644--- a/drivers/crypto/marvell/hash.c +++ b/drivers/crypto/marvell/hash.c@@ -237,6 +237,8 @@ static void mv_cesa_ahash_std_step(structahash_request *req) mv_cesa_set_int_mask(engine, CESA_SA_INT_ACCEL0_DONE); writel_relaxed(CESA_SA_CFG_PARA_DIS, engine->regs + CESA_SA_CFG); + BUG_ON(readl(engine->regs + CESA_SA_CMD) & + CESA_SA_CMD_EN_CESA_SA_ACCL0); writel(CESA_SA_CMD_EN_CESA_SA_ACCL0, engine->regs + CESA_SA_CMD); }diff --git a/drivers/crypto/marvell/tdma.cb/drivers/crypto/marvell/tdma.c index 7642798..8c86bb6 100644--- a/drivers/crypto/marvell/tdma.c +++ b/drivers/crypto/marvell/tdma.c@@ -53,6 +53,8 @@ void mv_cesa_dma_step(struct mv_cesa_tdma_req *dreq) engine->regs + CESA_SA_CFG); writel_relaxed(dreq->chain.first->cur_dma, engine->regs + CESA_TDMA_NEXT_ADDR); + BUG_ON(readl(engine->regs + CESA_SA_CMD) & + CESA_SA_CMD_EN_CESA_SA_ACCL0); writel(CESA_SA_CMD_EN_CESA_SA_ACCL0, engine->regs +CESA_SA_CMD); }