From: Iuliana Prodan <iuliana.prodan@nxp.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Horia Geanta <horia.geanta@nxp.com>,
Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: "David S. Miller" <davem@davemloft.net>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-imx <linux-imx@nxp.com>
Subject: [PATCH 01/14] crypto: caam/qi - fix error handling in ERN handler
Date: Thu, 18 Jul 2019 17:45:11 +0300 [thread overview]
Message-ID: <1563461124-24641-2-git-send-email-iuliana.prodan@nxp.com> (raw)
In-Reply-To: <1563461124-24641-1-git-send-email-iuliana.prodan@nxp.com>
From: Horia Geantă <horia.geanta@nxp.com>
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> # v4.12+
Fixes: 67c2315d ("crypto: caam - add Queue Interface (QI) backend support")
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
drivers/crypto/caam/error.c | 1 +
drivers/crypto/caam/qi.c | 5 ++++-
drivers/crypto/caam/regs.h | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c
index 4f0d458..95da6ae 100644
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
@@ -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"},
diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
index 0fe618e..19a378b 100644
--- a/drivers/crypto/caam/qi.c
+++ b/drivers/crypto/caam/qi.c
@@ -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,
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index 8591914..7c7ea8a 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -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
--
2.1.0
next prev parent reply other threads:[~2019-07-18 14:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 14:45 [PATCH 00/14] crypto: caam - fixes for kernel v5.3 Iuliana Prodan
2019-07-18 14:45 ` Iuliana Prodan [this message]
2019-07-18 14:45 ` [PATCH 02/14] crypto: caam - fix return code in completion callbacks Iuliana Prodan
2019-07-18 14:45 ` [PATCH 03/14] crypto: caam - update IV only when crypto operation succeeds Iuliana Prodan
2019-07-18 14:59 ` Horia Geanta
2019-07-18 14:45 ` [PATCH 04/14] crypto: caam - check key length Iuliana Prodan
2019-07-18 14:45 ` [PATCH 05/14] crypto: caam - check authsize Iuliana Prodan
2019-07-18 14:45 ` [PATCH 06/14] crypto: caam - check assoclen Iuliana Prodan
2019-07-18 14:45 ` [PATCH 07/14] crypto: caam - check zero-length input Iuliana Prodan
2019-07-18 14:45 ` [PATCH 08/14] crypto: caam - update rfc4106 sh desc to support zero length input Iuliana Prodan
2019-07-18 14:45 ` [PATCH 09/14] crypto: caam - keep both virtual and dma key addresses Iuliana Prodan
2019-07-18 14:45 ` [PATCH 10/14] crypto: caam - fix DKP for certain key lengths Iuliana Prodan
2019-07-18 14:45 ` [PATCH 11/14] crypto: caam - free resources in case caam_rng registration failed Iuliana Prodan
2019-07-18 14:45 ` [PATCH 12/14] crypto: caam - execute module exit point only if necessary Iuliana Prodan
2019-07-18 14:45 ` [PATCH 13/14] crypto: caam - unregister algorithm only if the registration succeeded Iuliana Prodan
2019-07-18 14:45 ` [PATCH 14/14] crypto: caam - change return value in case CAAM has no MDHA Iuliana Prodan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1563461124-24641-2-git-send-email-iuliana.prodan@nxp.com \
--to=iuliana.prodan@nxp.com \
--cc=aymen.sghaier@nxp.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).