kernel/linux.git/drivers/crypto/ccree, branch v4.19.77Linux kernel stable tree (mirror)https://git.radix-linux.su/kernel/linux.git/atom?h=v4.19.772019-09-16T06:22:03+00:00crypto: ccree - add missing inline qualifier2019-09-16T06:22:03+00:00Gilad Ben-Yossefgilad@benyossef.com2019-02-11T14:27:58+00:00urn:sha1:71f71910546204a57c220eaecbfeec4303a3383b
[ Upstream commit f1071c3e2473ae19a7f5d892a187c4cab1a61f2e ]
Commit 1358c13a48c4 ("crypto: ccree - fix resume race condition on init")
was missing a "inline" qualifier for stub function used when CONFIG_PM
is not set causing a build warning.
Fixes: 1358c13a48c4 ("crypto: ccree - fix resume race condition on init")
Cc: stable@kernel.org # v4.20
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
crypto: ccree - fix resume race condition on init2019-09-16T06:22:03+00:00Gilad Ben-Yossefgilad@benyossef.com2019-02-07T13:36:11+00:00urn:sha1:72eec6b303f47b05b79dddb00f58c8dc4e7a042b
[ Upstream commit 1358c13a48c43f5e4de0c1835291837a27b9720c ]
We were enabling autosuspend, which is using data set by the
hash module, prior to the hash module being inited, casuing
a crash on resume as part of the startup sequence if the race
was lost.
This was never a real problem because the PM infra was using low
res timers so we were always winning the race, until commit 8234f6734c5d
("PM-runtime: Switch autosuspend over to using hrtimers") changed that :-)
Fix this by seperating the PM setup and enablement and doing the
latter only at the end of the init sequence.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: stable@kernel.org # v4.20
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
crypto: ccree - handle tee fips error during power management resume2019-05-22T05:37:40+00:00Ofir Drangofir.drang@arm.com2019-04-18T13:39:10+00:00urn:sha1:681f3695d514e5154997c9c3d04f4ff7128a4382
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>
crypto: ccree - add function to handle cryptocell tee fips error2019-05-22T05:37:40+00:00Ofir Drangofir.drang@arm.com2019-04-18T13:39:09+00:00urn:sha1:4fb3d87ee7b7d82498fa05d46b8cd6a4a9bf8fe1
commit 897ab2316910a66bb048f1c9cefa25e6a592dcd7 upstream.
Adds function that checks if cryptocell tee fips error occurred
and in such case triggers system error through kernel panic.
Change fips function to use this new routine.
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>
crypto: ccree - HOST_POWER_DOWN_EN should be the last CC access during suspend2019-05-22T05:37:39+00:00Ofir Drangofir.drang@arm.com2019-04-18T13:39:08+00:00urn:sha1:65f5c14a60118e97bbd8fc1f78232c6ceb0efd63
commit 3499efbeed39d114873267683b9e776bcb34b058 upstream.
During power management suspend the driver need to prepare the device
for the power down operation and as a last indication write to the
HOST_POWER_DOWN_EN register which signals to the hardware that
The ccree is ready for power down.
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>
crypto: ccree - pm resume first enable the source clk2019-05-22T05:37:39+00:00Ofir Drangofir.drang@arm.com2019-04-18T13:39:06+00:00urn:sha1:1a4fc3d29632fe86ee461dee9ca8ab26aaa95806
commit 7766dd774d80463cec7b81d90c8672af91de2da1 upstream.
On power management resume function first enable the device clk source
to allow access to the device registers.
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>
crypto: ccree - don't map AEAD key and IV on stack2019-05-22T05:37:39+00:00Gilad Ben-Yossefgilad@benyossef.com2019-04-18T13:39:05+00:00urn:sha1:120ab825c6fd3d6589a9dc056273b5f265e766f5
commit e8662a6a5f8f7f2cadc0edb934aef622d96ac3ee upstream.
The AEAD authenc key and IVs might be passed to us on stack. Copy it to
a slab buffer before mapping to gurantee proper DMA mapping.
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>
crypto: ccree - use correct internal state sizes for export2019-05-22T05:37:39+00:00Gilad Ben-Yossefgilad@benyossef.com2019-04-18T13:39:02+00:00urn:sha1:ca687cdb615918e30b9cb3f21197f8df9bfbef08
commit f3df82b468f00cca241d96ee3697c9a5e7fb6bd0 upstream.
We were computing the size of the import buffer based on the digest size
but the 318 and 224 byte variants use 512 and 256 bytes internal state
sizes respectfully, thus causing the import buffer to overrun.
Fix it by using the right sizes.
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>
crypto: ccree - don't map MAC key on stack2019-05-22T05:37:39+00:00Gilad Ben-Yossefgilad@benyossef.com2019-04-18T13:39:04+00:00urn:sha1:766121a0a798d62a57b265ae3253508ba8d79a10
commit 874e163759f27e0a9988c5d1f4605e3f25564fd2 upstream.
The MAC hash key might be passed to us on stack. Copy it to
a slab buffer before mapping to gurantee proper DMA mapping.
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>
crypto: ccree - fix mem leak on error path2019-05-22T05:37:39+00:00Gilad Ben-Yossefgilad@benyossef.com2019-04-18T13:38:50+00:00urn:sha1:7560c0adad344a4834e2a8e809b6d671d199f0f0
commit d574b707c873d6ef1a2a155f8cfcfecd821e9a2e upstream.
Fix a memory leak on the error path of IV generation code.
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>