Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6283088 authored by Romain Perier's avatar Romain Perier Committed by Herbert Xu
Browse files

crypto: marvell - Check engine is not already running when enabling a req 



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: default avatarRomain Perier <romain.perier@free-electrons.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e26df73f

drivers/crypto/marvell/cipher.c

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ static void mv_cesa_ablkcipher_std_step(struct ablkcipher_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);

}

drivers/crypto/marvell/hash.c

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ static void mv_cesa_ahash_std_step(struct ahash_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);

}

drivers/crypto/marvell/tdma.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

}