summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2015-01-20 12:43:10 -0600
committerHerbert Xu <herbert@gondor.apana.org.au>2015-01-26 11:34:23 +1100
commit3f80be023900790d029a63e27440f1e33c048b73 (patch)
tree18d0407fbf097811e0a084df797f29b1c2530b6b
parente20016a9c68cebeec7d7dddb005656c8134295c4 (diff)
downloadlinux-stable-3f80be023900790d029a63e27440f1e33c048b73.tar.gz
linux-stable-3f80be023900790d029a63e27440f1e33c048b73.tar.bz2
linux-stable-3f80be023900790d029a63e27440f1e33c048b73.zip
crypto: caam - don't emit ICV check failures to dmesg
ICV check failures are part of normal operation; leave user notification up to the higher levels, as is done in s/w algorithm implementations. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Tested-by: Cristian Stoica <cristian.stoica@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/caam/error.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c
index 66d73bf54166..33e41ea83fcc 100644
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
@@ -151,10 +151,15 @@ static void report_ccb_status(struct device *jrdev, const u32 status,
else
snprintf(err_err_code, sizeof(err_err_code), "%02x", err_id);
- dev_err(jrdev, "%08x: %s: %s %d: %s%s: %s%s\n",
- status, error, idx_str, idx,
- cha_str, cha_err_code,
- err_str, err_err_code);
+ /*
+ * CCB ICV check failures are part of normal operation life;
+ * we leave the upper layers to do what they want with them.
+ */
+ if (err_id != JRSTA_CCBERR_ERRID_ICVCHK)
+ dev_err(jrdev, "%08x: %s: %s %d: %s%s: %s%s\n",
+ status, error, idx_str, idx,
+ cha_str, cha_err_code,
+ err_str, err_err_code);
}
static void report_jump_status(struct device *jrdev, const u32 status,