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
Date: Fri, 19 Jul 2019 10:08:32 +0000 [thread overview]
Message-ID: <VI1PR0402MB348509F1A53E377B9343976198CB0@VI1PR0402MB3485.eurprd04.prod.outlook.com> (raw)
In-Reply-To: 1563494276-3993-10-git-send-email-iuliana.prodan@nxp.com
On 7/19/2019 2:58 AM, Iuliana Prodan wrote:
> From: Horia Geantă <horia.geanta@nxp.com>
>
> Update alginfo struct to keep both virtual and dma key addresses,
> so that descriptors have them at hand.
> One example where this is needed is in the xcbc(aes) shared descriptors,
> which are updated in current patch.
> Another example is the upcoming fix for DKP.
>
> Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
> ---
> drivers/crypto/caam/caamhash.c | 26 ++++++++++++--------------
> drivers/crypto/caam/caamhash_desc.c | 5 ++---
> drivers/crypto/caam/caamhash_desc.h | 2 +-
> drivers/crypto/caam/desc_constr.h | 10 ++++------
> 4 files changed, 19 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
> index 2ec4bad..14fdfa1 100644
> --- a/drivers/crypto/caam/caamhash.c
> +++ b/drivers/crypto/caam/caamhash.c
[...]
> @@ -508,6 +502,10 @@ static int axcbc_setkey(struct crypto_ahash *ahash, const u8 *key,
> memcpy(ctx->key, key, keylen);
> dma_sync_single_for_device(jrdev, ctx->key_dma, keylen, DMA_TO_DEVICE);
> ctx->adata.keylen = keylen;
> + /* key is loaded from memory for UPDATE and FINALIZE states */
> + ctx->adata.key_dma = ctx->key_dma;
> + /* key is immediate data for INIT and INITFINAL states */
> + ctx->adata.key_virt = ctx->key;
>
Now that it's possible to store both virtual and dma key addresses,
it would be more efficient to move these assignments .cra_init callback.
I'll submit the changes in v3.
Horia
[...]
> diff --git a/drivers/crypto/caam/desc_constr.h b/drivers/crypto/caam/desc_constr.h
> index 5988a26..8154174 100644
> --- a/drivers/crypto/caam/desc_constr.h
> +++ b/drivers/crypto/caam/desc_constr.h
> @@ -457,8 +457,8 @@ do { \
> * functions where it is used.
> * @keylen: length of the provided algorithm key, in bytes
> * @keylen_pad: padded length of the provided algorithm key, in bytes
> - * @key: address where algorithm key resides; virtual address if key_inline
> - * is true, dma (bus) address if key_inline is false.
> + * @key_dma: dma (bus) address where algorithm key resides
> + * @key_virt: virtual address where algorithm key resides
> * @key_inline: true - key can be inlined in the descriptor; false - key is
> * referenced by the descriptor
> */
> @@ -466,10 +466,8 @@ struct alginfo {
> u32 algtype;
> unsigned int keylen;
> unsigned int keylen_pad;
> - union {
> - dma_addr_t key_dma;
> - const void *key_virt;
> - };
> + dma_addr_t key_dma;
> + const void *key_virt;
> bool key_inline;
> };
>
>
next prev parent reply other threads:[~2019-07-19 10:08 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 23:57 [PATCH v2 00/14] crypto: caam - fixes for kernel v5.3 Iuliana Prodan
2019-07-18 23:57 ` [PATCH v2 01/14] crypto: caam/qi - fix error handling in ERN handler Iuliana Prodan
2019-07-18 23:57 ` [PATCH v2 02/14] crypto: caam - fix return code in completion callbacks Iuliana Prodan
2019-07-18 23:57 ` [PATCH v2 03/14] crypto: caam - update IV only when crypto operation succeeds Iuliana Prodan
2019-07-18 23:57 ` [PATCH v2 04/14] crypto: caam - check key length Iuliana Prodan
2019-07-19 14:38 ` Horia Geanta
2019-07-18 23:57 ` [PATCH v2 05/14] crypto: caam - check authsize Iuliana Prodan
2019-07-19 14:49 ` Horia Geanta
2019-07-18 23:57 ` [PATCH v2 06/14] crypto: caam - check assoclen Iuliana Prodan
2019-07-19 15:06 ` Horia Geanta
2019-07-19 15:15 ` Herbert Xu
2019-07-18 23:57 ` [PATCH v2 07/14] crypto: caam - check zero-length input Iuliana Prodan
2019-07-19 15:11 ` Horia Geanta
2019-07-18 23:57 ` [PATCH v2 08/14] crypto: caam - update rfc4106 sh desc to support zero length input Iuliana Prodan
2019-07-19 15:38 ` Horia Geanta
2019-07-18 23:57 ` [PATCH v2 09/14] crypto: caam - keep both virtual and dma key addresses Iuliana Prodan
2019-07-19 10:08 ` Horia Geanta [this message]
2019-07-18 23:57 ` [PATCH v2 10/14] crypto: caam - fix DKP for certain key lengths Iuliana Prodan
2019-07-18 23:57 ` [PATCH v2 11/14] crypto: caam - free resources in case caam_rng registration failed Iuliana Prodan
2019-07-19 15:53 ` Horia Geanta
2019-07-18 23:57 ` [PATCH v2 12/14] crypto: caam - execute module exit point only if necessary Iuliana Prodan
2019-07-19 16:02 ` Horia Geanta
2019-07-18 23:57 ` [PATCH v2 13/14] crypto: caam - unregister algorithm only if the registration succeeded Iuliana Prodan
2019-07-19 16:22 ` Horia Geanta
2019-07-18 23:57 ` [PATCH v2 14/14] crypto: caam - change return value in case CAAM has no MDHA Iuliana Prodan
2019-07-19 16:26 ` Horia Geanta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=VI1PR0402MB348509F1A53E377B9343976198CB0@VI1PR0402MB3485.eurprd04.prod.outlook.com \
--to=horia.geanta@nxp.com \
--cc=aymen.sghaier@nxp.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=iuliana.prodan@nxp.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).