diff options
| author | Ofir Drang <ofir.drang@arm.com> | 2019-04-18 16:39:10 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-22 07:37:40 +0200 |
| commit | 681f3695d514e5154997c9c3d04f4ff7128a4382 (patch) | |
| tree | 5a9ae7363cd5bd390c18522238b8d671dd38c38d /drivers/crypto | |
| parent | 4fb3d87ee7b7d82498fa05d46b8cd6a4a9bf8fe1 (diff) | |
| download | linux-stable-681f3695d514e5154997c9c3d04f4ff7128a4382.tar.gz linux-stable-681f3695d514e5154997c9c3d04f4ff7128a4382.tar.bz2 linux-stable-681f3695d514e5154997c9c3d04f4ff7128a4382.zip | |
crypto: ccree - handle tee fips error during power management resume
commit 7138377ce10455b7183c6dde4b2c51b33f464c45 upstream.
in order to support cryptocell tee fips error that may occurs while
cryptocell ree is suspended, an cc_tee_handle_fips_error call added
to the cc_pm_resume function.
Signed-off-by: Ofir Drang <ofir.drang@arm.com>
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Cc: stable@vger.kernel.org # v4.19+
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/ccree/cc_pm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c index 27e363ffb467..79fc0a37ba6e 100644 --- a/drivers/crypto/ccree/cc_pm.c +++ b/drivers/crypto/ccree/cc_pm.c @@ -11,6 +11,7 @@ #include "cc_ivgen.h" #include "cc_hash.h" #include "cc_pm.h" +#include "cc_fips.h" #define POWER_DOWN_ENABLE 0x01 #define POWER_DOWN_DISABLE 0x00 @@ -50,12 +51,13 @@ int cc_pm_resume(struct device *dev) } cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE); - rc = init_cc_regs(drvdata, false); if (rc) { dev_err(dev, "init_cc_regs (%x)\n", rc); return rc; } + /* check if tee fips error occurred during power down */ + cc_tee_handle_fips_error(drvdata); rc = cc_resume_req_queue(drvdata); if (rc) { |