| Message ID | 0ada8523d5765391ddc6899815e0e1eb511bcb7d.1560429844.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Additional fixes on Talitos driver | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (a3bf9fbdad600b1e4335dd90979f8d6072e4f602) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 72 lines checked |
Le 13/06/2019 à 14:48, Christophe Leroy a écrit : > Moves it into talitos.h so that it can be used > from any place in talitos.c > > This will be required for next > patch ("crypto: talitos - fix hash on SEC1") > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Cc: stable@vger.kernel.org > --- > drivers/crypto/talitos.c | 30 ------------------------------ > drivers/crypto/talitos.h | 30 ++++++++++++++++++++++++++++++ > 2 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c > index 3b3e99f1cddb..5b401aec6c84 100644 > --- a/drivers/crypto/talitos.c > +++ b/drivers/crypto/talitos.c > @@ -951,36 +951,6 @@ static int aead_des3_setkey(struct crypto_aead *authenc, > goto out; > } > > -/* > - * talitos_edesc - s/w-extended descriptor > - * @src_nents: number of segments in input scatterlist > - * @dst_nents: number of segments in output scatterlist > - * @icv_ool: whether ICV is out-of-line > - * @iv_dma: dma address of iv for checking continuity and link table > - * @dma_len: length of dma mapped link_tbl space > - * @dma_link_tbl: bus physical address of link_tbl/buf > - * @desc: h/w descriptor > - * @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) > - * @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) > - * > - * if decrypting (with authcheck), or either one of src_nents or dst_nents > - * is greater than 1, an integrity check value is concatenated to the end > - * of link_tbl data > - */ > -struct talitos_edesc { > - int src_nents; > - int dst_nents; > - bool icv_ool; > - dma_addr_t iv_dma; > - int dma_len; > - dma_addr_t dma_link_tbl; > - struct talitos_desc desc; > - union { > - struct talitos_ptr link_tbl[0]; > - u8 buf[0]; > - }; > -}; > - > static void talitos_sg_unmap(struct device *dev, > struct talitos_edesc *edesc, > struct scatterlist *src, > diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h > index 32ad4fc679ed..95f78c6d9206 100644 > --- a/drivers/crypto/talitos.h > +++ b/drivers/crypto/talitos.h > @@ -42,6 +42,36 @@ struct talitos_desc { > > #define TALITOS_DESC_SIZE (sizeof(struct talitos_desc) - sizeof(__be32)) > > +/* > + * talitos_edesc - s/w-extended descriptor > + * @src_nents: number of segments in input scatterlist > + * @dst_nents: number of segments in output scatterlist > + * @icv_ool: whether ICV is out-of-line > + * @iv_dma: dma address of iv for checking continuity and link table > + * @dma_len: length of dma mapped link_tbl space > + * @dma_link_tbl: bus physical address of link_tbl/buf > + * @desc: h/w descriptor > + * @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) > + * @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) > + * > + * if decrypting (with authcheck), or either one of src_nents or dst_nents > + * is greater than 1, an integrity check value is concatenated to the end > + * of link_tbl data > + */ > +struct talitos_edesc { > + int src_nents; > + int dst_nents; > + bool icv_ool; > + dma_addr_t iv_dma; > + int dma_len; > + dma_addr_t dma_link_tbl; > + struct talitos_desc desc; > + union { > + struct talitos_ptr link_tbl[0]; > + u8 buf[0]; > + }; > +}; > + > /** > * talitos_request - descriptor submission request > * @desc: descriptor pointer (kernel virtual) >
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 3b3e99f1cddb..5b401aec6c84 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -951,36 +951,6 @@ static int aead_des3_setkey(struct crypto_aead *authenc, goto out; } -/* - * talitos_edesc - s/w-extended descriptor - * @src_nents: number of segments in input scatterlist - * @dst_nents: number of segments in output scatterlist - * @icv_ool: whether ICV is out-of-line - * @iv_dma: dma address of iv for checking continuity and link table - * @dma_len: length of dma mapped link_tbl space - * @dma_link_tbl: bus physical address of link_tbl/buf - * @desc: h/w descriptor - * @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) - * @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) - * - * if decrypting (with authcheck), or either one of src_nents or dst_nents - * is greater than 1, an integrity check value is concatenated to the end - * of link_tbl data - */ -struct talitos_edesc { - int src_nents; - int dst_nents; - bool icv_ool; - dma_addr_t iv_dma; - int dma_len; - dma_addr_t dma_link_tbl; - struct talitos_desc desc; - union { - struct talitos_ptr link_tbl[0]; - u8 buf[0]; - }; -}; - static void talitos_sg_unmap(struct device *dev, struct talitos_edesc *edesc, struct scatterlist *src, diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h index 32ad4fc679ed..95f78c6d9206 100644 --- a/drivers/crypto/talitos.h +++ b/drivers/crypto/talitos.h @@ -42,6 +42,36 @@ struct talitos_desc { #define TALITOS_DESC_SIZE (sizeof(struct talitos_desc) - sizeof(__be32)) +/* + * talitos_edesc - s/w-extended descriptor + * @src_nents: number of segments in input scatterlist + * @dst_nents: number of segments in output scatterlist + * @icv_ool: whether ICV is out-of-line + * @iv_dma: dma address of iv for checking continuity and link table + * @dma_len: length of dma mapped link_tbl space + * @dma_link_tbl: bus physical address of link_tbl/buf + * @desc: h/w descriptor + * @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) + * @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) + * + * if decrypting (with authcheck), or either one of src_nents or dst_nents + * is greater than 1, an integrity check value is concatenated to the end + * of link_tbl data + */ +struct talitos_edesc { + int src_nents; + int dst_nents; + bool icv_ool; + dma_addr_t iv_dma; + int dma_len; + dma_addr_t dma_link_tbl; + struct talitos_desc desc; + union { + struct talitos_ptr link_tbl[0]; + u8 buf[0]; + }; +}; + /** * talitos_request - descriptor submission request * @desc: descriptor pointer (kernel virtual)
Moves it into talitos.h so that it can be used from any place in talitos.c This will be required for next patch ("crypto: talitos - fix hash on SEC1") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- drivers/crypto/talitos.c | 30 ------------------------------ drivers/crypto/talitos.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-)