crypto: caam/qi - fix error handling in ERN handler (51fab3d7) · Commits · 戴 / test

ERN handler calls the caam/qi frontend "done" callback with a status of -EIO. This is incorrect, since the callback expects a status value meaningful for the crypto engine - hence the cryptic messages like the one below: platform caam_qi: 15: unknown error source Fix this by providing the callback with: -the status returned by the crypto engine (fd[status]) in case it contains an error, OR -a QI "No error" code otherwise; this will trigger the message: platform caam_qi: 50000000: Queue Manager Interface: No error which is fine, since QMan driver provides details about the cause of failure Cc: <stable@vger.kernel.org> # v5.1+ Fixes: ("crypto: caam - add Queue Interface (QI) backend support") Signed-off-by:

Horia Geantă <horia.geanta@nxp.com> Reviewed-by:

Iuliana Prodan <iuliana.prodan@nxp.com> Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au>

drivers/crypto/caam/error.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ static const struct {
		u8 value;
		const char *error_text;
		} qi_error_list[] = {
		{ 0x00, "No error" },
		{ 0x1F, "Job terminated by FQ or ICID flush" },
		{ 0x20, "FD format error"},
		{ 0x21, "FD command format error"},

drivers/crypto/caam/qi.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,10 @@ static void caam_fq_ern_cb(struct qman_portal qm, struct qman_fq fq,
		dma_unmap_single(drv_req->drv_ctx->qidev, qm_fd_addr(fd),
		sizeof(drv_req->fd_sgt), DMA_BIDIRECTIONAL);

		drv_req->cbk(drv_req, -EIO);
		if (fd->status)
		drv_req->cbk(drv_req, be32_to_cpu(fd->status));
		else
		drv_req->cbk(drv_req, JRSTA_SSRC_QI);
		}

		static struct qman_fq create_caam_req_fq(struct device qidev,

drivers/crypto/caam/regs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -641,6 +641,7 @@ struct caam_job_ring {
		#define JRSTA_SSRC_CCB_ERROR 0x20000000
		#define JRSTA_SSRC_JUMP_HALT_USER 0x30000000
		#define JRSTA_SSRC_DECO 0x40000000
		#define JRSTA_SSRC_QI 0x50000000
		#define JRSTA_SSRC_JRERROR 0x60000000
		#define JRSTA_SSRC_JUMP_HALT_CC 0x70000000

Admin message