[dpdk-stable] [PATCH] drivers: fix build issue with DPAA2 drivers

[Shreyansh Jain]

Multiple issues have appeared in stable from patches ported back.
- logging introduced in a stable cc'd patch introduced macros
  not yet introduced in 18.02
- compilation issue with missing type definition

Fixes: f174f5ef6e72 ("crypto/dpaa2_sec: improve error handling")
Cc: sunil.kori at nxp.com
Fixes: 774e9ea91992 ("net/dpaa2: add support for multi seg buffers")
Cc: hemant.agrawal at nxp.com

Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
Signed-off-by: Shreyansh Jain <shreyansh.jain at nxp.com>
---
Note: Two drivers (crypto and net) are changed in this patch. Splitting
the patch for keeping the changes independent would not solve the
compilation issue - so, single patch across both driver types.

 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 ++++----
 drivers/net/dpaa2/dpaa2_rxtx.c              | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 699da0074..0602b88d8 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1720,7 +1720,7 @@ dpaa2_sec_auth_init(struct rte_cryptodev *dev,
 				   1, 0, &authdata, !session->dir,
 				   session->digest_length);
 	if (bufsize < 0) {
-		DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+		RTE_LOG(ERR, PMD, "Crypto: Invalid buffer length");
 		goto error_out;
 	}
 
@@ -1845,7 +1845,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
 				&aeaddata, session->iv.length,
 				session->digest_length);
 	if (bufsize < 0) {
-		DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+		RTE_LOG(ERR, PMD, "Crypto: Invalid buffer length");
 		goto error_out;
 	}
 
@@ -2071,7 +2071,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,
 					      session->digest_length,
 					      session->dir);
 		if (bufsize < 0) {
-			DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+			RTE_LOG(ERR, PMD, "Crypto: Invalid buffer length");
 			goto error_out;
 		}
 	} else {
@@ -2357,7 +2357,7 @@ dpaa2_sec_set_ipsec_session(struct rte_cryptodev *dev,
 		goto out;
 
 	if (bufsize < 0) {
-		DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+		RTE_LOG(ERR, PMD, "Crypto: Invalid buffer length");
 		goto out;
 	}
 
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index e37b08cb5..5a444657e 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -214,18 +214,17 @@ static inline struct rte_mbuf *__attribute__((hot))
 eth_sg_fd_to_mbuf(const struct qbman_fd *fd)
 {
 	struct qbman_sge *sgt, *sge;
-	dma_addr_t sg_addr;
+	size_t sg_addr, fd_addr;
 	int i = 0;
-	uint64_t fd_addr;
 	struct rte_mbuf *first_seg, *next_seg, *cur_seg, *temp;
 
-	fd_addr = (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd));
+	fd_addr = (size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd));
 
 	/* Get Scatter gather table address */
 	sgt = (struct qbman_sge *)(fd_addr + DPAA2_GET_FD_OFFSET(fd));
 
 	sge = &sgt[i++];
-	sg_addr = (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FLE_ADDR(sge));
+	sg_addr = (size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FLE_ADDR(sge));
 
 	/* First Scatter gather entry */
 	first_seg = DPAA2_INLINE_MBUF_FROM_BUF(sg_addr,
@@ -250,7 +249,7 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd)
 	cur_seg = first_seg;
 	while (!DPAA2_SG_IS_FINAL(sge)) {
 		sge = &sgt[i++];
-		sg_addr = (uint64_t)DPAA2_IOVA_TO_VADDR(
+		sg_addr = (size_t)DPAA2_IOVA_TO_VADDR(
 				DPAA2_GET_FLE_ADDR(sge));
 		next_seg = DPAA2_INLINE_MBUF_FROM_BUF(sg_addr,
 			rte_dpaa2_bpid_info[DPAA2_GET_FLE_BPID(sge)].meta_data_size);
-- 
2.17.0