Commit 18daae5b authored by Herbert Xu's avatar Herbert Xu

crypto: qce - Set DMA alignment explicitly

This driver has been implicitly relying on kmalloc alignment
to be sufficient for DMA.  This may no longer be the case with
upcoming arm64 changes.

This patch changes it to explicitly request DMA alignment from
the Crypto API.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d887dec1
...@@ -24,7 +24,7 @@ static void qce_aead_done(void *data) ...@@ -24,7 +24,7 @@ static void qce_aead_done(void *data)
{ {
struct crypto_async_request *async_req = data; struct crypto_async_request *async_req = data;
struct aead_request *req = aead_request_cast(async_req); struct aead_request *req = aead_request_cast(async_req);
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct qce_aead_ctx *ctx = crypto_tfm_ctx(async_req->tfm); struct qce_aead_ctx *ctx = crypto_tfm_ctx(async_req->tfm);
struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req)); struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req));
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
...@@ -92,7 +92,7 @@ static void qce_aead_done(void *data) ...@@ -92,7 +92,7 @@ static void qce_aead_done(void *data)
static struct scatterlist * static struct scatterlist *
qce_aead_prepare_result_buf(struct sg_table *tbl, struct aead_request *req) qce_aead_prepare_result_buf(struct sg_table *tbl, struct aead_request *req)
{ {
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req)); struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req));
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
...@@ -103,7 +103,7 @@ qce_aead_prepare_result_buf(struct sg_table *tbl, struct aead_request *req) ...@@ -103,7 +103,7 @@ qce_aead_prepare_result_buf(struct sg_table *tbl, struct aead_request *req)
static struct scatterlist * static struct scatterlist *
qce_aead_prepare_ccm_result_buf(struct sg_table *tbl, struct aead_request *req) qce_aead_prepare_ccm_result_buf(struct sg_table *tbl, struct aead_request *req)
{ {
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
sg_init_one(&rctx->result_sg, rctx->ccmresult_buf, QCE_BAM_BURST_SIZE); sg_init_one(&rctx->result_sg, rctx->ccmresult_buf, QCE_BAM_BURST_SIZE);
return qce_sgtable_add(tbl, &rctx->result_sg, QCE_BAM_BURST_SIZE); return qce_sgtable_add(tbl, &rctx->result_sg, QCE_BAM_BURST_SIZE);
...@@ -112,7 +112,7 @@ qce_aead_prepare_ccm_result_buf(struct sg_table *tbl, struct aead_request *req) ...@@ -112,7 +112,7 @@ qce_aead_prepare_ccm_result_buf(struct sg_table *tbl, struct aead_request *req)
static struct scatterlist * static struct scatterlist *
qce_aead_prepare_dst_buf(struct aead_request *req) qce_aead_prepare_dst_buf(struct aead_request *req)
{ {
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req)); struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req));
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
struct scatterlist *sg, *msg_sg, __sg[2]; struct scatterlist *sg, *msg_sg, __sg[2];
...@@ -186,7 +186,7 @@ qce_aead_ccm_prepare_buf_assoclen(struct aead_request *req) ...@@ -186,7 +186,7 @@ qce_aead_ccm_prepare_buf_assoclen(struct aead_request *req)
{ {
struct scatterlist *sg, *msg_sg, __sg[2]; struct scatterlist *sg, *msg_sg, __sg[2];
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct qce_aead_ctx *ctx = crypto_aead_ctx(tfm); struct qce_aead_ctx *ctx = crypto_aead_ctx(tfm);
unsigned int assoclen = rctx->assoclen; unsigned int assoclen = rctx->assoclen;
unsigned int adata_header_len, cryptlen, totallen; unsigned int adata_header_len, cryptlen, totallen;
...@@ -300,7 +300,7 @@ qce_aead_ccm_prepare_buf_assoclen(struct aead_request *req) ...@@ -300,7 +300,7 @@ qce_aead_ccm_prepare_buf_assoclen(struct aead_request *req)
static int qce_aead_prepare_buf(struct aead_request *req) static int qce_aead_prepare_buf(struct aead_request *req)
{ {
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req)); struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req));
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
struct scatterlist *sg; struct scatterlist *sg;
...@@ -328,7 +328,7 @@ static int qce_aead_prepare_buf(struct aead_request *req) ...@@ -328,7 +328,7 @@ static int qce_aead_prepare_buf(struct aead_request *req)
static int qce_aead_ccm_prepare_buf(struct aead_request *req) static int qce_aead_ccm_prepare_buf(struct aead_request *req)
{ {
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct qce_aead_ctx *ctx = crypto_aead_ctx(tfm); struct qce_aead_ctx *ctx = crypto_aead_ctx(tfm);
struct scatterlist *sg; struct scatterlist *sg;
...@@ -408,7 +408,7 @@ static int ...@@ -408,7 +408,7 @@ static int
qce_aead_async_req_handle(struct crypto_async_request *async_req) qce_aead_async_req_handle(struct crypto_async_request *async_req)
{ {
struct aead_request *req = aead_request_cast(async_req); struct aead_request *req = aead_request_cast(async_req);
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct qce_aead_ctx *ctx = crypto_tfm_ctx(async_req->tfm); struct qce_aead_ctx *ctx = crypto_tfm_ctx(async_req->tfm);
struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req)); struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req));
...@@ -502,7 +502,7 @@ qce_aead_async_req_handle(struct crypto_async_request *async_req) ...@@ -502,7 +502,7 @@ qce_aead_async_req_handle(struct crypto_async_request *async_req)
static int qce_aead_crypt(struct aead_request *req, int encrypt) static int qce_aead_crypt(struct aead_request *req, int encrypt)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct qce_aead_ctx *ctx = crypto_aead_ctx(tfm); struct qce_aead_ctx *ctx = crypto_aead_ctx(tfm);
struct qce_alg_template *tmpl = to_aead_tmpl(tfm); struct qce_alg_template *tmpl = to_aead_tmpl(tfm);
unsigned int blocksize = crypto_aead_blocksize(tfm); unsigned int blocksize = crypto_aead_blocksize(tfm);
...@@ -675,8 +675,8 @@ static int qce_aead_init(struct crypto_aead *tfm) ...@@ -675,8 +675,8 @@ static int qce_aead_init(struct crypto_aead *tfm)
if (IS_ERR(ctx->fallback)) if (IS_ERR(ctx->fallback))
return PTR_ERR(ctx->fallback); return PTR_ERR(ctx->fallback);
crypto_aead_set_reqsize(tfm, sizeof(struct qce_aead_reqctx) + crypto_aead_set_reqsize_dma(tfm, sizeof(struct qce_aead_reqctx) +
crypto_aead_reqsize(ctx->fallback)); crypto_aead_reqsize(ctx->fallback));
return 0; return 0;
} }
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*/ */
#include <crypto/internal/hash.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -147,7 +148,7 @@ static int qce_setup_regs_ahash(struct crypto_async_request *async_req) ...@@ -147,7 +148,7 @@ static int qce_setup_regs_ahash(struct crypto_async_request *async_req)
{ {
struct ahash_request *req = ahash_request_cast(async_req); struct ahash_request *req = ahash_request_cast(async_req);
struct crypto_ahash *ahash = __crypto_ahash_cast(async_req->tfm); struct crypto_ahash *ahash = __crypto_ahash_cast(async_req->tfm);
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_ahash_tmpl(async_req->tfm); struct qce_alg_template *tmpl = to_ahash_tmpl(async_req->tfm);
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
unsigned int digestsize = crypto_ahash_digestsize(ahash); unsigned int digestsize = crypto_ahash_digestsize(ahash);
...@@ -419,7 +420,7 @@ static unsigned int qce_be32_to_cpu_array(u32 *dst, const u8 *src, unsigned int ...@@ -419,7 +420,7 @@ static unsigned int qce_be32_to_cpu_array(u32 *dst, const u8 *src, unsigned int
static int qce_setup_regs_aead(struct crypto_async_request *async_req) static int qce_setup_regs_aead(struct crypto_async_request *async_req)
{ {
struct aead_request *req = aead_request_cast(async_req); struct aead_request *req = aead_request_cast(async_req);
struct qce_aead_reqctx *rctx = aead_request_ctx(req); struct qce_aead_reqctx *rctx = aead_request_ctx_dma(req);
struct qce_aead_ctx *ctx = crypto_tfm_ctx(async_req->tfm); struct qce_aead_ctx *ctx = crypto_tfm_ctx(async_req->tfm);
struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req)); struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req));
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
......
...@@ -38,7 +38,7 @@ static void qce_ahash_done(void *data) ...@@ -38,7 +38,7 @@ static void qce_ahash_done(void *data)
struct crypto_async_request *async_req = data; struct crypto_async_request *async_req = data;
struct ahash_request *req = ahash_request_cast(async_req); struct ahash_request *req = ahash_request_cast(async_req);
struct crypto_ahash *ahash = crypto_ahash_reqtfm(req); struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_ahash_tmpl(async_req->tfm); struct qce_alg_template *tmpl = to_ahash_tmpl(async_req->tfm);
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
struct qce_result_dump *result = qce->dma.result_buf; struct qce_result_dump *result = qce->dma.result_buf;
...@@ -75,7 +75,7 @@ static void qce_ahash_done(void *data) ...@@ -75,7 +75,7 @@ static void qce_ahash_done(void *data)
static int qce_ahash_async_req_handle(struct crypto_async_request *async_req) static int qce_ahash_async_req_handle(struct crypto_async_request *async_req)
{ {
struct ahash_request *req = ahash_request_cast(async_req); struct ahash_request *req = ahash_request_cast(async_req);
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
struct qce_sha_ctx *ctx = crypto_tfm_ctx(async_req->tfm); struct qce_sha_ctx *ctx = crypto_tfm_ctx(async_req->tfm);
struct qce_alg_template *tmpl = to_ahash_tmpl(async_req->tfm); struct qce_alg_template *tmpl = to_ahash_tmpl(async_req->tfm);
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
...@@ -132,7 +132,7 @@ static int qce_ahash_async_req_handle(struct crypto_async_request *async_req) ...@@ -132,7 +132,7 @@ static int qce_ahash_async_req_handle(struct crypto_async_request *async_req)
static int qce_ahash_init(struct ahash_request *req) static int qce_ahash_init(struct ahash_request *req)
{ {
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_ahash_tmpl(req->base.tfm); struct qce_alg_template *tmpl = to_ahash_tmpl(req->base.tfm);
const u32 *std_iv = tmpl->std_iv; const u32 *std_iv = tmpl->std_iv;
...@@ -147,7 +147,7 @@ static int qce_ahash_init(struct ahash_request *req) ...@@ -147,7 +147,7 @@ static int qce_ahash_init(struct ahash_request *req)
static int qce_ahash_export(struct ahash_request *req, void *out) static int qce_ahash_export(struct ahash_request *req, void *out)
{ {
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
struct qce_sha_saved_state *export_state = out; struct qce_sha_saved_state *export_state = out;
memcpy(export_state->pending_buf, rctx->buf, rctx->buflen); memcpy(export_state->pending_buf, rctx->buf, rctx->buflen);
...@@ -164,7 +164,7 @@ static int qce_ahash_export(struct ahash_request *req, void *out) ...@@ -164,7 +164,7 @@ static int qce_ahash_export(struct ahash_request *req, void *out)
static int qce_ahash_import(struct ahash_request *req, const void *in) static int qce_ahash_import(struct ahash_request *req, const void *in)
{ {
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
const struct qce_sha_saved_state *import_state = in; const struct qce_sha_saved_state *import_state = in;
memset(rctx, 0, sizeof(*rctx)); memset(rctx, 0, sizeof(*rctx));
...@@ -183,7 +183,7 @@ static int qce_ahash_import(struct ahash_request *req, const void *in) ...@@ -183,7 +183,7 @@ static int qce_ahash_import(struct ahash_request *req, const void *in)
static int qce_ahash_update(struct ahash_request *req) static int qce_ahash_update(struct ahash_request *req)
{ {
struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_ahash_tmpl(req->base.tfm); struct qce_alg_template *tmpl = to_ahash_tmpl(req->base.tfm);
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
struct scatterlist *sg_last, *sg; struct scatterlist *sg_last, *sg;
...@@ -275,7 +275,7 @@ static int qce_ahash_update(struct ahash_request *req) ...@@ -275,7 +275,7 @@ static int qce_ahash_update(struct ahash_request *req)
static int qce_ahash_final(struct ahash_request *req) static int qce_ahash_final(struct ahash_request *req)
{ {
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_ahash_tmpl(req->base.tfm); struct qce_alg_template *tmpl = to_ahash_tmpl(req->base.tfm);
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
...@@ -302,7 +302,7 @@ static int qce_ahash_final(struct ahash_request *req) ...@@ -302,7 +302,7 @@ static int qce_ahash_final(struct ahash_request *req)
static int qce_ahash_digest(struct ahash_request *req) static int qce_ahash_digest(struct ahash_request *req)
{ {
struct qce_sha_reqctx *rctx = ahash_request_ctx(req); struct qce_sha_reqctx *rctx = ahash_request_ctx_dma(req);
struct qce_alg_template *tmpl = to_ahash_tmpl(req->base.tfm); struct qce_alg_template *tmpl = to_ahash_tmpl(req->base.tfm);
struct qce_device *qce = tmpl->qce; struct qce_device *qce = tmpl->qce;
int ret; int ret;
...@@ -395,7 +395,7 @@ static int qce_ahash_cra_init(struct crypto_tfm *tfm) ...@@ -395,7 +395,7 @@ static int qce_ahash_cra_init(struct crypto_tfm *tfm)
struct crypto_ahash *ahash = __crypto_ahash_cast(tfm); struct crypto_ahash *ahash = __crypto_ahash_cast(tfm);
struct qce_sha_ctx *ctx = crypto_tfm_ctx(tfm); struct qce_sha_ctx *ctx = crypto_tfm_ctx(tfm);
crypto_ahash_set_reqsize(ahash, sizeof(struct qce_sha_reqctx)); crypto_ahash_set_reqsize_dma(ahash, sizeof(struct qce_sha_reqctx));
memset(ctx, 0, sizeof(*ctx)); memset(ctx, 0, sizeof(*ctx));
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment