Krzysztof Kozlowski
319936bf8f
crypto: caam - Fix kerneldoc
...
Fix kerneldoc warnings like:
drivers/crypto/caam/caamalg_qi2.c:73: warning: cannot understand function prototype: 'struct caam_ctx'
drivers/crypto/caam/caamalg_qi2.c:2962: warning: cannot understand function prototype: 'struct caam_hash_ctx'
drivers/crypto/caam/ctrl.c:449: warning: Function parameter or member 'ctrl' not described in 'caam_get_era'
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org >
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-09-18 17:20:12 +10:00
Andy Shevchenko
3ec25b43fa
crypto: caam - use traditional error check pattern
...
Use traditional error check pattern
ret = ...;
if (ret)
return ret;
...
instead of checking error code to be 0.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com >
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-09-11 14:39:14 +10:00
Horia Geantă
abd9875497
crypto: caam - Move debugfs fops into standalone file
...
Currently the debugfs fops are defined in caam/intern.h. This causes
problems because it creates identical static functions and variables
in multiple files. It also creates warnings when those files don't
use the fops.
This patch moves them into a standalone file, debugfs.c.
It also removes unnecessary uses of ifdefs on CONFIG_DEBUG_FS.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
[Moved most of debugfs-related operations into debugfs.c.]
Signed-off-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-08-21 14:47:49 +10:00
Herbert Xu
864c2d57d6
crypto: caam - Fix argument type in handle_imx6_err005766
...
The function handle_imx6_err005766 needs to take an __iomem argument
as otherwise sparse will generate two warnings.
Fixes: 33d69455e4herbert@gondor.apana.org.au >
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-06-18 17:26:43 +10:00
Andrey Smirnov
58e5b0157e
crypto: caam - add clock info for VFxxx SoCs
...
Add a small bit of plumbing necessary to use CAAM on VFxxx SoCs.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Fabio Estevam <festevam@gmail.com >
Cc: linux-imx@nxp.com
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-06-18 17:19:45 +10:00
Heinrich Schuchardt
24c7bf0894
crypto: caam - fix typos
...
Fix CAAM related typos.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-06-15 17:38:54 +10:00
Andrey Smirnov
358ba762d9
crypto: caam - enable prediction resistance in HRWNG
...
Instantiate CAAM RNG with prediction resistance enabled to improve its
quality (with PR on DRNG is forced to reseed from TRNG every time
random data is generated).
Management Complex firmware with version lower than 10.20.0
doesn't provide prediction resistance support. Consider this
and only instantiate rng when mc f/w version is lower.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Signed-off-by: Andrei Botila <andrei.botila@nxp.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-imx@nxp.com
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-03-30 11:50:50 +11:00
Andrey Smirnov
551ce72a78
crypto: caam - invalidate entropy register during RNG initialization
...
In order to make sure that we always use non-stale entropy data, change
the code to invalidate entropy register during RNG initialization.
Signed-off-by: Aymen Sghaier <aymen.sghaier@nxp.com >
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com >
[andrew.smirnov@gmail.com ported to upstream kernel, rewrote commit msg]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-imx@nxp.com
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-03-30 11:50:49 +11:00
Andrey Smirnov
f0ac02c791
crypto: caam - allocate RNG instantiation descriptor with GFP_DMA
...
Be consistent with the rest of the codebase and use GFP_DMA when
allocating memory for a CAAM JR descriptor.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-imx@nxp.com
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-03-30 11:50:48 +11:00
Horia Geantă
7e2b89fb4a
crypto: caam - add support for i.MX8M Plus
...
Add support for the crypto engine used in i.mx8mp (i.MX 8M "Plus"),
which is very similar to the one used in i.mx8mq, i.mx8mm, i.mx8mn.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-01-22 16:21:11 +08:00
Horia Geantă
2a2fbf20ad
crypto: caam - add support for i.MX8M Nano
...
Add support for the crypto engine used in i.mx8mn (i.MX 8M "Nano"),
which is very similar to the one used in i.mx8mq, i.mx8mm.
Since the clocks are identical for all members of i.MX 8M family,
simplify the SoC <--> clock array mapping table.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com >
Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com >
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2020-01-16 15:18:13 +08:00
Adam Ford
112e7b7b6a
crypto: caam - Add support for i.MX8M Mini
...
The i.MX8M Mini uses the same crypto engine as the i.MX8MQ, but
the driver is restricting the check to just the i.MX8MQ.
This patch expands the check for either i.MX8MQ or i.MX8MM.
Signed-off-by: Adam Ford <aford173@gmail.com >
Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com >
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-12-27 18:18:03 +08:00
Iuliana Prodan
7278fa25aa
crypto: caam - do not reset pointer size from MCFGR register
...
In commit 'a1cf573ee95 ("crypto: caam - select DMA address size at runtime")'
CAAM pointer size (caam_ptr_size) is changed from
sizeof(dma_addr_t) to runtime value computed from MCFGR register.
Therefore, do not reset MCFGR[PS].
Fixes: a1cf573ee9iuliana.prodan@nxp.com >
Cc: <stable@vger.kernel.org >
Cc: Andrey Smirnov <andrew.smirnov@gmail.com >
Cc: Alison Wang <alison.wang@nxp.com >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-12-11 16:36:45 +08:00
Andrey Smirnov
51d13aaf59
crypto: caam - populate platform devices last
...
Move the call to devm_of_platform_populate() at the end of
caam_probe(), so we won't try to add any child devices until all of
the initialization is finished successfully.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-11-01 13:38:31 +08:00
Andrey Smirnov
1a1c4f0044
crypto: caam - use devres to populate platform devices
...
Use devres to de-initialize the RNG and drop explicit de-initialization
code in caam_remove().
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-11-01 13:38:31 +08:00
Andrey Smirnov
f414de2e2f
crypto: caam - use devres to de-initialize QI
...
Use devres to de-initialize the QI and drop explicit de-initialization
code in caam_remove().
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-11-01 13:38:30 +08:00
Andrey Smirnov
e57acaf0df
crypto: caam - use devres to de-initialize the RNG
...
Use devres to de-initialize the RNG and drop explicit de-initialization
code in caam_remove().
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-11-01 13:38:30 +08:00
Andrey Smirnov
eceb5daf9e
crypto: caam - use devres to remove debugfs
...
Use devres to remove debugfs and drop corresponding
debugfs_remove_recursive() call.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-11-01 13:38:30 +08:00
Andrey Smirnov
66e93b2807
crypto: caam - use devres to unmap memory
...
Use devres to unmap memory and drop corresponding iounmap() call.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Reviewed-by: Horia Geantă <horia.geanta@nxp.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-11-01 13:38:30 +08:00
Andrey Smirnov
796114f5c5
crypto: caam - make sure clocks are enabled first
...
In order to access IP block's registers we need to enable appropriate
clocks first, otherwise we are risking hanging the CPU.
The problem becomes very apparent when trying to use CAAM driver built
as a kernel module. In that case caam_probe() gets called after
clk_disable_unused() which means all of the necessary clocks are
guaranteed to be disabled.
Coincidentally, this change also fixes iomap leak introduced by early
return (instead of "goto iounmap_ctrl") in commit
41fc54afae70 ("crypto: caam - simplfy clock initialization")
Tested on ZII i.MX6Q+ RDU2
Fixes: 176435ad2aandrew.smirnov@gmail.com >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Herbert Xu <herbert@gondor.apana.org.au >
Cc: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Tested-by: Horia Geantă <horia.geanta@nxp.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-09-09 17:49:51 +10:00
Andrey Smirnov
6796c02a4b
crypto: caam - add clock entry for i.MX8MQ
...
Add clock entry needed to support i.MX8MQ.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Cc: Chris Spencer <christopher.spencer@sea.co.uk >
Cc: Cory Tusar <cory.tusar@zii.aero >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Aymen Sghaier <aymen.sghaier@nxp.com >
Cc: Leonard Crestez <leonard.crestez@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-08-30 18:05:30 +10:00
Andrey Smirnov
a672705597
crypto: caam - always select job ring via RSR on i.MX8MQ
...
Per feedback from NXP tech support the way to use register based
service interface on i.MX8MQ is to follow the same set of steps
outlined for the case when virtualization is enabled, regardless if it
is. Current version of SRM for i.MX8MQ speaks of DECO DID_MS and DECO
DID_LS registers, but apparently those are not implemented, so the
case when SCFGR[VIRT_EN]=0 should be handled the same as the case when
SCFGR[VIRT_EN]=1
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Cc: Chris Spencer <christopher.spencer@sea.co.uk >
Cc: Cory Tusar <cory.tusar@zii.aero >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Aymen Sghaier <aymen.sghaier@nxp.com >
Cc: Leonard Crestez <leonard.crestez@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-08-30 18:05:30 +10:00
Andrey Smirnov
a1cf573ee9
crypto: caam - select DMA address size at runtime
...
i.MX8 mScale SoC still use 32-bit addresses in its CAAM implmentation,
so we can't rely on sizeof(dma_addr_t) to detemine CAAM pointer
size. Convert the code to query CTPR and MCFGR for that during driver
probing.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Cc: Chris Spencer <christopher.spencer@sea.co.uk >
Cc: Cory Tusar <cory.tusar@zii.aero >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Aymen Sghaier <aymen.sghaier@nxp.com >
Cc: Leonard Crestez <leonard.crestez@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-08-30 18:05:30 +10:00
Andrey Smirnov
1a3daadce9
crypto: caam - make CAAM_PTR_SZ dynamic
...
In order to be able to configure CAAM pointer size at run-time, which
needed to support i.MX8MQ, which is 64-bit SoC with 32-bit pointer
size, convert CAAM_PTR_SZ to refer to a global variable of the same
name ("caam_ptr_sz") and adjust the rest of the code accordingly. No
functional change intended.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Cc: Chris Spencer <christopher.spencer@sea.co.uk >
Cc: Cory Tusar <cory.tusar@zii.aero >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Aymen Sghaier <aymen.sghaier@nxp.com >
Cc: Leonard Crestez <leonard.crestez@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-08-30 18:05:30 +10:00
Andrey Smirnov
51e002e949
crypto: caam - simplfy clock initialization
...
Simplify clock initialization code by converting it to use clk-bulk,
devres and soc_device_match() match table. No functional change
intended.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com >
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com >
Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com >
Cc: Chris Spencer <christopher.spencer@sea.co.uk >
Cc: Cory Tusar <cory.tusar@zii.aero >
Cc: Chris Healy <cphealy@gmail.com >
Cc: Lucas Stach <l.stach@pengutronix.de >
Cc: Horia Geantă <horia.geanta@nxp.com >
Cc: Aymen Sghaier <aymen.sghaier@nxp.com >
Cc: Leonard Crestez <leonard.crestez@nxp.com >
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2019-08-30 18:05:29 +10:00
