linux.git/drivers/crypto/allwinner, branch v6.16

crypto: sun8i-ce - move fallback ahash_request to the end of the struct

2025-05-19T05:48:48+00:00

'struct ahash_request' has a flexible array at the end, so it must be the
last member in a struct, to avoid overwriting other struct members.

Therefore, move 'fallback_req' to the end of the 'sun8i_ce_hash_reqctx'
struct.

Fixes: 56f6d5aee88d ("crypto: sun8i-ce - support hash algorithms")
Signed-off-by: Ovidiu Panait 
Signed-off-by: Herbert Xu

crypto: sun8i-ce-hash - use pm_runtime_resume_and_get()

2025-05-05T10:20:45+00:00

Replace pm_runtime_get_sync() usage with pm_runtime_resume_and_get() to
simplify error handling.

This is recommended in the documentation of pm_runtime_get_sync().

Signed-off-by: Ovidiu Panait 
Signed-off-by: Herbert Xu

crypto: sun8i-ce - undo runtime PM changes during driver removal

2025-05-05T10:20:45+00:00

The pm_runtime_use_autosuspend() call must be undone with
pm_runtime_dont_use_autosuspend() at driver exit, but this is not
currently handled in the driver.

To fix this issue and at the same time simplify error handling, switch
to devm_pm_runtime_enable(). It will call both pm_runtime_disable() and
pm_runtime_dont_use_autosuspend() during driver removal.

Fixes: 06f751b61329 ("crypto: allwinner - Add sun8i-ce Crypto Engine")
Signed-off-by: Ovidiu Panait 
Signed-off-by: Herbert Xu

crypto: sun8i-ss - do not use sg_dma_len before calling DMA functions

2025-04-28T11:45:26+00:00

When testing sun8i-ss with multi_v7_defconfig, all CBC algorithm fail crypto
selftests.
This is strange since on sunxi_defconfig, everything was ok.
The problem was in the IV setup loop which never run because sg_dma_len
was 0.

Fixes: 359e893e8af4 ("crypto: sun8i-ss - rework handling of IV")
Signed-off-by: Corentin Labbe 
Signed-off-by: Herbert Xu

crypto: sun8i-ce-cipher - use pm_runtime_resume_and_get()

2025-04-28T11:45:26+00:00

Replace pm_runtime_get_sync() usage with pm_runtime_resume_and_get() to
simplify error handling.

This is recommended in the documentation of pm_runtime_get_sync():
/**
 * pm_runtime_get_sync - Bump up usage counter of a device and resume it.
...
 * Consider using pm_runtime_resume_and_get() instead of it, especially
 * if its return value is checked by the caller, as this is likely to result
 * in cleaner code.
...
 */

Signed-off-by: Ovidiu Panait 
Tested-by: Corentin LABBE 
Acked-by: Corentin LABBE 
Signed-off-by: Herbert Xu

crypto: sun8i-ce-cipher - use IS_ENABLED() checks for debugfs stats

2025-04-28T11:45:26+00:00

Add IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG) checks before the
fallback counter updates to make sure the code is not included when
debugfs statistics support is not enabled.

Also, drop the existing ifdef guards, since 'struct sun8i_ce_alg_template'
is always defined, even with CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG disabled.

Signed-off-by: Ovidiu Panait 
Tested-by: Corentin LABBE 
Acked-by: Corentin LABBE 
Signed-off-by: Herbert Xu

crypto: sun8i-ce-cipher - use crypto_skcipher_driver_name()

2025-04-28T11:45:26+00:00

Use crypto_skcipher_driver_name() helper from , instead
of accessing struct crypto_alg directly.

Signed-off-by: Ovidiu Panait 
Acked-by: Corentin LABBE 
Tested-by: Corentin LABBE 
Signed-off-by: Herbert Xu

crypto: sun8i-ce-cipher - fix error handling in sun8i_ce_cipher_prepare()

2025-04-28T11:45:26+00:00

Fix two DMA cleanup issues on the error path in sun8i_ce_cipher_prepare():

1] If dma_map_sg() fails for areq->dst, the device driver would try to free
   DMA memory it has not allocated in the first place. To fix this, on the
   "theend_sgs" error path, call dma unmap only if the corresponding dma
   map was successful.

2] If the dma_map_single() call for the IV fails, the device driver would
   try to free an invalid DMA memory address on the "theend_iv" path:
   ------------[ cut here ]------------
   DMA-API: sun8i-ce 1904000.crypto: device driver tries to free an invalid DMA memory address
   WARNING: CPU: 2 PID: 69 at kernel/dma/debug.c:968 check_unmap+0x123c/0x1b90
   Modules linked in: skcipher_example(O+)
   CPU: 2 UID: 0 PID: 69 Comm: 1904000.crypto- Tainted: G           O        6.15.0-rc3+ #24 PREEMPT
   Tainted: [O]=OOT_MODULE
   Hardware name: OrangePi Zero2 (DT)
   pc : check_unmap+0x123c/0x1b90
   lr : check_unmap+0x123c/0x1b90
   ...
   Call trace:
    check_unmap+0x123c/0x1b90 (P)
    debug_dma_unmap_page+0xac/0xc0
    dma_unmap_page_attrs+0x1f4/0x5fc
    sun8i_ce_cipher_do_one+0x1bd4/0x1f40
    crypto_pump_work+0x334/0x6e0
    kthread_worker_fn+0x21c/0x438
    kthread+0x374/0x664
    ret_from_fork+0x10/0x20
   ---[ end trace 0000000000000000 ]---

To fix this, check for !dma_mapping_error() before calling
dma_unmap_single() on the "theend_iv" path.

Fixes: 06f751b61329 ("crypto: allwinner - Add sun8i-ce Crypto Engine")
Signed-off-by: Ovidiu Panait 
Signed-off-by: Herbert Xu

crypto: sun8i-ss - use API helpers to setup fallback request

2025-04-17T02:41:47+00:00

Rather than setting up the fallback request by hand, use
ahash_request_set_callback() and ahash_request_set_crypt() API helpers
to properly setup the new request.

This also ensures that the completion callback is properly passed down
to the fallback algorithm, which avoids a crash with async fallbacks.

Signed-off-by: Ovidiu Panait 
Tested-by: Corentin Labbe 
Acked-by: Corentin Labbe 
Signed-off-by: Herbert Xu

crypto: sun8i-ce-hash - use API helpers to setup fallback request

2025-04-08T07:54:38+00:00

Rather than setting up the fallback request by hand, use
ahash_request_set_callback() and ahash_request_set_crypt() API helpers
to properly setup the new request.

Signed-off-by: Ovidiu Panait 
Signed-off-by: Herbert Xu