Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Horia Geanta <horia.geanta@nxp.com>
To:     Iuliana Prodan <iuliana.prodan@nxp.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        Aymen Sghaier <aymen.sghaier@nxp.com>
CC:     "David S. Miller" <davem@davemloft.net>,
        "linux-crypto@vger.kernel.org" <linux-crypto@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        dl-linux-imx <linux-imx@nxp.com>
Subject: Re: [PATCH v2 09/14] crypto: caam - keep both virtual and dma key
 addresses
Thread-Topic: [PATCH v2 09/14] crypto: caam - keep both virtual and dma key
 addresses
Thread-Index: AQHVPcSrL0fOkGV3mUijL9yeORi/pQ==
Date:   Fri, 19 Jul 2019 10:08:32 +0000
Message-ID: <VI1PR0402MB348509F1A53E377B9343976198CB0@VI1PR0402MB3485.eurprd04.prod.outlook.com>
References: <1563494276-3993-1-git-send-email-iuliana.prodan@nxp.com>
 <1563494276-3993-10-git-send-email-iuliana.prodan@nxp.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="iso-8859-2"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 8752321e-6cd3-486d-8abe-08d70c310e4d
X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2019 10:08:32.8038
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: horia.geanta@nxp.com
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3438
Sender: linux-crypto-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

On 7/19/2019 2:58 AM, Iuliana Prodan wrote:=0A=
> From: Horia Geant=E3 <horia.geanta@nxp.com>=0A=
> =0A=
> Update alginfo struct to keep both virtual and dma key addresses,=0A=
> so that descriptors have them at hand.=0A=
> One example where this is needed is in the xcbc(aes) shared descriptors,=
=0A=
> which are updated in current patch.=0A=
> Another example is the upcoming fix for DKP.=0A=
> =0A=
> Signed-off-by: Horia Geant=E3 <horia.geanta@nxp.com>=0A=
> ---=0A=
>  drivers/crypto/caam/caamhash.c      | 26 ++++++++++++--------------=0A=
>  drivers/crypto/caam/caamhash_desc.c |  5 ++---=0A=
>  drivers/crypto/caam/caamhash_desc.h |  2 +-=0A=
>  drivers/crypto/caam/desc_constr.h   | 10 ++++------=0A=
>  4 files changed, 19 insertions(+), 24 deletions(-)=0A=
> =0A=
> diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhas=
h.c=0A=
> index 2ec4bad..14fdfa1 100644=0A=
> --- a/drivers/crypto/caam/caamhash.c=0A=
> +++ b/drivers/crypto/caam/caamhash.c=0A=
[...]=0A=
> @@ -508,6 +502,10 @@ static int axcbc_setkey(struct crypto_ahash *ahash, =
const u8 *key,=0A=
>  	memcpy(ctx->key, key, keylen);=0A=
>  	dma_sync_single_for_device(jrdev, ctx->key_dma, keylen, DMA_TO_DEVICE);=
=0A=
>  	ctx->adata.keylen =3D keylen;=0A=
> +	/* key is loaded from memory for UPDATE and FINALIZE states */=0A=
> +	ctx->adata.key_dma =3D ctx->key_dma;=0A=
> +	/* key is immediate data for INIT and INITFINAL states */=0A=
> +	ctx->adata.key_virt =3D ctx->key;=0A=
>  =0A=
Now that it's possible to store both virtual and dma key addresses,=0A=
it would be more efficient to move these assignments .cra_init callback.=0A=
=0A=
I'll submit the changes in v3.=0A=
=0A=
Horia=0A=
=0A=
[...]=0A=
> diff --git a/drivers/crypto/caam/desc_constr.h b/drivers/crypto/caam/desc=
_constr.h=0A=
> index 5988a26..8154174 100644=0A=
> --- a/drivers/crypto/caam/desc_constr.h=0A=
> +++ b/drivers/crypto/caam/desc_constr.h=0A=
> @@ -457,8 +457,8 @@ do { \=0A=
>   *           functions where it is used.=0A=
>   * @keylen: length of the provided algorithm key, in bytes=0A=
>   * @keylen_pad: padded length of the provided algorithm key, in bytes=0A=
> - * @key: address where algorithm key resides; virtual address if key_inl=
ine=0A=
> - *       is true, dma (bus) address if key_inline is false.=0A=
> + * @key_dma: dma (bus) address where algorithm key resides=0A=
> + * @key_virt: virtual address where algorithm key resides=0A=
>   * @key_inline: true - key can be inlined in the descriptor; false - key=
 is=0A=
>   *              referenced by the descriptor=0A=
>   */=0A=
> @@ -466,10 +466,8 @@ struct alginfo {=0A=
>  	u32 algtype;=0A=
>  	unsigned int keylen;=0A=
>  	unsigned int keylen_pad;=0A=
> -	union {=0A=
> -		dma_addr_t key_dma;=0A=
> -		const void *key_virt;=0A=
> -	};=0A=
> +	dma_addr_t key_dma;=0A=
> +	const void *key_virt;=0A=
>  	bool key_inline;=0A=
>  };=0A=
>  =0A=
> =0A=