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

Commit 21590888 authored by LEROY Christophe's avatar LEROY Christophe Committed by Herbert Xu
Browse files

crypto: talitos - Add a feature to tag SEC1 



We add a new feature in the features field, to mark compatible
"fsl,sec1.0"
We also define a helper function called has_ftr_sec1() to help
functions quickly determine if they are running on SEC1 or SEC2+.
When only SEC1 or SEC2 is compiled in, has_ftr_sec1() return
trivial corresponding value. If both are compiled in, feature
field is checked.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5b841a65

drivers/crypto/talitos.c

+3 −0
Original line number Diff line number Diff line
@@ -2709,6 +2709,9 @@ static int talitos_probe(struct platform_device *ofdev) 
				  TALITOS_FTR_SHA224_HWINIT |

				  TALITOS_FTR_HMAC_OK;



	if (of_device_is_compatible(np, "fsl,sec1.0"))

		priv->features |= TALITOS_FTR_SEC1;



	priv->chan = kzalloc(sizeof(struct talitos_channel) *

			     priv->num_channels, GFP_KERNEL);

	if (!priv->chan) {

drivers/crypto/talitos.h

+17 −0
Original line number Diff line number Diff line
@@ -156,6 +156,23 @@ extern int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc, 
#define TALITOS_FTR_HW_AUTH_CHECK 0x00000002

#define TALITOS_FTR_SHA224_HWINIT 0x00000004

#define TALITOS_FTR_HMAC_OK 0x00000008

#define TALITOS_FTR_SEC1 0x00000010



/*

 * If both CONFIG_CRYPTO_DEV_TALITOS1 and CONFIG_CRYPTO_DEV_TALITOS2 are

 * defined, we check the features which are set according to the device tree.

 * Otherwise, we answer true or false directly

 */

static inline bool has_ftr_sec1(struct talitos_private *priv)

{

#if defined(CONFIG_CRYPTO_DEV_TALITOS1) && defined(CONFIG_CRYPTO_DEV_TALITOS2)

	return priv->features & TALITOS_FTR_SEC1 ? true : false;

#elif defined(CONFIG_CRYPTO_DEV_TALITOS1)

	return true;

#else

	return false;

#endif

}



/*

 * TALITOS_xxx_LO addresses point to the low data bits (32-63) of the register