crypto: caam/qi - return -EBADMSG for ICV check failure

Crypto drivers are expected to return -EBADMSG in case of
ICV check (authentication) failure.

In this case it also makes sense to suppress the error message
in the QI dequeue callback.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 4aecc94..f4db394 100644 (file)
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -562,8 +562,18 @@ static void aead_done(struct caam_drv_req *drv_req, u32 status)
        qidev = caam_ctx->qidev;
 
        if (unlikely(status)) {
+               u32 ssrc = status & JRSTA_SSRC_MASK;
+               u8 err_id = status & JRSTA_CCBERR_ERRID_MASK;
+
                caam_jr_strstatus(qidev, status);
-               ecode = -EIO;
+               /*
+                * verify hw auth check passed else return -EBADMSG
+                */
+               if (ssrc == JRSTA_SSRC_CCB_ERROR &&
+                   err_id == JRSTA_CCBERR_ERRID_ICVCHK)
+                       ecode = -EBADMSG;
+               else
+                       ecode = -EIO;
        }
 
        edesc = container_of(drv_req, typeof(*edesc), drv_req);

diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
index f9a44f4..b948082 100644 (file)
--- a/drivers/crypto/caam/qi.c
+++ b/drivers/crypto/caam/qi.c
@@ -579,8 +579,15 @@ static enum qman_cb_dqrr_result caam_rsp_fq_dqrr_cb(struct qman_portal *p,
 
        fd = &dqrr->fd;
        status = be32_to_cpu(fd->status);
-       if (unlikely(status))
-               dev_err(qidev, "Error: %#x in CAAM response FD\n", status);
+       if (unlikely(status)) {
+               u32 ssrc = status & JRSTA_SSRC_MASK;
+               u8 err_id = status & JRSTA_CCBERR_ERRID_MASK;
+
+               if (ssrc != JRSTA_SSRC_CCB_ERROR ||
+                   err_id != JRSTA_CCBERR_ERRID_ICVCHK)
+                       dev_err(qidev, "Error: %#x in CAAM response FD\n",
+                               status);
+       }
 
        if (unlikely(qm_fd_get_format(fd) != qm_fd_compound)) {
                dev_err(qidev, "Non-compound FD from CAAM\n");