Commit 681f3695 authored Apr 18, 2019 by Ofir Drang Committed by Greg Kroah-Hartman May 22, 2019

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>

parent 4fb3d87e

drivers/crypto/ccree/cc_pm.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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) {