leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: xilinx: prevent probing on non-xilinx hardware

Browse Source 
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.

Fixes: 7ecc3e3447 ("crypto: xilinx - Add Xilinx SHA3 driver")
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Corentin Labbe 2022-03-04 07:36:48 +00:00 committed by Herbert Xu
parent ee6584bf3c
commit 7a70d9a1cf
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/Kconfig
View File

@ -810,7 +810,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.

35
drivers/crypto/xilinx/zynqmp-sha.c
View File

@ -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 <harsha.harsha@xilinx.com>");