Commit 97a1440d authored by Antoine Tenart's avatar Antoine Tenart Committed by Herbert Xu
Browse files

crypto: inside-secure - enable context reuse 



The context given to the crypto engine can be reused over time. While
the driver was designed to allow this, the feature wasn't enabled in the
hardware engine. This patch enables it.

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 082a9d09

drivers/crypto/inside-secure/safexcel.c

+6 −0
Original line number Diff line number Diff line
@@ -398,6 +398,12 @@ static int safexcel_hw_init(struct safexcel_crypto_priv *priv) 


		/* Processing Engine configuration */



		/* Token & context configuration */

		val = EIP197_PE_EIP96_TOKEN_CTRL_CTX_UPDATES |

		      EIP197_PE_EIP96_TOKEN_CTRL_REUSE_CTX |

		      EIP197_PE_EIP96_TOKEN_CTRL_POST_REUSE_CTX;

		writel(val, EIP197_PE(priv) + EIP197_PE_EIP96_TOKEN_CTRL(pe));



		/* H/W capabilities selection */

		val = EIP197_FUNCTION_RSVD;

		val |= EIP197_PROTOCOL_ENCRYPT_ONLY | EIP197_PROTOCOL_HASH_ONLY;

drivers/crypto/inside-secure/safexcel.h

+7 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ 
#define EIP197_PE_ICE_SCRATCH_CTRL(n)		(0x0d04 + (0x2000 * (n)))

#define EIP197_PE_ICE_FPP_CTRL(n)		(0x0d80 + (0x2000 * (n)))

#define EIP197_PE_ICE_RAM_CTRL(n)		(0x0ff0 + (0x2000 * (n)))

#define EIP197_PE_EIP96_TOKEN_CTRL(n)		(0x1000 + (0x2000 * (n)))

#define EIP197_PE_EIP96_FUNCTION_EN(n)		(0x1004 + (0x2000 * (n)))

#define EIP197_PE_EIP96_CONTEXT_CTRL(n)		(0x1008 + (0x2000 * (n)))

#define EIP197_PE_EIP96_CONTEXT_STAT(n)		(0x100c + (0x2000 * (n)))
@@ -249,6 +250,11 @@ 
#define EIP197_PE_ICE_RAM_CTRL_PUE_PROG_EN	BIT(0)

#define EIP197_PE_ICE_RAM_CTRL_FPP_PROG_EN	BIT(1)



/* EIP197_PE_EIP96_TOKEN_CTRL */

#define EIP197_PE_EIP96_TOKEN_CTRL_CTX_UPDATES		BIT(16)

#define EIP197_PE_EIP96_TOKEN_CTRL_REUSE_CTX		BIT(19)

#define EIP197_PE_EIP96_TOKEN_CTRL_POST_REUSE_CTX	BIT(20)



/* EIP197_PE_EIP96_FUNCTION_EN */

#define EIP197_FUNCTION_RSVD			(BIT(6) | BIT(15) | BIT(20) | BIT(23))

#define EIP197_PROTOCOL_HASH_ONLY		BIT(0)
@@ -468,6 +474,7 @@ struct safexcel_control_data_desc { 


#define EIP197_OPTION_MAGIC_VALUE	BIT(0)

#define EIP197_OPTION_64BIT_CTX		BIT(1)

#define EIP197_OPTION_RC_AUTO		(0x2 << 3)

#define EIP197_OPTION_CTX_CTRL_IN_CMD	BIT(8)

#define EIP197_OPTION_2_TOKEN_IV_CMD	GENMASK(11, 10)

#define EIP197_OPTION_4_TOKEN_IV_CMD	GENMASK(11, 9)

drivers/crypto/inside-secure/safexcel_ring.c

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ struct safexcel_command_desc *safexcel_add_cdesc(struct safexcel_crypto_priv *pr 
			(lower_32_bits(context) & GENMASK(31, 2)) >> 2;

		cdesc->control_data.context_hi = upper_32_bits(context);



		if (priv->version == EIP197B || priv->version == EIP197D)

			cdesc->control_data.options |= EIP197_OPTION_RC_AUTO;



		/* TODO: large xform HMAC with SHA-384/512 uses refresh = 3 */

		cdesc->control_data.refresh = 2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE