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

Commit 3a0944c5 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Herbert Xu
Browse files

crypto: caam - share definition for MAX_SDLEN 



Both qi.h and cammalg_qi2.h seem to define identical versions of
MAX_SDLEN. Move it to desc_constr.h to avoid duplication.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Spencer <christopher.spencer@sea.co.uk>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Horia Geantă <horia.geanta@nxp.com>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6e05542f

drivers/crypto/caam/caamalg_qi2.h

+0 −27
Original line number Diff line number Diff line
@@ -92,33 +92,6 @@ struct dpaa2_caam_priv_per_cpu { 
	struct dpaa2_io *dpio;

};



/*

 * The CAAM QI hardware constructs a job descriptor which points

 * to shared descriptor (as pointed by context_a of FQ to CAAM).

 * When the job descriptor is executed by deco, the whole job

 * descriptor together with shared descriptor gets loaded in

 * deco buffer which is 64 words long (each 32-bit).

 *

 * The job descriptor constructed by QI hardware has layout:

 *

 *	HEADER		(1 word)

 *	Shdesc ptr	(1 or 2 words)

 *	SEQ_OUT_PTR	(1 word)

 *	Out ptr		(1 or 2 words)

 *	Out length	(1 word)

 *	SEQ_IN_PTR	(1 word)

 *	In ptr		(1 or 2 words)

 *	In length	(1 word)

 *

 * The shdesc ptr is used to fetch shared descriptor contents

 * into deco buffer.

 *

 * Apart from shdesc contents, the total number of words that

 * get loaded in deco buffer are '8' or '11'. The remaining words

 * in deco buffer can be used for storing shared descriptor.

 */

#define MAX_SDLEN	((CAAM_DESC_BYTES_MAX - DESC_JOB_IO_LEN) / CAAM_CMD_SZ)



/* Length of a single buffer in the QI driver memory cache */

#define CAAM_QI_MEMCACHE_SIZE	512

drivers/crypto/caam/desc_constr.h

+27 −0
Original line number Diff line number Diff line
@@ -18,6 +18,33 @@ 
#define CAAM_DESC_BYTES_MAX (CAAM_CMD_SZ * MAX_CAAM_DESCSIZE)

#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3)



/*

 * The CAAM QI hardware constructs a job descriptor which points

 * to shared descriptor (as pointed by context_a of FQ to CAAM).

 * When the job descriptor is executed by deco, the whole job

 * descriptor together with shared descriptor gets loaded in

 * deco buffer which is 64 words long (each 32-bit).

 *

 * The job descriptor constructed by QI hardware has layout:

 *

 *	HEADER		(1 word)

 *	Shdesc ptr	(1 or 2 words)

 *	SEQ_OUT_PTR	(1 word)

 *	Out ptr		(1 or 2 words)

 *	Out length	(1 word)

 *	SEQ_IN_PTR	(1 word)

 *	In ptr		(1 or 2 words)

 *	In length	(1 word)

 *

 * The shdesc ptr is used to fetch shared descriptor contents

 * into deco buffer.

 *

 * Apart from shdesc contents, the total number of words that

 * get loaded in deco buffer are '8' or '11'. The remaining words

 * in deco buffer can be used for storing shared descriptor.

 */

#define MAX_SDLEN	((CAAM_DESC_BYTES_MAX - DESC_JOB_IO_LEN) / CAAM_CMD_SZ)



#ifdef DEBUG

#define PRINT_POS do { printk(KERN_DEBUG "%02d: %s\n", desc_len(desc),\

			      &__func__[sizeof("append")]); } while (0)

drivers/crypto/caam/qi.h

+0 −26
Original line number Diff line number Diff line
@@ -14,32 +14,6 @@ 
#include "desc.h"

#include "desc_constr.h"



/*

 * CAAM hardware constructs a job descriptor which points to a shared descriptor

 * (as pointed by context_a of to-CAAM FQ).

 * When the job descriptor is executed by DECO, the whole job descriptor

 * together with shared descriptor gets loaded in DECO buffer, which is

 * 64 words (each 32-bit) long.

 *

 * The job descriptor constructed by CAAM hardware has the following layout:

 *

 *	HEADER		(1 word)

 *	Shdesc ptr	(1 or 2 words)

 *	SEQ_OUT_PTR	(1 word)

 *	Out ptr		(1 or 2 words)

 *	Out length	(1 word)

 *	SEQ_IN_PTR	(1 word)

 *	In ptr		(1 or 2 words)

 *	In length	(1 word)

 *

 * The shdesc ptr is used to fetch shared descriptor contents into DECO buffer.

 *

 * Apart from shdesc contents, the total number of words that get loaded in DECO

 * buffer are '8' or '11'. The remaining words in DECO buffer can be used for

 * storing shared descriptor.

 */

#define MAX_SDLEN	((CAAM_DESC_BYTES_MAX - DESC_JOB_IO_LEN) / CAAM_CMD_SZ)



/* Length of a single buffer in the QI driver memory cache */

#define CAAM_QI_MEMCACHE_SIZE	768