Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35af6403 authored by Ruchika Gupta's avatar Ruchika Gupta Committed by Herbert Xu
Browse files

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: default avatarRuchika Gupta <ruchika.gupta@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5b635e28

drivers/crypto/caam/caamalg.c

+29 −0
Original line number Original line Diff line number Diff line
@@ -2441,8 +2441,37 @@ static struct caam_crypto_alg *caam_alg_alloc(struct caam_alg_template 




static int __init caam_algapi_init(void)

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;

	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);

	INIT_LIST_HEAD(&alg_list);





	/* register crypto algorithms the device supports */

	/* register crypto algorithms the device supports */

drivers/crypto/caam/caamhash.c

+28 −0
Original line number Original line Diff line number Diff line
@@ -1793,8 +1793,36 @@ caam_hash_alloc(struct caam_hash_template *template, 




static int __init caam_algapi_hash_init(void)

static int __init caam_algapi_hash_init(void)

{

{

	struct device_node *dev_node;

	struct platform_device *pdev;

	struct device *ctrldev;

	void *priv;

	int i = 0, err = 0;

	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(&hash_list);

	INIT_LIST_HEAD(&hash_list);





	/* register crypto algorithms the device supports */

	/* register crypto algorithms the device supports */

drivers/crypto/caam/caamrng.c

+28 −0
Original line number Original line Diff line number Diff line
@@ -278,6 +278,34 @@ static void __exit caam_rng_exit(void) 
static int __init caam_rng_init(void)

static int __init caam_rng_init(void)

{

{

	struct device *dev;

	struct device *dev;

	struct device_node *dev_node;

	struct platform_device *pdev;

	struct device *ctrldev;

	void *priv;



	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;





	dev = caam_jr_alloc();

	dev = caam_jr_alloc();

	if (IS_ERR(dev)) {

	if (IS_ERR(dev)) {