diff options
| author |   Ruchika Gupta <ruchika.gupta@freescale.com> | 2014-07-07 10:42:12 +0530 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2014-07-10 16:50:33 +0800 |
| commit | 35af64038623865015d1786360cdbbcc2e72d78b (patch) | |
| tree | 6cf62a6f27b022c33f9d2029692730cbba750958 /drivers/crypto/caam/caamalg.c | |
| parent | crypto: drbg - HMAC-SHA1 DRBG has crypto strength of 128 bits (diff) | |
| download | linux-dev-35af64038623865015d1786360cdbbcc2e72d78b.tar.xz linux-dev-35af64038623865015d1786360cdbbcc2e72d78b.zip | |
crypto: caam - Check for CAAM block presence before registering with crypto layer
The layer which registers with the crypto API should check for the presence of
the CAAM device it is going to use. If the platform's device tree doesn't have
the required CAAM node, the layer should return an error and not register the
algorithms with crypto API layer.
Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/caam/caamalg.c')
| -rw-r--r-- | drivers/crypto/caam/caamalg.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 87d9de48a39e..64c606d9e821 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -2441,8 +2441,37 @@ static struct caam_crypto_alg *caam_alg_alloc(struct caam_alg_template static int __init caam_algapi_init(void) { + struct device_node *dev_node; + struct platform_device *pdev; + struct device *ctrldev; + void *priv; int i = 0, err = 0; + dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0"); + if (!dev_node) { + dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0"); + if (!dev_node) + return -ENODEV; + } + + pdev = of_find_device_by_node(dev_node); + if (!pdev) { + of_node_put(dev_node); + return -ENODEV; + } + + ctrldev = &pdev->dev; + priv = dev_get_drvdata(ctrldev); + of_node_put(dev_node); + + /* + * If priv is NULL, it's probably because the caam driver wasn't + * properly initialized (e.g. RNG4 init failed). Thus, bail out here. + */ + if (!priv) + return -ENODEV; + + INIT_LIST_HEAD(&alg_list); /* register crypto algorithms the device supports */ |