crypto: xilinx: prevent probing on non-xilinx hardware
Subsystems (3)
PATCH 1/1 crypto: xilinx: prevent probing on non-xilinx hardware
The zynqmp-sha driver is always loaded and register its algorithm even on platform which do not have the proper hardware.
This lead to a stacktrace due to zynqmp-sha3-384 failing its crypto self tests.
So check if hardware is present via the firmware API call get_version.
While at it, simplify the platform_driver by using module_platform_driver()
Furthermore the driver should depend on ZYNQMP_FIRMWARE since it cannot work without it.
--- drivers/crypto/Kconfig | 2 +- drivers/crypto/xilinx/zynqmp-sha.c | 35 +++++++----------------------- 2 files changed, 9 insertions(+), 28 deletions(-)
drivers/crypto/Kconfig +1 -1
@@ -822,7 +822,7 @@ config CRYPTO_DEV_ZYNQMP_AES config CRYPTO_DEV_ZYNQMP_SHA3 bool "Support for Xilinx ZynqMP SHA3 hardware accelerator" - depends on ARCH_ZYNQMP + depends on ZYNQMP_FIRMWARE select CRYPTO_SHA3 help Xilinx ZynqMP has SHA3 engine used for secure hash calculation.
drivers/crypto/xilinx/zynqmp-sha.c +8 -27
@@ -193,6 +193,13 @@ static int zynqmp_sha_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;int err; +u32 v; + +/* Verify the hardware is present */ + err =zynqmp_pm_get_api_version (&v); +if (err) +return err; + err =dma_set_mask_and_coherent (dev,DMA_BIT_MASK (ZYNQMP_DMA_BIT_MASK ));if (err <0 ) {
@@ -251,33 +258,7 @@ static struct platform_driver zynqmp_sha_driver = { }, }; -static int __init sha_driver_init (void ) -{ -struct platform_device *pdev; -int ret; - - ret =platform_driver_register (&zynqmp_sha_driver); -if (ret) -return ret; - - pdev =platform_device_register_simple (zynqmp_sha_driver.driver.name, -0 ,NULL ,0 ); -if (IS_ERR (pdev)) { - ret =PTR_ERR (pdev); -platform_driver_unregister (&zynqmp_sha_driver); -pr_info ("Failed to register ZynqMP SHA3 dvixe %d\n" , ret); - } - -return ret; -} - -device_initcall (sha_driver_init); - -static void __exit sha_driver_exit(void) -{ -platform_driver_unregister (&zynqmp_sha_driver); -} - +module_platform_driver (zynqmp_sha_driver);MODULE_DESCRIPTION ("ZynqMP SHA3 hardware acceleration support." );MODULE_LICENSE ("GPL v2" );MODULE_AUTHOR ("Harsha <[email protected]>" );
Signature · 1 line
2.34.1
Herbert Xu
maintainerQuoted 11 lines · Corentin Labbe
The zynqmp-sha driver is always loaded and register its algorithm even on platform which do not have the proper hardware.
This lead to a stacktrace due to zynqmp-sha3-384 failing its crypto self tests.
So check if hardware is present via the firmware API callget_version.While at it, simplify the
platform_driverby usingmodule_platform_driver()Furthermore the driver should depend on
ZYNQMP_FIRMWAREsince it cannot work without it.
Quoted 6 lines
Fixes 7ecc3e34474b ("crypto: xilinx - Add Xilinx SHA3 driver")Signed-off-by Corentin Labbe <[email protected]>--- drivers/crypto/Kconfig | 2 +- drivers/crypto/xilinx/zynqmp-sha.c | 35 +++++++----------------------- 2 files changed, 9 insertions(+), 28 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt