| Message ID | 1463563285-11742-3-git-send-email-clabbe.montjoie@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Herbert Xu |
| Headers | show |
On 18 May 2016 at 17:21, LABBE Corentin <clabbe.montjoie@gmail.com> wrote: > Since the crypto engine has been converted to use crypto_async_request > instead of ablkcipher_request, minor changes are needed to use it. I think you missed the conversion for omap des driver, please rebase your patch. Beyond that I think you did a good job for crypto engine if Herbert applied it. > > Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> > --- > drivers/crypto/omap-aes.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c > index d420ec7..1368ab1 100644 > --- a/drivers/crypto/omap-aes.c > +++ b/drivers/crypto/omap-aes.c > @@ -530,7 +530,7 @@ static void omap_aes_finish_req(struct omap_aes_dev *dd, int err) > > pr_debug("err: %d\n", err); > > - crypto_finalize_request(dd->engine, req, err); > + crypto_finalize_request(dd->engine, &req->base, err); > } > > static int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd) > @@ -603,14 +603,15 @@ static int omap_aes_handle_queue(struct omap_aes_dev *dd, > struct ablkcipher_request *req) > { > if (req) > - return crypto_transfer_request_to_engine(dd->engine, req); > + return crypto_transfer_request_to_engine(dd->engine, &req->base); > > return 0; > } > > static int omap_aes_prepare_req(struct crypto_engine *engine, > - struct ablkcipher_request *req) > + struct crypto_async_request *areq) > { > + struct ablkcipher_request *req = ablkcipher_request_cast(areq); > struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx( > crypto_ablkcipher_reqtfm(req)); > struct omap_aes_dev *dd = omap_aes_find_dev(ctx); > @@ -653,8 +654,9 @@ static int omap_aes_prepare_req(struct crypto_engine *engine, > } > > static int omap_aes_crypt_req(struct crypto_engine *engine, > - struct ablkcipher_request *req) > + struct crypto_async_request *areq) > { > + struct ablkcipher_request *req = ablkcipher_request_cast(areq); > struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx( > crypto_ablkcipher_reqtfm(req)); > struct omap_aes_dev *dd = omap_aes_find_dev(ctx); > -- > 2.7.3 >
On Mon, May 30, 2016 at 10:20:01AM +0800, Baolin Wang wrote: > On 18 May 2016 at 17:21, LABBE Corentin <clabbe.montjoie@gmail.com> wrote: > > Since the crypto engine has been converted to use crypto_async_request > > instead of ablkcipher_request, minor changes are needed to use it. > > I think you missed the conversion for omap des driver, please rebase > your patch. Beyond that I think you did a good job for crypto engine > if Herbert applied it. > Thanks I have just rebased it and added omap-des to the list of changes. Regards -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index d420ec7..1368ab1 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -530,7 +530,7 @@ static void omap_aes_finish_req(struct omap_aes_dev *dd, int err) pr_debug("err: %d\n", err); - crypto_finalize_request(dd->engine, req, err); + crypto_finalize_request(dd->engine, &req->base, err); } static int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd) @@ -603,14 +603,15 @@ static int omap_aes_handle_queue(struct omap_aes_dev *dd, struct ablkcipher_request *req) { if (req) - return crypto_transfer_request_to_engine(dd->engine, req); + return crypto_transfer_request_to_engine(dd->engine, &req->base); return 0; } static int omap_aes_prepare_req(struct crypto_engine *engine, - struct ablkcipher_request *req) + struct crypto_async_request *areq) { + struct ablkcipher_request *req = ablkcipher_request_cast(areq); struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx( crypto_ablkcipher_reqtfm(req)); struct omap_aes_dev *dd = omap_aes_find_dev(ctx); @@ -653,8 +654,9 @@ static int omap_aes_prepare_req(struct crypto_engine *engine, } static int omap_aes_crypt_req(struct crypto_engine *engine, - struct ablkcipher_request *req) + struct crypto_async_request *areq) { + struct ablkcipher_request *req = ablkcipher_request_cast(areq); struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx( crypto_ablkcipher_reqtfm(req)); struct omap_aes_dev *dd = omap_aes_find_dev(ctx);
Since the crypto engine has been converted to use crypto_async_request instead of ablkcipher_request, minor changes are needed to use it. Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> --- drivers/crypto/omap-aes.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)