| Message ID | 20191024132345.5236-1-ard.biesheuvel@linaro.org |
|---|---|
| Headers | show |
| Series | crypto: convert h/w accelerator drivers to skcipher API | expand |
On Fri, 25 Oct 2019 at 09:32, Tero Kristo <t-kristo@ti.com> wrote: > > On 24/10/2019 16:42, Ard Biesheuvel wrote: > > On Thu, 24 Oct 2019 at 15:41, Tony Lindgren <tony@atomide.com> wrote: > >> > >> * Ard Biesheuvel <ard.biesheuvel@linaro.org> [191024 13:24]: > >>> Commit 7a7ffe65c8c5 ("crypto: skcipher - Add top-level skcipher interface") > >>> dated 20 august 2015 introduced the new skcipher API which is supposed to > >>> replace both blkcipher and ablkcipher. While all consumers of the API have > >>> been converted long ago, some producers of the ablkcipher remain, forcing > >>> us to keep the ablkcipher support routines alive, along with the matching > >>> code to expose [a]blkciphers via the skcipher API. > >>> > >>> So switch this driver to the skcipher API, allowing us to finally drop the > >>> blkcipher code in the near future. > >> > >> Adding Tero to Cc on this one. > >> > > > > Ah, of course - apologies for missing that. > > Works for me, also can't find any bugs in the code via inspection, so > feel free to add: > > Reviewed-by: Tero Kristo <t-kristo@ti.com> > Tested-by: Tero Kristo <t-kristo@ti.com> > Thanks Tero I'll dig up my Beaglebone White today and test/review the patches you sent out last week.
This series converts all drivers for h/w accelerators that produce the ablkcipher API to the skcipher API, so that we can finally retire the long deprecated [a]blkcipher code. Changes since v1: - remove some more [cosmetic] references to [a]blkcipher (#26-#27) - add back missing IV for cbc(aes) in the omap driver, fixing a crash - add Gary's ack to #4 - add Linus's ack to #6 and #15 - add Kamil's and Krzysztof's acks to #7 - fixed a bug in the Atmel patch (#8) - add Horia's tested-by to #16 - add Dave's ack to #22 Patches #1, #2 are fixes for the virtio driver, which need to be applied first so that they can be backported Patches #3 and #4 have been tested on actual 'hardware' (given the virtual nature of the virtio driver). Patch #7 was tested successfully in kernelci. Patch #16 was tested by Horia. All other patches have been build tested *only*, and should be tested on actual hardware before being merged. Note that patches can be merged piecemeal (with the exception of #1 .. #3) since there are no dependencies between them. Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Biggers <ebiggers@google.com> Cc: linux-arm-kernel@lists.infradead.org Ard Biesheuvel (27): crypto: virtio - implement missing support for output IVs crypto: virtio - deal with unsupported input sizes crypto: virtio - switch to skcipher API crypto: ccp - switch from ablkcipher to skcipher crypto: omap - switch to skcipher API crypto: ux500 - switch to skcipher API crypto: s5p - switch to skcipher API crypto: atmel-aes - switch to skcipher API crypto: atmel-tdes - switch to skcipher API crypto: bcm-spu - switch to skcipher API crypto: nitrox - remove cra_type reference to ablkcipher crypto: cavium/cpt - switch to skcipher API crypto: chelsio - switch to skcipher API crypto: hifn - switch to skcipher API crypto: ixp4xx - switch to skcipher API crypto: mxs - switch to skcipher API crypto: mediatek - switch to skcipher API crypto: sahara - switch to skcipher API crypto: picoxcell - switch to skcipher API crypto: qce - switch to skcipher API crypto: stm32 - switch to skcipher API crypto: niagara2 - switch to skcipher API crypto: rockchip - switch to skcipher API crypto: talitos - switch to skcipher API crypto: qat - switch to skcipher API crypto: marvell/cesa - rename blkcipher to skcipher crypto: nx - remove stale comment referring to the blkcipher walk API drivers/crypto/Kconfig | 2 +- drivers/crypto/atmel-aes.c | 509 +++++++++--------- drivers/crypto/atmel-tdes.c | 433 ++++++++------- drivers/crypto/bcm/cipher.c | 373 +++++++------ drivers/crypto/bcm/cipher.h | 10 +- drivers/crypto/bcm/spu2.c | 6 +- drivers/crypto/cavium/cpt/cptvf_algs.c | 292 +++++----- drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 1 - drivers/crypto/ccp/ccp-crypto-aes-galois.c | 7 +- drivers/crypto/ccp/ccp-crypto-aes-xts.c | 94 ++-- drivers/crypto/ccp/ccp-crypto-aes.c | 169 +++--- drivers/crypto/ccp/ccp-crypto-des3.c | 100 ++-- drivers/crypto/ccp/ccp-crypto-main.c | 14 +- drivers/crypto/ccp/ccp-crypto.h | 13 +- drivers/crypto/chelsio/chcr_algo.c | 334 ++++++------ drivers/crypto/chelsio/chcr_algo.h | 2 +- drivers/crypto/chelsio/chcr_crypto.h | 16 +- drivers/crypto/hifn_795x.c | 183 +++---- drivers/crypto/ixp4xx_crypto.c | 228 ++++---- drivers/crypto/marvell/cesa.h | 6 +- drivers/crypto/marvell/cipher.c | 14 +- drivers/crypto/mediatek/mtk-aes.c | 248 ++++----- drivers/crypto/mxs-dcp.c | 140 +++-- drivers/crypto/n2_core.c | 194 ++++--- drivers/crypto/nx/nx-aes-ccm.c | 5 - drivers/crypto/nx/nx-aes-gcm.c | 5 - drivers/crypto/omap-aes.c | 209 ++++---- drivers/crypto/omap-aes.h | 4 +- drivers/crypto/omap-des.c | 232 ++++---- drivers/crypto/picoxcell_crypto.c | 386 +++++++------- drivers/crypto/qat/qat_common/qat_algs.c | 255 +++++---- drivers/crypto/qat/qat_common/qat_crypto.h | 4 +- drivers/crypto/qce/Makefile | 2 +- drivers/crypto/qce/cipher.h | 8 +- drivers/crypto/qce/common.c | 12 +- drivers/crypto/qce/common.h | 3 +- drivers/crypto/qce/core.c | 2 +- drivers/crypto/qce/{ablkcipher.c => skcipher.c} | 172 +++--- drivers/crypto/rockchip/Makefile | 2 +- drivers/crypto/rockchip/rk3288_crypto.c | 8 +- drivers/crypto/rockchip/rk3288_crypto.h | 3 +- drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 556 -------------------- drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 538 +++++++++++++++++++ drivers/crypto/s5p-sss.c | 187 ++++--- drivers/crypto/sahara.c | 156 +++--- drivers/crypto/stm32/stm32-cryp.c | 338 ++++++------ drivers/crypto/talitos.c | 306 +++++------ drivers/crypto/ux500/cryp/cryp_core.c | 371 ++++++------- drivers/crypto/virtio/virtio_crypto_algs.c | 192 +++---- drivers/crypto/virtio/virtio_crypto_common.h | 2 +- 50 files changed, 3499 insertions(+), 3847 deletions(-) rename drivers/crypto/qce/{ablkcipher.c => skcipher.c} (61%) delete mode 100644 drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c create mode 100644 drivers/crypto/rockchip/rk3288_crypto_skcipher.c -- 2.20.1