From: Hemant Agrawal <hemant.agrawal@nxp.com>
To: dev@dpdk.org
Cc: pablo.de.lara.guarch@intel.com, akhil.goyal@nxp.com
Subject: [PATCH v2 8/8] crypto/dpaa2_sec: fix OP storage for physical IOVA mode
Date: Mon, 2 Apr 2018 13:06:34 +0530 [thread overview]
Message-ID: <1522654594-2757-8-git-send-email-hemant.agrawal@nxp.com> (raw)
In-Reply-To: <1522654594-2757-1-git-send-email-hemant.agrawal@nxp.com>
op storage in fle is just for reference for post dq.
So, don't convert it to iova mode.
Fixes: 37f96eb01bce ("crypto/dpaa2_sec: support scatter gather")
Cc: stable@dpdk.org
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 2 --
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 16 ++++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index 4a19d42..ac72049 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -305,7 +305,6 @@ static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr)
*/
#define DPAA2_MBUF_VADDR_TO_IOVA(mbuf) ((mbuf)->buf_iova)
-#define DPAA2_OP_VADDR_TO_IOVA(op) (op->phys_addr)
/**
* macro to convert Virtual address to IOVA
@@ -326,7 +325,6 @@ static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr)
#else /* RTE_LIBRTE_DPAA2_USE_PHYS_IOVA */
#define DPAA2_MBUF_VADDR_TO_IOVA(mbuf) ((mbuf)->buf_addr)
-#define DPAA2_OP_VADDR_TO_IOVA(op) (op)
#define DPAA2_VADDR_TO_IOVA(_vaddr) (_vaddr)
#define DPAA2_IOVA_TO_VADDR(_iova) (_iova)
#define DPAA2_MODIFY_IOVA_TO_VADDR(_mem, _type)
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 9a74845..50a301d 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -117,7 +117,7 @@ build_authenc_gcm_sg_fd(dpaa2_sec_session *sess,
return -1;
}
memset(fle, 0, FLE_SG_MEM_SIZE);
- DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op));
+ DPAA2_SET_FLE_ADDR(fle, op);
DPAA2_FLE_SAVE_CTXT(fle, (size_t)priv);
op_fle = fle + 1;
@@ -268,7 +268,7 @@ build_authenc_gcm_fd(dpaa2_sec_session *sess,
return -1;
}
memset(fle, 0, FLE_POOL_BUF_SIZE);
- DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op));
+ DPAA2_SET_FLE_ADDR(fle, op);
DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv);
fle = fle + 1;
sge = fle + 2;
@@ -413,7 +413,7 @@ build_authenc_sg_fd(dpaa2_sec_session *sess,
return -1;
}
memset(fle, 0, FLE_SG_MEM_SIZE);
- DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op));
+ DPAA2_SET_FLE_ADDR(fle, op);
DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv);
op_fle = fle + 1;
@@ -562,7 +562,7 @@ build_authenc_fd(dpaa2_sec_session *sess,
return -1;
}
memset(fle, 0, FLE_POOL_BUF_SIZE);
- DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op));
+ DPAA2_SET_FLE_ADDR(fle, op);
DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv);
fle = fle + 1;
sge = fle + 2;
@@ -691,7 +691,7 @@ static inline int build_auth_sg_fd(
}
memset(fle, 0, FLE_SG_MEM_SIZE);
/* first FLE entry used to store mbuf and session ctxt */
- DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op));
+ DPAA2_SET_FLE_ADDR(fle, op);
DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv);
op_fle = fle + 1;
ip_fle = fle + 2;
@@ -772,7 +772,7 @@ build_auth_fd(dpaa2_sec_session *sess, struct rte_crypto_op *op,
* to get the MBUF Addr from the previous FLE.
* We can have a better approach to use the inline Mbuf
*/
- DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op));
+ DPAA2_SET_FLE_ADDR(fle, op);
DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv);
fle = fle + 1;
@@ -864,7 +864,7 @@ build_cipher_sg_fd(dpaa2_sec_session *sess, struct rte_crypto_op *op,
}
memset(fle, 0, FLE_SG_MEM_SIZE);
/* first FLE entry used to store mbuf and session ctxt */
- DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op));
+ DPAA2_SET_FLE_ADDR(fle, op);
DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv);
op_fle = fle + 1;
@@ -986,7 +986,7 @@ build_cipher_fd(dpaa2_sec_session *sess, struct rte_crypto_op *op,
* to get the MBUF Addr from the previous FLE.
* We can have a better approach to use the inline Mbuf
*/
- DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op));
+ DPAA2_SET_FLE_ADDR(fle, op);
DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv);
fle = fle + 1;
sge = fle + 2;
--
2.7.4
next prev parent reply other threads:[~2018-04-02 7:38 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 12:00 [PATCH 1/7] test/crypto: add macro for dpaa sec device name Hemant Agrawal
2018-03-27 12:00 ` [PATCH 2/7] app/crypto-perf: fix excess crypto device error Hemant Agrawal
2018-03-30 16:01 ` De Lara Guarch, Pablo
2018-03-27 12:00 ` [PATCH 3/7] app/crypto-perf: enable it for non default mempool Hemant Agrawal
2018-03-30 16:02 ` De Lara Guarch, Pablo
2018-03-30 16:11 ` De Lara Guarch, Pablo
2018-03-27 12:00 ` [PATCH 4/7] crypto/dpaa_sec: add macro for device name Hemant Agrawal
2018-03-27 12:00 ` [PATCH 5/7] crypto/dpaa_sec: fix to check the portal presence Hemant Agrawal
2018-03-27 12:00 ` [PATCH 6/7] crypto/dpaa_sec: fix incorrect NULL check Hemant Agrawal
2018-03-27 12:00 ` [PATCH 7/7] crypto/dpaa_sec: move mempool allocation to config Hemant Agrawal
2018-03-30 16:01 ` [PATCH 1/7] test/crypto: add macro for dpaa sec device name De Lara Guarch, Pablo
2018-04-02 7:36 ` [PATCH v2 1/8] " Hemant Agrawal
2018-04-02 7:36 ` [PATCH v2 2/8] app/crypto-perf: fix excess crypto device error Hemant Agrawal
2018-04-02 7:36 ` [PATCH v2 3/8] app/crypto-perf: enable it for non default mempool Hemant Agrawal
2018-04-02 7:36 ` [PATCH v2 4/8] crypto/dpaa_sec: add macro for device name Hemant Agrawal
2018-04-02 7:36 ` [PATCH v2 5/8] crypto/dpaa_sec: fix to check the portal presence Hemant Agrawal
2018-04-02 7:36 ` [PATCH v2 6/8] crypto/dpaa_sec: fix incorrect NULL check Hemant Agrawal
2018-04-02 7:36 ` [PATCH v2 7/8] crypto/dpaa_sec: move mempool allocation to config Hemant Agrawal
2018-04-02 7:36 ` Hemant Agrawal [this message]
2018-04-02 13:35 ` [PATCH v2 8/8] crypto/dpaa2_sec: fix OP storage for physical IOVA mode De Lara Guarch, Pablo
2018-04-02 15:33 ` [PATCH] sec Hemant Agrawal
2018-04-02 15:33 ` [PATCH v3 1/8] test/crypto: add macro for dpaa sec device name Hemant Agrawal
2018-04-03 9:34 ` De Lara Guarch, Pablo
2018-04-02 15:33 ` [PATCH v3 2/8] app/crypto-perf: fix excess crypto device error Hemant Agrawal
2018-04-02 15:33 ` [PATCH v3 3/8] app/crypto-perf: enable it for non default mempool Hemant Agrawal
2018-04-02 15:33 ` [PATCH v3 4/8] crypto/dpaa_sec: add macro for device name Hemant Agrawal
2018-04-02 15:33 ` [PATCH v3 5/8] crypto/dpaa_sec: fix to check the portal presence Hemant Agrawal
2018-04-02 15:33 ` [PATCH v3 6/8] crypto/dpaa_sec: fix incorrect NULL check Hemant Agrawal
2018-04-02 15:33 ` [PATCH v3 7/8] crypto/dpaa_sec: move mempool allocation to config Hemant Agrawal
2018-04-02 15:33 ` [PATCH v3 8/8] crypto/dpaa2_sec: fix OP storage for physical IOVA mode Hemant Agrawal
2018-04-02 15:46 ` [PATCH] sec Hemant Agrawal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1522654594-2757-8-git-send-email-hemant.agrawal@nxp.com \
--to=hemant.agrawal@nxp.com \
--cc=akhil.goyal@nxp.com \
--cc=dev@dpdk.org \
--cc=pablo.de.lara.guarch@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.