The Freescale Integrated Security Engine (SEC) aka "Talitos" driver
implementation is a monolithic ~3800-line file that mixes SEC1 and SEC2
hardware variants with hash, skcipher, aead and hwrng algorithm.
This series reorganises the driver to improve readability and
maintainability:
- Split the driver into a dedicated directory with separate files for
hash, skcipher, aead, and hwrng implementations.
- Modernise the crypto API usage: adopt {init,exit}_tfm (deprecated
cra_init/cra_exit), use CRYPTO_AHASH_ALG_BLOCK_ONLY to eliminate
manual partial-block buffering, and use macros to deduplicate
algorithm definitions.
- Introduce a is_sec1() helper to get rid of is_sec1 variables /
parameters.
- Define descriptor/pointer structures for each hardware version,
instead of using a single structure and anonymous union.
No functional changes are intended except for patch 1.
This series depends on the "crypto: talitos - bug fixes" series :
https://patch.msgid.link/20260507-bootlin_test-7-1-rc1_sec_bugfix-v3-0-c98d7589b942@bootlin.com
Signed-off-by: Paul Louvel <paul.louvel@bootlin.com>
---
Changes in v7:
- Patch 1: instead of using DESC_HDR_MODE0_MDEU_MD5 to detect if we are
using the MD5 hash, use crypto_ahash_digestsize() instead.
Flagged by Sashiko.
Increment req_ctx->message_size before submitting the descriptor to
the hw. Decrement if it fails.
Flagged by Sashiko.
- Patch 2: rename the main driver file to talitos-core.c. That way, the
module is still named talitos.
Flagged by Sashiko.
- Patch 4: instantiate t_alg->dev before registering the algorithm to
the core.
Flagged by Sashiko, seems plausible but never had a panic when
executing crypto selftests.
Added a patch adding an entry in the MAINTAINERS file for this driver.
Sashiko reviews dismissed:
[1], 1: If this is an issue, it is an existing issue because
the driver used devm_kzalloc() to allocate an instance of struct
talitos_crypto_alg.
Second, how should a driver knows that it should keep this memory
because a tfm instance is still alive ? For me, the only fix would be to
use kzalloc() and then never free it, which is not acceptable.
[2], [3]: A kernel configuration that selects both version is possible,
but a SoC featuring both hardware version of the crypto engine is not
possible and not described in any device tree. Freescale MPCxxxx SoC
family is more than 15+ years old.
- Link to v6: https://patch.msgid.link/20260911-7-3-rc2_talitos_cleanup-v6-0-4215f347c97a@bootlin.com
[1]: https://sashiko.dev/#/patchset/20260911-7-3-rc2_talitos_cleanup-v6-0-4215f347c97a%40bootlin.com?part=6
[2]: https://sashiko.dev/#/patchset/20260911-7-3-rc2_talitos_cleanup-v6-0-4215f347c97a%40bootlin.com?part=16
[3]: https://sashiko.dev/#/patchset/20260911-7-3-rc2_talitos_cleanup-v6-0-4215f347c97a%40bootlin.com?part=18
Changes in v6:
- v5 could not be applied by Sashiko because I forgot re-parenting this
series with a newer release.
- Link to v5:
https://patch.msgid.link/20260507-bootlin_test-7-1-rc1_sec_bugfix-v3-0-c98d7589b942@bootlin.com
Changes in v5:
- Patch 1: compute the SEC1 software padding length in little endian for
MD5. Update message_size only once the hardware has accepted the
request, so a failed submission no longer updates the message length.
A note on Sashiko third comment [1]:
- If the current digest operation errors out because the driver
returned -EAGAIN, it indeed clears the partial block buffer in the
core with CRYPTO_AHASH_ALG_BLOCK_ONLY.
Looking at how the API handles it, it means for me that the entire
digest operation must be restarted, not just the current chunk of
data currently being processed with .update() or .finup(). In this
case, no need to keep the partial block buffer.
If I am mistaken, how should this be handled?
- Patch 4: rename the module target to crypto-talitos to remove the
circular dependency in the Makefile.
- Patch 5: make __map_single_talitos_ptr() static inline to avoid
unused-function warnings.
- Patches 6, 7 and 8: register algorithms from a copy of the templates
instead of modifying the global arrays. Make the algorithm template
arrays const.
- Patch 12: keep the "hmac-<hash>-talitos" driver names in the hash
macros.
- Patches 12/13/14: added a driver_name parameter to the algorithm
macros. The driver name is built from driver_name"-talitos" instead
of name"-talitos", so the old dash separated format survives
("cbc-aes-talitos" rather than "cbc(aes)-talitos"). Sashiko flagged
this in the v4 review as a userspace ABI break.
- Patch 15: move before the macro conversion patches, and set the
properties that do not depend on runtime features in the templates.
This patch is now patch 12 in the series.
- Link to v4:
https://patch.msgid.link/20260722-7-1-rc1_talitos_cleanup-v4-0-81d1ed2ad911@bootlin.com
Changes in v4:
- The modification I did in v3 in PATCH 1 was incomplete. message_size
was not initialized in ahash_init(), and not incremented in
ahash_process_req().
- Link to v3: https://patch.msgid.link/20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com
Changes in v3:
- Upon Herbert's remark on FINAL_NONZERO flag not working with algorithms
like md5, I removed the flag entirely for all algorithms.
Only the SEC1 revision is buggy when sending 0 byte descriptor
: the hardware yield an error. On the SEC2, this bug is not present
and can accept zero byte descriptor if the hardware auto-pad.
This bug is mitigated for SEC1 with software padding in
talitos_handle_buggy_hash().
It had to be slightly change in PATCH 1 because of the removal of
FINAL_NONZERO : the message length in bits was always zero. Now, a
zero byte request can happen after a handful of non-zero byte
requests.
Keep track of the message length in the request context, and put the
message length in bits as a 64-bit big endian integer at the end of
the padding.
Allocate a buffer per ahash request instead of using a static buffer,
since it is now written to.
- Link to v2: https://patch.msgid.link/20260611-7-1-rc1_talitos_cleanup-v2-0-aa4a813ce69b@bootlin.com
Changes in v2:
- Fixed compilation warnings and errors.
- Instead of using ops to dispatch SEC1/SEC2 variants, keep the small
helpers, and introduce is_sec1() inline function that can use static
key branching in case both hardware version are compiled.
- Dropped the SEC1/SEC2 function variants inside the core driver file.
- Reworded the cover letter for clarity.
- Link to v1: https://patch.msgid.link/20260528-7-1-rc1_talitos_cleanup-v1-0-cb1ad6cdea49@bootlin.com
References:
[1]: https://sashiko.dev/#/patchset/20260722-7-1-rc1_talitos_cleanup-v4-0-81d1ed2ad911%40bootlin.com?part=1
To: Herbert Xu <herbert@gondor.apana.org.au>
To: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Paul Louvel <paul.louvel@bootlin.com>
---
Paul Louvel (20):
crypto: talitos/hash - Use CRYPTO_AHASH_BLOCK_ONLY API
crypto: talitos - Move driver into dedicated directory
crypto: talitos - Add missing includes to driver header file
crypto: talitos/hwrng - Move into separate file
crypto: talitos - Prepare crypto implementation file splitting
crypto: talitos/hash - Move into separate file
crypto: talitos/skcipher - Move into separate file
crypto: talitos/aead - Move into separate file
crypto: talitos/hash - Convert to {init,exit}_tfm type-specific API
crypto: talitos/skcipher - Convert to {init,exit}_tfm type-specific API
crypto: talitos/aead - Convert to {init,exit}_tfm type-specific API
crypto: talitos - Remove alg settings in talitos_register_common()
crypto: talitos/hash - Use macro for algorithm definitions
crypto: talitos/skcipher - Use macro for algorithm definitions
crypto: talitos/aead - Use macro for algorithm definitions
crypto: talitos - Introduce is_sec1() helper with static key support
crypto: talitos - Replace has_ftr_sec1() with is_sec1() static key helper
crypto: talitos - Introduce per-SEC-version descriptor and pointer structures
crypto: talitos - Remove TALITOS_DESC_SIZE macro
MAINTAINERS: add entry for talitos driver
MAINTAINERS | 6 +
drivers/crypto/Kconfig | 38 +-
drivers/crypto/Makefile | 2 +-
drivers/crypto/talitos.c | 3635 -----------------------------
drivers/crypto/talitos/Kconfig | 36 +
drivers/crypto/talitos/Makefile | 3 +
drivers/crypto/talitos/talitos-aead.c | 680 ++++++
drivers/crypto/talitos/talitos-core.c | 1334 +++++++++++
drivers/crypto/talitos/talitos-hash.c | 708 ++++++
drivers/crypto/talitos/talitos-rng.c | 93 +
drivers/crypto/talitos/talitos-skcipher.c | 359 +++
drivers/crypto/{ => talitos}/talitos.h | 316 ++-
12 files changed, 3509 insertions(+), 3701 deletions(-)
---
base-commit: 317cdd0bb81c505ac42700258732e551c4f75a53
change-id: 20260910-7-3-rc2_talitos_cleanup-e7e6925bf0f2
Best regards,
--
Paul Louvel, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com