Commit d8cc3972 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - check the return value of platform_get_irq as signed int in xgene.

   - skip adf_dev_restore on virtual functions in qat.

   - fix double-free with backlogged requests in marvell_cesa"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: xgene - fix handling platform_get_irq
  crypto: qat - VF should never trigger SBR on PH
  crypto: marvell - properly handle CRYPTO_TFM_REQ_MAY_BACKLOG-flagged requests
parents c91d7072 09185e27
...@@ -344,11 +344,12 @@ static int xgene_rng_probe(struct platform_device *pdev) ...@@ -344,11 +344,12 @@ static int xgene_rng_probe(struct platform_device *pdev)
if (IS_ERR(ctx->csr_base)) if (IS_ERR(ctx->csr_base))
return PTR_ERR(ctx->csr_base); return PTR_ERR(ctx->csr_base);
ctx->irq = platform_get_irq(pdev, 0); rc = platform_get_irq(pdev, 0);
if (ctx->irq < 0) { if (rc < 0) {
dev_err(&pdev->dev, "No IRQ resource\n"); dev_err(&pdev->dev, "No IRQ resource\n");
return ctx->irq; return rc;
} }
ctx->irq = rc;
dev_dbg(&pdev->dev, "APM X-Gene RNG BASE %p ALARM IRQ %d", dev_dbg(&pdev->dev, "APM X-Gene RNG BASE %p ALARM IRQ %d",
ctx->csr_base, ctx->irq); ctx->csr_base, ctx->irq);
......
...@@ -687,6 +687,33 @@ static inline u32 mv_cesa_get_int_mask(struct mv_cesa_engine *engine) ...@@ -687,6 +687,33 @@ static inline u32 mv_cesa_get_int_mask(struct mv_cesa_engine *engine)
int mv_cesa_queue_req(struct crypto_async_request *req); int mv_cesa_queue_req(struct crypto_async_request *req);
/*
* Helper function that indicates whether a crypto request needs to be
* cleaned up or not after being enqueued using mv_cesa_queue_req().
*/
static inline int mv_cesa_req_needs_cleanup(struct crypto_async_request *req,
int ret)
{
/*
* The queue still had some space, the request was queued
* normally, so there's no need to clean it up.
*/
if (ret == -EINPROGRESS)
return false;
/*
* The queue had not space left, but since the request is
* flagged with CRYPTO_TFM_REQ_MAY_BACKLOG, it was added to
* the backlog and will be processed later. There's no need to
* clean it up.
*/
if (ret == -EBUSY && req->flags & CRYPTO_TFM_REQ_MAY_BACKLOG)
return false;
/* Request wasn't queued, we need to clean it up */
return true;
}
/* TDMA functions */ /* TDMA functions */
static inline void mv_cesa_req_dma_iter_init(struct mv_cesa_dma_iter *iter, static inline void mv_cesa_req_dma_iter_init(struct mv_cesa_dma_iter *iter,
......
...@@ -189,7 +189,6 @@ static inline void mv_cesa_ablkcipher_prepare(struct crypto_async_request *req, ...@@ -189,7 +189,6 @@ static inline void mv_cesa_ablkcipher_prepare(struct crypto_async_request *req,
{ {
struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req); struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);
struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq); struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq);
creq->req.base.engine = engine; creq->req.base.engine = engine;
if (creq->req.base.type == CESA_DMA_REQ) if (creq->req.base.type == CESA_DMA_REQ)
...@@ -431,7 +430,7 @@ static int mv_cesa_des_op(struct ablkcipher_request *req, ...@@ -431,7 +430,7 @@ static int mv_cesa_des_op(struct ablkcipher_request *req,
return ret; return ret;
ret = mv_cesa_queue_req(&req->base); ret = mv_cesa_queue_req(&req->base);
if (ret && ret != -EINPROGRESS) if (mv_cesa_req_needs_cleanup(&req->base, ret))
mv_cesa_ablkcipher_cleanup(req); mv_cesa_ablkcipher_cleanup(req);
return ret; return ret;
...@@ -551,7 +550,7 @@ static int mv_cesa_des3_op(struct ablkcipher_request *req, ...@@ -551,7 +550,7 @@ static int mv_cesa_des3_op(struct ablkcipher_request *req,
return ret; return ret;
ret = mv_cesa_queue_req(&req->base); ret = mv_cesa_queue_req(&req->base);
if (ret && ret != -EINPROGRESS) if (mv_cesa_req_needs_cleanup(&req->base, ret))
mv_cesa_ablkcipher_cleanup(req); mv_cesa_ablkcipher_cleanup(req);
return ret; return ret;
...@@ -693,7 +692,7 @@ static int mv_cesa_aes_op(struct ablkcipher_request *req, ...@@ -693,7 +692,7 @@ static int mv_cesa_aes_op(struct ablkcipher_request *req,
return ret; return ret;
ret = mv_cesa_queue_req(&req->base); ret = mv_cesa_queue_req(&req->base);
if (ret && ret != -EINPROGRESS) if (mv_cesa_req_needs_cleanup(&req->base, ret))
mv_cesa_ablkcipher_cleanup(req); mv_cesa_ablkcipher_cleanup(req);
return ret; return ret;
......
...@@ -739,10 +739,8 @@ static int mv_cesa_ahash_update(struct ahash_request *req) ...@@ -739,10 +739,8 @@ static int mv_cesa_ahash_update(struct ahash_request *req)
return 0; return 0;
ret = mv_cesa_queue_req(&req->base); ret = mv_cesa_queue_req(&req->base);
if (ret && ret != -EINPROGRESS) { if (mv_cesa_req_needs_cleanup(&req->base, ret))
mv_cesa_ahash_cleanup(req); mv_cesa_ahash_cleanup(req);
return ret;
}
return ret; return ret;
} }
...@@ -766,7 +764,7 @@ static int mv_cesa_ahash_final(struct ahash_request *req) ...@@ -766,7 +764,7 @@ static int mv_cesa_ahash_final(struct ahash_request *req)
return 0; return 0;
ret = mv_cesa_queue_req(&req->base); ret = mv_cesa_queue_req(&req->base);
if (ret && ret != -EINPROGRESS) if (mv_cesa_req_needs_cleanup(&req->base, ret))
mv_cesa_ahash_cleanup(req); mv_cesa_ahash_cleanup(req);
return ret; return ret;
...@@ -791,7 +789,7 @@ static int mv_cesa_ahash_finup(struct ahash_request *req) ...@@ -791,7 +789,7 @@ static int mv_cesa_ahash_finup(struct ahash_request *req)
return 0; return 0;
ret = mv_cesa_queue_req(&req->base); ret = mv_cesa_queue_req(&req->base);
if (ret && ret != -EINPROGRESS) if (mv_cesa_req_needs_cleanup(&req->base, ret))
mv_cesa_ahash_cleanup(req); mv_cesa_ahash_cleanup(req);
return ret; return ret;
......
...@@ -88,6 +88,9 @@ static void adf_dev_restore(struct adf_accel_dev *accel_dev) ...@@ -88,6 +88,9 @@ static void adf_dev_restore(struct adf_accel_dev *accel_dev)
struct pci_dev *parent = pdev->bus->self; struct pci_dev *parent = pdev->bus->self;
uint16_t bridge_ctl = 0; uint16_t bridge_ctl = 0;
if (accel_dev->is_vf)
return;
dev_info(&GET_DEV(accel_dev), "Resetting device qat_dev%d\n", dev_info(&GET_DEV(accel_dev), "Resetting device qat_dev%d\n",
accel_dev->accel_id); accel_dev->accel_id);
......
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