diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-02 12:21:18 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-02 12:21:18 -0400 |
| commit | c27b17d0c1f0b850c87a8359df3e6761052cc484 (patch) | |
| tree | aa1f811c3f273b6d5c530d79762197b692e8ec97 | |
| parent | 3e76429c6b2c04a2e7f2dfbb473ca75527a5cf8f (diff) | |
| download | longterm-queue-4.8-c27b17d0c1f0b850c87a8359df3e6761052cc484.tar.gz | |
crypto: basic refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/crypto-ccp-Assign-DMA-commands-to-the-channel-s-CCP.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/queue/crypto-ccp-Assign-DMA-commands-to-the-channel-s-CCP.patch b/queue/crypto-ccp-Assign-DMA-commands-to-the-channel-s-CCP.patch index e994533..86cddee 100644 --- a/queue/crypto-ccp-Assign-DMA-commands-to-the-channel-s-CCP.patch +++ b/queue/crypto-ccp-Assign-DMA-commands-to-the-channel-s-CCP.patch @@ -1,4 +1,4 @@ -From 7c468447f40645fbf2a033dfdaa92b1957130d50 Mon Sep 17 00:00:00 2001 +From ee2d404263c81e420a304b6db72b345be214c498 Mon Sep 17 00:00:00 2001 From: Gary R Hook <ghook@amd.com> Date: Fri, 10 Mar 2017 12:28:18 -0600 Subject: [PATCH] crypto: ccp - Assign DMA commands to the channel's CCP @@ -23,10 +23,10 @@ Signed-off-by: Gary R Hook <gary.hook@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> diff --git a/drivers/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c -index 511ab042b5e7..92d1c6959f08 100644 +index 87b9f2bfa623..87a153ec577f 100644 --- a/drivers/crypto/ccp/ccp-dev.c +++ b/drivers/crypto/ccp/ccp-dev.c -@@ -283,11 +283,14 @@ EXPORT_SYMBOL_GPL(ccp_version); +@@ -206,11 +206,14 @@ EXPORT_SYMBOL_GPL(ccp_version); */ int ccp_enqueue_cmd(struct ccp_cmd *cmd) { @@ -43,10 +43,10 @@ index 511ab042b5e7..92d1c6959f08 100644 return -ENODEV; diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c -index e5d9278f4019..8d0eeb46d4a2 100644 +index bbdacad5efdd..56b8aeb6b7ec 100644 --- a/drivers/crypto/ccp/ccp-dmaengine.c +++ b/drivers/crypto/ccp/ccp-dmaengine.c -@@ -390,6 +390,7 @@ static struct ccp_dma_desc *ccp_create_desc(struct dma_chan *dma_chan, +@@ -392,6 +392,7 @@ static struct ccp_dma_desc *ccp_create_desc(struct dma_chan *dma_chan, goto err; ccp_cmd = &cmd->ccp_cmd; @@ -55,11 +55,11 @@ index e5d9278f4019..8d0eeb46d4a2 100644 ccp_cmd->flags = CCP_CMD_MAY_BACKLOG; ccp_cmd->flags |= CCP_CMD_PASSTHRU_NO_DMA_MAP; diff --git a/include/linux/ccp.h b/include/linux/ccp.h -index c71dd8fa5764..c41b8d99dd0e 100644 +index 7c2bb27c067c..9e5e4893569e 100644 --- a/include/linux/ccp.h +++ b/include/linux/ccp.h -@@ -556,7 +556,7 @@ enum ccp_engine { - * struct ccp_cmd - CCP operation request +@@ -559,7 +559,7 @@ enum ccp_engine { + * struct ccp_cmd - CPP operation request * @entry: list element (ccp driver use only) * @work: work element used for callbacks (ccp driver use only) - * @ccp: CCP device to be run on (ccp driver use only) |