From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabien DESSENNE Subject: Re: [PATCH 6/6] crypto: stm32-cryp: convert to the new crypto engine API Date: Wed, 10 Jan 2018 14:25:56 +0000 Message-ID: References: <20180103201109.16077-1-clabbe.montjoie@gmail.com> <20180103201109.16077-7-clabbe.montjoie@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Benjamin GAIGNARD , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "virtualization@lists.linux-foundation.org" , "linux-crypto@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" To: Corentin Labbe , Alexandre TORGUE , "arei.gonglei@huawei.com" , "corbet@lwn.net" , "davem@davemloft.net" , "herbert@gondor.apana.org.au" , "jasowang@redhat.com" , "mcoquelin.stm32@gmail.com" , "mst@redhat.com" Return-path: In-Reply-To: <20180103201109.16077-7-clabbe.montjoie@gmail.com> Content-Language: en-US Content-ID: <336B26E15A6D0B4A8A13F1D44097D5F2@st.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org List-Id: linux-crypto.vger.kernel.org On 03/01/18 21:11, Corentin Labbe wrote: > This patch convert the stm32-cryp driver to the new crypto engine API. > Signed-off-by: Corentin Labbe > --- > drivers/crypto/stm32/stm32-cryp.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/crypto/stm32/stm32-cryp.c b/drivers/crypto/stm32/stm32-cryp.c > index cf1dddbeaa2c..99e0473ef247 100644 > --- a/drivers/crypto/stm32/stm32-cryp.c > +++ b/drivers/crypto/stm32/stm32-cryp.c > @@ -91,6 +91,7 @@ > #define _walked_out (cryp->out_walk.offset - cryp->out_sg->offset) > > struct stm32_cryp_ctx { > + struct crypto_engine_reqctx enginectx; > struct stm32_cryp *cryp; > int keylen; > u32 key[AES_KEYSIZE_256 / sizeof(u32)]; > @@ -494,10 +495,20 @@ static int stm32_cryp_cpu_start(struct stm32_cryp *cryp) > return 0; > } > > +static int stm32_cryp_cipher_one_req(struct crypto_engine *engine, > + void *areq); Merge these 2 lines in a single one > +static int stm32_cryp_prepare_cipher_req(struct crypto_engine *engine, > + void *areq); > + > static int stm32_cryp_cra_init(struct crypto_tfm *tfm) > { > + struct stm32_cryp_ctx *ctx = crypto_tfm_ctx(tfm); > + > tfm->crt_ablkcipher.reqsize = sizeof(struct stm32_cryp_reqctx); > > + ctx->enginectx.op.do_one_request = stm32_cryp_cipher_one_req; > + ctx->enginectx.op.prepare_request = stm32_cryp_prepare_cipher_req; > + ctx->enginectx.op.unprepare_request = NULL; > return 0; > } > > @@ -695,14 +706,17 @@ static int stm32_cryp_prepare_req(struct crypto_engine *engine, > } > > static int stm32_cryp_prepare_cipher_req(struct crypto_engine *engine, > - struct ablkcipher_request *req) > + void *areq) > { > + struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base); > 80 characters (CHECKPATCH) > + > return stm32_cryp_prepare_req(engine, req); > } > > static int stm32_cryp_cipher_one_req(struct crypto_engine *engine, > - struct ablkcipher_request *req) > + void *areq) Merge these 2 lines in a single one > { > + struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base); > 80 characters (CHECKPATCH) > struct stm32_cryp_ctx *ctx = crypto_ablkcipher_ctx( > crypto_ablkcipher_reqtfm(req)); > struct stm32_cryp *cryp = ctx->cryp; > @@ -1104,9 +1118,6 @@ static int stm32_cryp_probe(struct platform_device *pdev) > goto err_engine1; > } > > - cryp->engine->prepare_cipher_request = stm32_cryp_prepare_cipher_req; > - cryp->engine->cipher_one_request = stm32_cryp_cipher_one_req; > - > ret = crypto_engine_start(cryp->engine); > if (ret) { > dev_err(dev, "Could not start crypto engine\n"); From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabien.dessenne@st.com (Fabien DESSENNE) Date: Wed, 10 Jan 2018 14:25:56 +0000 Subject: [PATCH 6/6] crypto: stm32-cryp: convert to the new crypto engine API In-Reply-To: <20180103201109.16077-7-clabbe.montjoie@gmail.com> References: <20180103201109.16077-1-clabbe.montjoie@gmail.com> <20180103201109.16077-7-clabbe.montjoie@gmail.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 03/01/18 21:11, Corentin Labbe wrote: > This patch convert the stm32-cryp driver to the new crypto engine API. > Signed-off-by: Corentin Labbe > --- > drivers/crypto/stm32/stm32-cryp.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/crypto/stm32/stm32-cryp.c b/drivers/crypto/stm32/stm32-cryp.c > index cf1dddbeaa2c..99e0473ef247 100644 > --- a/drivers/crypto/stm32/stm32-cryp.c > +++ b/drivers/crypto/stm32/stm32-cryp.c > @@ -91,6 +91,7 @@ > #define _walked_out (cryp->out_walk.offset - cryp->out_sg->offset) > > struct stm32_cryp_ctx { > + struct crypto_engine_reqctx enginectx; > struct stm32_cryp *cryp; > int keylen; > u32 key[AES_KEYSIZE_256 / sizeof(u32)]; > @@ -494,10 +495,20 @@ static int stm32_cryp_cpu_start(struct stm32_cryp *cryp) > return 0; > } > > +static int stm32_cryp_cipher_one_req(struct crypto_engine *engine, > + void *areq); Merge these 2 lines in a single one > +static int stm32_cryp_prepare_cipher_req(struct crypto_engine *engine, > + void *areq); > + > static int stm32_cryp_cra_init(struct crypto_tfm *tfm) > { > + struct stm32_cryp_ctx *ctx = crypto_tfm_ctx(tfm); > + > tfm->crt_ablkcipher.reqsize = sizeof(struct stm32_cryp_reqctx); > > + ctx->enginectx.op.do_one_request = stm32_cryp_cipher_one_req; > + ctx->enginectx.op.prepare_request = stm32_cryp_prepare_cipher_req; > + ctx->enginectx.op.unprepare_request = NULL; > return 0; > } > > @@ -695,14 +706,17 @@ static int stm32_cryp_prepare_req(struct crypto_engine *engine, > } > > static int stm32_cryp_prepare_cipher_req(struct crypto_engine *engine, > - struct ablkcipher_request *req) > + void *areq) > { > + struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base); > 80 characters (CHECKPATCH) > + > return stm32_cryp_prepare_req(engine, req); > } > > static int stm32_cryp_cipher_one_req(struct crypto_engine *engine, > - struct ablkcipher_request *req) > + void *areq) Merge these 2 lines in a single one > { > + struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base); > 80 characters (CHECKPATCH) > struct stm32_cryp_ctx *ctx = crypto_ablkcipher_ctx( > crypto_ablkcipher_reqtfm(req)); > struct stm32_cryp *cryp = ctx->cryp; > @@ -1104,9 +1118,6 @@ static int stm32_cryp_probe(struct platform_device *pdev) > goto err_engine1; > } > > - cryp->engine->prepare_cipher_request = stm32_cryp_prepare_cipher_req; > - cryp->engine->cipher_one_request = stm32_cryp_cipher_one_req; > - > ret = crypto_engine_start(cryp->engine); > if (ret) { > dev_err(dev, "Could not start crypto engine\n"); From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756109AbeAJO1O (ORCPT + 1 other); Wed, 10 Jan 2018 09:27:14 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:60250 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754838AbeAJO1K (ORCPT ); Wed, 10 Jan 2018 09:27:10 -0500 From: Fabien DESSENNE To: Corentin Labbe , Alexandre TORGUE , "arei.gonglei@huawei.com" , "corbet@lwn.net" , "davem@davemloft.net" , "herbert@gondor.apana.org.au" , "jasowang@redhat.com" , "mcoquelin.stm32@gmail.com" , "mst@redhat.com" CC: "linux-arm-kernel@lists.infradead.org" , "linux-crypto@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "virtualization@lists.linux-foundation.org" , Benjamin GAIGNARD Subject: Re: [PATCH 6/6] crypto: stm32-cryp: convert to the new crypto engine API Thread-Topic: [PATCH 6/6] crypto: stm32-cryp: convert to the new crypto engine API Thread-Index: AQHThM9SRdP63OsIiE+ewmRamm/SR6NtI3SA Date: Wed, 10 Jan 2018 14:25:56 +0000 Message-ID: References: <20180103201109.16077-1-clabbe.montjoie@gmail.com> <20180103201109.16077-7-clabbe.montjoie@gmail.com> In-Reply-To: <20180103201109.16077-7-clabbe.montjoie@gmail.com> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.75.127.51] Content-Type: text/plain; charset="utf-8" Content-ID: <336B26E15A6D0B4A8A13F1D44097D5F2@st.com> Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-01-10_07:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: DQoNCk9uIDAzLzAxLzE4IDIxOjExLCBDb3JlbnRpbiBMYWJiZSB3cm90ZToNCj4gVGhpcyBwYXRj aCBjb252ZXJ0IHRoZSBzdG0zMi1jcnlwIGRyaXZlciB0byB0aGUgbmV3IGNyeXB0byBlbmdpbmUg QVBJLg0KPiBTaWduZWQtb2ZmLWJ5OiBDb3JlbnRpbiBMYWJiZSA8Y2xhYmJlLm1vbnRqb2llQGdt YWlsLmNvbT4NCj4gLS0tDQo+ICAgZHJpdmVycy9jcnlwdG8vc3RtMzIvc3RtMzItY3J5cC5jIHwg MjEgKysrKysrKysrKysrKysrKy0tLS0tDQo+ICAgMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlv bnMoKyksIDUgZGVsZXRpb25zKC0pDQo+DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2NyeXB0by9z dG0zMi9zdG0zMi1jcnlwLmMgYi9kcml2ZXJzL2NyeXB0by9zdG0zMi9zdG0zMi1jcnlwLmMNCj4g aW5kZXggY2YxZGRkYmVhYTJjLi45OWUwNDczZWYyNDcgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMv Y3J5cHRvL3N0bTMyL3N0bTMyLWNyeXAuYw0KPiArKysgYi9kcml2ZXJzL2NyeXB0by9zdG0zMi9z dG0zMi1jcnlwLmMNCj4gQEAgLTkxLDYgKzkxLDcgQEANCj4gICAjZGVmaW5lIF93YWxrZWRfb3V0 ICAgICAgICAgICAgIChjcnlwLT5vdXRfd2Fsay5vZmZzZXQgLSBjcnlwLT5vdXRfc2ctPm9mZnNl dCkNCj4gICANCj4gICBzdHJ1Y3Qgc3RtMzJfY3J5cF9jdHggew0KPiArCXN0cnVjdCBjcnlwdG9f ZW5naW5lX3JlcWN0eCBlbmdpbmVjdHg7DQo+ICAgCXN0cnVjdCBzdG0zMl9jcnlwICAgICAgICpj cnlwOw0KPiAgIAlpbnQgICAgICAgICAgICAgICAgICAgICBrZXlsZW47DQo+ICAgCXUzMiAgICAg ICAgICAgICAgICAgICAgIGtleVtBRVNfS0VZU0laRV8yNTYgLyBzaXplb2YodTMyKV07DQo+IEBA IC00OTQsMTAgKzQ5NSwyMCBAQCBzdGF0aWMgaW50IHN0bTMyX2NyeXBfY3B1X3N0YXJ0KHN0cnVj dCBzdG0zMl9jcnlwICpjcnlwKQ0KPiAgIAlyZXR1cm4gMDsNCj4gICB9DQo+ICAgDQo+ICtzdGF0 aWMgaW50IHN0bTMyX2NyeXBfY2lwaGVyX29uZV9yZXEoc3RydWN0IGNyeXB0b19lbmdpbmUgKmVu Z2luZSwNCj4gKwkJCQkgICAgIHZvaWQgKmFyZXEpOw0KDQpNZXJnZSB0aGVzZSAyIGxpbmVzIGlu IGEgc2luZ2xlIG9uZQ0KDQo+ICtzdGF0aWMgaW50IHN0bTMyX2NyeXBfcHJlcGFyZV9jaXBoZXJf cmVxKHN0cnVjdCBjcnlwdG9fZW5naW5lICplbmdpbmUsDQo+ICsJCQkJCSB2b2lkICphcmVxKTsN Cj4gKw0KPiAgIHN0YXRpYyBpbnQgc3RtMzJfY3J5cF9jcmFfaW5pdChzdHJ1Y3QgY3J5cHRvX3Rm bSAqdGZtKQ0KPiAgIHsNCj4gKwlzdHJ1Y3Qgc3RtMzJfY3J5cF9jdHggKmN0eCA9IGNyeXB0b190 Zm1fY3R4KHRmbSk7DQo+ICsNCj4gICAJdGZtLT5jcnRfYWJsa2NpcGhlci5yZXFzaXplID0gc2l6 ZW9mKHN0cnVjdCBzdG0zMl9jcnlwX3JlcWN0eCk7DQo+ICAgDQo+ICsJY3R4LT5lbmdpbmVjdHgu b3AuZG9fb25lX3JlcXVlc3QgPSBzdG0zMl9jcnlwX2NpcGhlcl9vbmVfcmVxOw0KPiArCWN0eC0+ ZW5naW5lY3R4Lm9wLnByZXBhcmVfcmVxdWVzdCA9IHN0bTMyX2NyeXBfcHJlcGFyZV9jaXBoZXJf cmVxOw0KPiArCWN0eC0+ZW5naW5lY3R4Lm9wLnVucHJlcGFyZV9yZXF1ZXN0ID0gTlVMTDsNCj4g ICAJcmV0dXJuIDA7DQo+ICAgfQ0KPiAgIA0KPiBAQCAtNjk1LDE0ICs3MDYsMTcgQEAgc3RhdGlj IGludCBzdG0zMl9jcnlwX3ByZXBhcmVfcmVxKHN0cnVjdCBjcnlwdG9fZW5naW5lICplbmdpbmUs DQo+ICAgfQ0KPiAgIA0KPiAgIHN0YXRpYyBpbnQgc3RtMzJfY3J5cF9wcmVwYXJlX2NpcGhlcl9y ZXEoc3RydWN0IGNyeXB0b19lbmdpbmUgKmVuZ2luZSwNCj4gLQkJCQkJIHN0cnVjdCBhYmxrY2lw aGVyX3JlcXVlc3QgKnJlcSkNCj4gKwkJCQkJIHZvaWQgKmFyZXEpDQo+ICAgew0KPiArCXN0cnVj dCBhYmxrY2lwaGVyX3JlcXVlc3QgKnJlcSA9IGNvbnRhaW5lcl9vZihhcmVxLCBzdHJ1Y3QgYWJs a2NpcGhlcl9yZXF1ZXN0LCBiYXNlKTsNCg0KID4gODAgY2hhcmFjdGVycyAoQ0hFQ0tQQVRDSCkN Cg0KPiArDQo+ICAgCXJldHVybiBzdG0zMl9jcnlwX3ByZXBhcmVfcmVxKGVuZ2luZSwgcmVxKTsN Cj4gICB9DQo+ICAgDQo+ICAgc3RhdGljIGludCBzdG0zMl9jcnlwX2NpcGhlcl9vbmVfcmVxKHN0 cnVjdCBjcnlwdG9fZW5naW5lICplbmdpbmUsDQo+IC0JCQkJICAgICBzdHJ1Y3QgYWJsa2NpcGhl cl9yZXF1ZXN0ICpyZXEpDQo+ICsJCQkJICAgICB2b2lkICphcmVxKQ0KDQpNZXJnZSB0aGVzZSAy IGxpbmVzIGluIGEgc2luZ2xlIG9uZQ0KDQo+ICAgew0KPiArCXN0cnVjdCBhYmxrY2lwaGVyX3Jl cXVlc3QgKnJlcSA9IGNvbnRhaW5lcl9vZihhcmVxLCBzdHJ1Y3QgYWJsa2NpcGhlcl9yZXF1ZXN0 LCBiYXNlKTsNCg0KID4gODAgY2hhcmFjdGVycyAoQ0hFQ0tQQVRDSCkNCg0KPiAgIAlzdHJ1Y3Qg c3RtMzJfY3J5cF9jdHggKmN0eCA9IGNyeXB0b19hYmxrY2lwaGVyX2N0eCgNCj4gICAJCQljcnlw dG9fYWJsa2NpcGhlcl9yZXF0Zm0ocmVxKSk7DQo+ICAgCXN0cnVjdCBzdG0zMl9jcnlwICpjcnlw ID0gY3R4LT5jcnlwOw0KPiBAQCAtMTEwNCw5ICsxMTE4LDYgQEAgc3RhdGljIGludCBzdG0zMl9j cnlwX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpDQo+ICAgCQlnb3RvIGVycl9l bmdpbmUxOw0KPiAgIAl9DQo+ICAgDQo+IC0JY3J5cC0+ZW5naW5lLT5wcmVwYXJlX2NpcGhlcl9y ZXF1ZXN0ID0gc3RtMzJfY3J5cF9wcmVwYXJlX2NpcGhlcl9yZXE7DQo+IC0JY3J5cC0+ZW5naW5l LT5jaXBoZXJfb25lX3JlcXVlc3QgPSBzdG0zMl9jcnlwX2NpcGhlcl9vbmVfcmVxOw0KPiAtDQo+ ICAgCXJldCA9IGNyeXB0b19lbmdpbmVfc3RhcnQoY3J5cC0+ZW5naW5lKTsNCj4gICAJaWYgKHJl dCkgew0KPiAgIAkJZGV2X2VycihkZXYsICJDb3VsZCBub3Qgc3RhcnQgY3J5cHRvIGVuZ2luZVxu Iik7DQo=