From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <luca.boccassi@gmail.com>
Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66])
by dpdk.org (Postfix) with ESMTP id C7D86F64
for <stable@dpdk.org>; Mon, 30 Apr 2018 16:44:17 +0200 (CEST)
Received: by mail-wm0-f66.google.com with SMTP id t11so13646725wmt.0
for <stable@dpdk.org>; Mon, 30 Apr 2018 07:44:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=p66imyDITM5v+LnXczwp9pYkAkXrOfIHa+DR+XAPDmI=;
b=NtKttN4j1K/GVFU8xvdeZqQGgrFg8k4bVDdap+tRdaR7mrC44xLZToQDJvHBO1PGkv
BN5M1AxZJp0XgpjyD1oQk3/jaq8iAp4YyrEPi2yLxLuiwH+rXYfi9rZ9GxAJEv/1y+ur
cVbRKs016oW9GvBbYiy8gSfJQCM8hpre1bGScQn+PKRhAHHxOG4UcEOW5vBfEIoOSRDW
jh1jP4d1lzf2HFSYB9HoxQ8/EKO/aGWkS1GgiwWlRlPxknVzOs2tAv5JahAGBi/G9td4
eFIeDQ0tj09xcaZd1g0fpiSRPh2wJVLh1aopvT+l1clYnxAvbYbRe95RPtRaHe3UC+zA
ftpQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=p66imyDITM5v+LnXczwp9pYkAkXrOfIHa+DR+XAPDmI=;
b=r7YwiPnJjP3gLroSmLM/jDR4FxomIvRj1astVybvSAKBWQp6djKxUK/aFjWr/FgxZ1
ZNQ97vZVZVgHgiKFopMuEbrutt5CK0VGZQyjhzj0NQFhAw5daw/E15M8iZFvdDm6nUgZ
H+loyKV7uorLaWeAH/Pv6v73UgxY28YNd/iMIziFkkkW23XmrLGKGxzfAjd3R69cA+aW
gtklBb557IK2sAORGDkq3ryL8BGRHUrwYvqYFf44eF0KlQmIPeGD5WrXky8pnILqpn8j
/vnJvPSNefyJHIic3locfEk7VtiOfBW12cl8LhQ2WPBnPJwEvsGjdcgrG+A1ovgXkt7H
0pFw==
X-Gm-Message-State: ALQs6tB8yTj6JhXWWC/rh6J/Xg+AdFxvx+pmvJxo0KPthQI1G5RpiE5a
8YeB5UT0MTLVnDnGbafbmMQ=
X-Google-Smtp-Source: AB8JxZrpb48o7SB779AhSmnB0Vx6Tj0SUO7664Yg5Bdu2kZv/9phSINpYr4qX7qvEc4AI9R14iCuSA==
X-Received: by 10.28.180.8 with SMTP id d8mr7355619wmf.48.1525099457508;
Mon, 30 Apr 2018 07:44:17 -0700 (PDT)
Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb])
by smtp.gmail.com with ESMTPSA id b5-v6sm7751049wrf.40.2018.04.30.07.44.16
(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
Mon, 30 Apr 2018 07:44:16 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Hemant Agrawal <hemant.agrawal@nxp.com>
Cc: dpdk stable <stable@dpdk.org>
Date: Mon, 30 Apr 2018 15:41:25 +0100
Message-Id: <20180430144223.18657-70-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.14.2
In-Reply-To: <20180430144223.18657-1-luca.boccassi@gmail.com>
References: <20180430140606.4615-80-luca.boccassi@gmail.com>
<20180430144223.18657-1-luca.boccassi@gmail.com>
Subject: [dpdk-stable] patch 'crypto/dpaa2_sec: fix OP storage for physical
IOVA mode' has been queued to stable release 18.02.2
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2018 14:44:17 -0000
Hi,
FYI, your patch has been queued to stable release 18.02.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/02/18. So please
shout if anyone has objections.
Thanks.
Luca Boccassi
---
>>From 33caa7cb69658351af4dc3a3f1a6d76e6b98d4f2 Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal@nxp.com>
Date: Mon, 2 Apr 2018 21:03:21 +0530
Subject: [PATCH] crypto/dpaa2_sec: fix OP storage for physical IOVA mode
[ upstream commit 228e20866a235b478f528d5361c70d4540586b05 ]
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")
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 d421dbf08..9f75f56ff 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -306,7 +306,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
@@ -327,7 +326,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 a1fe8e596..a64074bfe 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -120,7 +120,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, (size_t)op);
DPAA2_FLE_SAVE_CTXT(fle, priv);
op_fle = fle + 1;
@@ -271,7 +271,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, (size_t)op);
DPAA2_FLE_SAVE_CTXT(fle, priv);
fle = fle + 1;
sge = fle + 2;
@@ -416,7 +416,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, (size_t)op);
DPAA2_FLE_SAVE_CTXT(fle, priv);
op_fle = fle + 1;
@@ -565,7 +565,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, (size_t)op);
DPAA2_FLE_SAVE_CTXT(fle, priv);
fle = fle + 1;
sge = fle + 2;
@@ -694,7 +694,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, (size_t)op);
DPAA2_FLE_SAVE_CTXT(fle, priv);
op_fle = fle + 1;
ip_fle = fle + 2;
@@ -775,7 +775,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, (size_t)op);
DPAA2_FLE_SAVE_CTXT(fle, priv);
fle = fle + 1;
@@ -867,7 +867,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, (size_t)op);
DPAA2_FLE_SAVE_CTXT(fle, priv);
op_fle = fle + 1;
@@ -989,7 +989,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, (size_t)op);
DPAA2_FLE_SAVE_CTXT(fle, priv);
fle = fle + 1;
sge = fle + 2;
--
2.14.2