Commit 52107c54 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a bug in cavium/nitrox where the callback is invoked prior
  to the DMA unmap"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: cavium/nitrox - Invoke callback after DMA unmap
parents 44e56f32 356690d0
...@@ -537,6 +537,8 @@ static void process_response_list(struct nitrox_cmdq *cmdq) ...@@ -537,6 +537,8 @@ static void process_response_list(struct nitrox_cmdq *cmdq)
struct nitrox_device *ndev = cmdq->ndev; struct nitrox_device *ndev = cmdq->ndev;
struct nitrox_softreq *sr; struct nitrox_softreq *sr;
int req_completed = 0, err = 0, budget; int req_completed = 0, err = 0, budget;
completion_t callback;
void *cb_arg;
/* check all pending requests */ /* check all pending requests */
budget = atomic_read(&cmdq->pending_count); budget = atomic_read(&cmdq->pending_count);
...@@ -564,13 +566,13 @@ static void process_response_list(struct nitrox_cmdq *cmdq) ...@@ -564,13 +566,13 @@ static void process_response_list(struct nitrox_cmdq *cmdq)
smp_mb__after_atomic(); smp_mb__after_atomic();
/* remove from response list */ /* remove from response list */
response_list_del(sr, cmdq); response_list_del(sr, cmdq);
/* ORH error code */ /* ORH error code */
err = READ_ONCE(*sr->resp.orh) & 0xff; err = READ_ONCE(*sr->resp.orh) & 0xff;
callback = sr->callback;
if (sr->callback) cb_arg = sr->cb_arg;
sr->callback(sr->cb_arg, err);
softreq_destroy(sr); softreq_destroy(sr);
if (callback)
callback(cb_arg, err);
req_completed++; req_completed++;
} }
......
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