From patchwork Mon Apr 2 15:33:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 36877 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A5D521B3D6; Mon, 2 Apr 2018 17:35:37 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0042.outbound.protection.outlook.com [104.47.0.42]) by dpdk.org (Postfix) with ESMTP id 9C8731B196 for ; Mon, 2 Apr 2018 17:35:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=+b02NWWD4PbHbAAJjUjJfCT834JKVKOw0YJ9SuJ+PVw=; b=Grb/3HpPIq6ZeylTFUkN/0ABrPVCK9lDLJc1ps4oaMsePJPZAbpKD2QBVO7TDJzUSbL+63YGVg8KVK4y+NpdhIVxwKBzw/JRtB5vNRlqRYBHqmXpw7TolteHyiFSklsGwGrt1BQd+b8eBRZPr6p5lviu04+Cz06I0d30RLyF95s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0767.eurprd04.prod.outlook.com (2a01:111:e400:984d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Mon, 2 Apr 2018 15:35:28 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: pablo.de.lara.guarch@intel.com, akhil.goyal@nxp.com, dpdk-up@NXP1.onmicrosoft.com Date: Mon, 2 Apr 2018 21:03:21 +0530 Message-Id: <1522683201-23963-9-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522683201-23963-1-git-send-email-hemant.agrawal@nxp.com> References: <1522654594-2757-1-git-send-email-hemant.agrawal@nxp.com> <1522683201-23963-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MA1PR01CA0090.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::30) To DB4PR04MB0767.eurprd04.prod.outlook.com (2a01:111:e400:984d::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3aea66ad-872d-42a6-cf3a-08d598af5d57 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0767; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0767; 3:mqoJ237nVYFzDTLqTn2/jnEADlHnME5TaWmI4mfdL7y3jBy12OTKYtmr4sM5mFUrsFcGd55ImVKjyGTpKig+FgteUxzDMK6JBlQddFz2i2VIB4ME+hcBKSpVrDFXRO0yeaoGRe47nEPacCWB9fwg1fp/YUydxgF0VBu8pgraeOAJcvayfjGK9ZpRnFnD4uq9G7g9mTUhD6oxvxZt2Yp6mMm8rXz7ID+xR/g7mU04fVPfpWnpplSP/XsVjWqnyk55; 25:/g4Lvdj6tQ921dCch51rBwV3zwI/Z2V/gHdZa9aEccpvlrsXrx7B9KPfulufazRBdYAR4A71NmuN/XuJnWPhGY4jNTp9w9MSTMhuDaU7cVoH5eeJbfeX+KCjgCs20+9Y588CiH57A+W5C4+o+FL8u22NdjCVOyuvihUwr3hc0TI8q0UImDHY5q+cG4ZorTP120YFyDq6LiuzcOsLIWeAq1i0G1KGJB5NV52OFcczHg1oFPy6Tta4xoO2pxTavZmyVMOlnJx7fcWZUYBOXoibHPCmmOhJjV9p8gjvMI0OrkrHh41MQ9gr7Kq/Vcx3+5ffzR6RbxmPkq7RDiVuE+9XHg==; 31:r8Kx2YfigJotTQGhy4gBHktTA7sBElWj/Uju3WnwgsW3/OOLxsd0xeKOm1lv/ntCH7vBqjYuUCoUCb2Coyostj5HhVaYZNJFukLGXbOyjlBA0C/rqegz75rQD16fLwRlrCBkrIWroU7PXT2Vk20oxQEAjbWL9p+7uNzaqKXJewjUpRLkKMCNC/T34qdsL48OlbS07NrNz9UM5Nz24+cYcJj5TsvcTqSEJPC1uXIngSA= X-MS-TrafficTypeDiagnostic: DB4PR04MB0767: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0767; 20:hq51gC6bsI/y0AoLPsQeva7F4dQi3YXKXq/RMc+7a0JDrewSGY4YTBS1Vo+VitL0SNwC53yZlqjOlfhnOqtWy9ChYs9d07h/Qlw7i5WvGY1l9+LA7qnhxDH/Cl0gYx3V7LcU1V7pCYzNgh0d/MutYYZLzIu7w20j3OBILfDMl7g8D964b0u4h6C3px6UkWQF966B9S6pOqkh7iXrXGPAPsdGzeEeMeziZlVoLMWA4sWRuZfIaAY2tOB8i6T1QPloaziCqon3Afr+ek6w5LXsXQLEZhin46z3mKNKZZ/FeCN8CuDoRtJAD3W/Ok1+KdaIKJlRMEp/tnTPt/EdZdalyBt6/a7Zk+jNdA8CD9Wtci6ZXftjSW7zQ4d8oxAFqXJQLpC6UFsjm8dS5keRQy2aHpbF8WP4w3ph+Tor7CqXcD7CJcgn0I9ondKps0OJk+QTLFnwepFSLyiZYcIywx0VPlrort/CFnXrjeCt1Vhmanl78p32373na/ez/0z0XtOU; 4:INkGatUIaims2l0LZ9Gh2540O24OLEFYTybOln3a9dVmCoKi4BL4meH7vFt7jCgXozuy+78kxSLuBTRf8GzvaKqtplM5L+H9XTeU+z28PewYYr3sKjgl+kO4fI3UtcWQwgkyq41xSwniE9CX3ezfafpQf3pJ6HnvmNpw0hoQuuFreAcEeQ/DG3HN8SgCbgB+tBGPeToIQA2Mg5do+TaEfE+caJg59/gEeipJdSs7TivWJ/cXccGMjtyY3Gng7RTHnya2g/7eDpBS1XUV76R+V1b+ZqWTCv5VuXBvFK3dDdS+992PExVN8tetpEtEQoaOMQ0ohMcilJ74GdeWTQHngMLM5FTDVI3Wp7u5LLe8BgU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB4PR04MB0767; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0767; X-Forefront-PRVS: 0630013541 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(39380400002)(39860400002)(346002)(366004)(396003)(199004)(189003)(16586007)(16526019)(86362001)(6486002)(50466002)(76176011)(186003)(48376002)(2906002)(6512007)(55236004)(47776003)(2351001)(5660300001)(73566003)(6506007)(386003)(97736004)(2361001)(52116002)(51416003)(305945005)(105586002)(486005)(7736002)(81166006)(5009440100003)(26005)(8936002)(3846002)(53936002)(36756003)(107886003)(476003)(6666003)(59450400001)(6916009)(25786009)(316002)(4326008)(6116002)(66066001)(478600001)(956004)(8676002)(106356001)(50226002)(68736007)(11346002)(446003)(81156014)(2616005)(486005)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0767; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0767; 23:15RO3Rcau6M6m2soA/eluUUQnX8zVCquqoNLb71KR?= bUtXsmQ/c1M2NZtk8Z4+ConvE70GfZCJnj6PAXYqRgT5JZZVKtSbD4NZuYxpSo0ABhl9Cekehl5YUW+6ZUT7JvI0OSmQLvAOJlLVCK+NvKdv2tREnfk0tS5gGBgLTVEFS0uWbl1kfsFL3LnAtKeDtn3i5VWlHp+ouQs0ILRjfP2QYP20EMR33pYXVQomxf0831lYqL3riX78kTyCguaOTkhwbvz4BMnyFM1HOw2ze8DwPCErhqYtwxoAgzM62hQwekuvLWnCjo2W5yxGP9nv4LL2z0KWD5Uzat4GM4oAoz4yflxnXgNSffGdslIDoX+Sl2ZD+139pz3mghGruUxuXShYV4Tn7WU07atEjItZ28y40PvAnWnIib9Hm7yAzdadpktNGsq2IooPrRKwMJxb82RNS97ibzmZ5m+5MpghxGVfaWAKsa5zhfc++Un50zh5l2HZC65IV2J9F/xlcrdasXaDQ6eMlStJUjxNZfOapEBGgTP2WEOLoC5OloPRDpKABWVvfxs5w2Lqws6vIWOF6bV7ViWDYIaT9oFFaE60CJSKNQ9kIpBf/tUIQyUSdmgKf+wrp12G1phJhnyJt8nv3UgAsqLV/qi8/yme9s3TkIgJ9k3UdcoshWlrEK3EDoDxqEJItK0aQaOK3WF4Gqn2bElnLtxPm1E20c3FSjXH4GDj8QdevHaC90dArz+vBTJZiN3XZpQ7DX2tGT6H+EzPeuPmRG94xKu32RkGFhmcPrZhNhK4WTswC10wAbQED9HQRDdaem6Rxc0mXS3zoCuSWOwKqg5Er0Pi+f9jHE08CwsokUmpEIUfzfnYzps8gg2RkULph7we7yM8KVynX3CzEv9Ggy3q85OJibKJUEvJC8CpC2ePtjk0jdq6BHC8aIxUjjgpJ0+0cEqvigo1oqHnkyaS3AGAJm4/oYHLll1ruBdfANgmi/DiDj1hNMm9Hv4x8nZxVaFbxeIazZ5gUqaGacIpj5bdHJM+fnUhov/lOIqhziY7wotc0sryG95sD4OCodLz0eo+4z6mVPvZJEhms8KQtataicPEA9kFCXq/JpWnSKY7yEFjbWKqNUHO46cwsoXl//Kiq1HS+yOu2SqAHAftA0d3JNq8T8al2PGE52bRnHL2ozCgE7ZfXp7eo54X+M4xg41FlNBDwxx4rxTkp6gs8Vw30q8NZNiyWOGmUB7/alCUBxvV0LPaqDRFWpISJgs4azWC+PhGhT/Sd7sWtmzB3UWwsFU6wcEY6urrNs84M66WvNjnWZ7Zc+KfZrayWwE5SL/dL9Ho/uRiWEE4e7wcewC7yx9DY3Koqj97Mv4pTJC4P/+5PTvKLCqD7ruISM= X-Microsoft-Antispam-Message-Info: ql7SFLBug692peFib/NB33tNO+BNJUTh7YpduWXqaoKBeYoL+rcZXaspJANv0V+awHxD+2a2ySE4UlrL5vy9QxdpPClpzcDtbmUe25kmTOi1qwJSBUgtuyNAQlnzsgYvXbIlL+kwfya9h6OncOsDMJdwkQEBMput4zpJpFxGlguIXRkaHOxk0h78qvRMzIi7 X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0767; 6:IsVvPt8B4UvyJl8TlzCh7uSw4eL98BWQPYo2/VWKfpOutCsqOxZ8+zQeffkvBsUEhVs8XiLM/C83dm+tJoNLn914QgjhW2wiOQYNYvSXNT/4+AZrVJqSfuBJ5aoZe6WIL/Y61Z0cEdzZEteeB7C6zKxuglmFRIGlOfr1nzzdpgZyKbiDxUNCRVL96w5P4bFgF+9QJPves8jvtY2ciwzbYE8qwjymwmSGFZPI2Qogv8wHt9LsIa8N09mwQNJ/hCbyDzUnxGRdwvYNnPvBotMuN04DjtZmxwwqzdkjdZ2xl7VTvqqB3hVDINRS6z3xzMztbDqPYKoi9KmENTqibouGGM/sYEG3dd8i5rn7yFEmod39vfu19QLEkiw7yBrIjN3w6SYxYjyFBtgIsukk2NHr93uaX2nvxM3cRHmbyblgihG2jH8Uvk8XAqQlOywnBc5kxSzbGsKh7V2vXqd4hM9/pg==; 5:c8WP/bu4jusxdeoirsUQ/GW/YtI/QUwxBdTEKUXkxg4E0XPmLCB8yKnh+XlW6SqCfn2IhhuI411OKGpu2SVr+js/HtUi+g1GXrlo5uA/QALyZeMxymawizyeirEmmEkHU6tL00DJeKRAxTzrl1p9HYcQO+lPRcDt3EuxiT70JXg=; 24:6vA4rzHtqM4OX8iE0M31NxugOIyiJ9fbwL/HXUE4aHy0dVRjzjdjDOULcU+2LDLW/6hHqhnlUYA7wn+uMsvIUP2M1lInSiB5oYXkY66ODO0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0767; 7:sUwMaTEDCm4HhJjyngsieSei74r9yhWohZ+LPYY5y4n1ij7xcakrUlTSBRlzBAcsi+SrYVlpIlw3ioAVXmNfl20SEYniI0FwEdEdiv3rv7inVxspV42Zw5DzlnZniI+z/TBD0AZ2OmIG44apKa2C2gF+Bo+58sSfcsMzyTt/nuSBGAuVeISocJ3UkXWUqsuViJ3WYSJBfN9Xujo1bbFtAvYG7v4T4eQzx67qn1ijRMwWkvJ3eAEAJDjw2NeDpXHm X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2018 15:35:28.4277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3aea66ad-872d-42a6-cf3a-08d598af5d57 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0767 Subject: [dpdk-dev] [PATCH v3 8/8] crypto/dpaa2_sec: fix OP storage for physical IOVA mode X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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..b31f64c 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, (size_t)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, (size_t)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, (size_t)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, (size_t)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, (size_t)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, (size_t)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, (size_t)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, (size_t)op); DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv); fle = fle + 1; sge = fle + 2;