From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0084.outbound.protection.outlook.com [104.47.0.84]) by dpdk.org (Postfix) with ESMTP id ACBC41B1A4 for ; Mon, 21 May 2018 15:00:01 +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:X-MS-Exchange-SenderADCheck; bh=/G7cAJrbp5q2/gln/TBYBqeezk3gC35aTUUdeAouUOw=; b=TiD1Uxq+HZQKs2iv1RlzpUlYH5CwFOakKyl3pQaHYlrPPBkS9ZT3tZPC/IZcZnJ3uC4pPgup1TryL2nkJPc8BKRL2F6WALPdmBOtneGqAbAfwegoRINw1T/0eS1kU3i7kN60LsYgIcNfzbKM4dxQp6sBs5b0aZXtikcd34A85Pc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by DB6PR0402MB2775.eurprd04.prod.outlook.com (2603:10a6:4:96::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Mon, 21 May 2018 12:59:59 +0000 From: Shreyansh Jain To: stable@dpdk.org, Luca Boccassi Cc: thomas@monjalon.net, Shreyansh Jain , sunil.kori@nxp.com, hemant.agrawal@nxp.com Date: Mon, 21 May 2018 18:29:41 +0530 Message-Id: <20180521125941.20511-1-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR01CA0087.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1::27) To DB6PR0402MB2775.eurprd04.prod.outlook.com (2603:10a6:4:96::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0402MB2775; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0402MB2775; 3:QmFyCEDRJ/C5RuMYrS1seQUAhcm+0jJ47fgUGBTWI2L0Z5qq2gjU+vP4cXCog3sCc7Lg+zFdxmd/+IVj8Hm/d8os3kmlgzismjZD09lO/qfUrTyNZidfH/VDUJqnD396FQMadKr5sOREApVM7t0lMPE0dW76p+GymVeFFShM5c0zaeSaGKzgXfzalJZvLPhI2RJvQN/jzV64JSmoSW45bDGOotzAnbx235gaGwjujgLg2cMgdT7tri7q02aZtjOt; 25:OM+XTM5rC2rS2wVyYAKTC5QblaW6PKq9lRG0jMPyjc3SVNIW3X0zDkiSpDdQqU1H60ghc47LFoTIkHjJ8fVd46I4NCEaPsl3Jq7lyJ0JWYe8HRU8wJiAno0IX1lrufLVO/rGxG+v+wUhijZ1BoPY23jPXP3sroN++G001g65ulh1XOFJh0WjFZbDMIRibuRxLlrp0EJeCsnxJ7sBxMZQHt+UGjSveKk1vGuLCtGYjq+3vFOWUX/966SO4WjAYWQA3rL6dyLeYRtWaHQN/QidhbsV9mM5bYXHXQ/YbgBwTNlD44HiO62+zIQ5/Oq4DJL9o/06+Y5bhSK7sykn0IH3cA==; 31:5X/kFzOESR+Jnp8vzPb9QohHJpIkvxQNvVKh4H8z5X7vSzY9wMwC8LTgCh71FMrl7ZDR/eARdUSGAgas1bB29HPz0ZjI9Q3fOYt3Qko7duQ05me+JjossPZCmy9X9fyzIgicH/rSt7jaOr8s962S2rFRuaSRiVrGhVOxrHlUbhT4KmfFCW7FHHHs+b7JBQow8N7MlTjniQ5DX0uF2jVH7Mp8mHBuH5485nKtaaivbIE= X-MS-TrafficTypeDiagnostic: DB6PR0402MB2775: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0402MB2775; 20:A1JDSxZc+C8twHAEeA+j8OUVwG1o8SlDB/bN67EUR5149wYXwH/v753B5a287PbdNSz4J4aXG5OA8NCNOXvsLfWlQ4nowq7qrfoYYBLFjQ1chr95RFOlaMlNmHqU9SaiOZxZqrbeXXnGfzu6WYc5ZPkWMhnAQsCJmeL+M1pFg56fhashM8ClXzOjmkWErDqsV54Ct0p5E+1KDKk+Q8gfMG04jDLVOG8gIJwTt5hT2CkQ1HmNQLfwUdvc2gefy1HmPB5BwFY0QuVVVFnIceznztbnCxVV+QS//r7xxjsSHJP8HsDDCToyv6FYCST+Pc5eqLqBuHyBRzB/lSpZK+zETuKM2YAG6F3SlP1iXFO4GSu1TOSFjc4bm4HE78jYJx8VWvASt2dF5d82spurHol+e2qjhoFpamoEVubb+5oQIwNc/E3nTxEDNeOUi0JVxQzKg9h4XGHf8EPbXvZolq3P156WDZrJ33AyI0nerEdyGGHlHjM/Q8bDYxYrUoz+AMWE; 4:veG+jrxxZJVHk1T/ETGF9/kd8jBWLfBqbTMABd8YwVNShpAKmVBXJkl14kXCU0PvaZnF+FSv4lTTIAM8aU22bJvpqoCcMgT4IygJ5sqjSICHW82cwfnqbwm1JONSjg/XYOEQLyDr64sEPz85h4TNHGqB35ofg2nWnP/EEZbZ+/TJE6NWfslbUOfaBQnTp+EHsflhl4jBAR9uDf7tZiT8BfmpuzQmk1V9z2MqX5aSmnZvL/MZ0rwr7pU5aHGyeQANXOIA9VFGXLVJLOUc/kuJF3dqovXcky/42BXH2UWoKBOrwG7qXeu94zzTJMVUB/CF X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DB6PR0402MB2775; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0402MB2775; X-Forefront-PRVS: 06793E740F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(396003)(366004)(39860400002)(346002)(376002)(189003)(199004)(3846002)(50226002)(105586002)(7736002)(50466002)(1076002)(106356001)(5009440100003)(478600001)(47776003)(97736004)(6486002)(6116002)(68736007)(66066001)(305945005)(6916009)(48376002)(26005)(316002)(81156014)(6666003)(4326008)(16586007)(8936002)(81166006)(25786009)(86362001)(44832011)(1857600001)(53936002)(52116002)(6506007)(5660300001)(386003)(2906002)(476003)(51416003)(36756003)(186003)(6512007)(55236004)(2616005)(956004)(486006)(8676002)(16526019)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0402MB2775; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0402MB2775; 23:kJ7GItUiFXghvjtFZeu6FgH8FwWb0BREO1a7XCh?= =?us-ascii?Q?FjEZWN1OQs4FXX6AEz8oRgZedYJPWI/xAtpc1/jP4QjO5zApcGFpqZFwmC4k?= =?us-ascii?Q?KK4YPqSxfgfoJFWYjWOMpTRAOtWom8fNlfGyZH8vIArm6MXNHxwDL9JL5lal?= =?us-ascii?Q?3GhP9Xj5jX/Tj/9OHaM/XE8uRFZ/xm7NtCpa+gjCE/Y+C82znDQH7dOjcxj4?= =?us-ascii?Q?hO6I0tNlUI7wNb3GLT9NJCytziP6RslVftr1i2OKpDO3cR6+q112T/pg+w9g?= =?us-ascii?Q?0t04kH32UVExskzm3LcVZLpVez99/yboBKpuy44SXm2gQqlTNFx7DMZBTNB5?= =?us-ascii?Q?abRs5x9M/OWqvSnEYL+LB9SAPJgP3+FWIv5mrnPQ3b1vUEJlqfVlQL4Ar0GC?= =?us-ascii?Q?gH8gYD8kcD0kNtcu0rwciBS756gM7JJ/wwVkZjDpdDMOyzqiEtEf6Ei6dKtJ?= =?us-ascii?Q?rBdhEMMT0ruERj4TyA6TgAEAtKLLVZKarjSSGFTu9NxfvUaK6ewXcsqsa6KC?= =?us-ascii?Q?yHvZUUl3tIbqe/60fA3Qv7yQL0b6LSgIXHKbKW3klDdZD/pmpFqYDEEjDouM?= =?us-ascii?Q?dCKOoyrEvvgqacKIJvAqsrclVD4fPDkKgcAHgNSfd49xFiAMba9M5mhgO8RW?= =?us-ascii?Q?chuw/Szr1zF+F8wl6iRkNSpELyxNoyNNRSsmp0kywJqWWqYFjX1mWQAW1cxr?= =?us-ascii?Q?HN7cXvQ/C6/d6rwe88C92qTf7du2OxpupFJMT3ifwGNIZHdbNuJ8Bo2lPkYN?= =?us-ascii?Q?aNkrlKGhvJz1U+NOknnpds1fIXiKVp5sufwwWY9yScaTEvc72H0BZKmAbJo5?= =?us-ascii?Q?5R9ft9phyws+phyHV4l2hMe+qWlfb62L/6N7IAVF+rVt3aq1nUXSq9+c+wgW?= =?us-ascii?Q?MIrjIbv7NBFdK9VAkBEuQcSyZUweykpOWGnqI3BGWrTT9TVZi8X67WjvWuMa?= =?us-ascii?Q?AgPrpl7s7op6haBsMuMqCMtLZubeYZCKNFoyA40W7AGMIzLqgWPWDd35WQRl?= =?us-ascii?Q?XVzRdEFouWGHcmAO1bVMbhdOUr3obtEWQJgzw+fRJH1pDsfnC8jtxQkTApr7?= =?us-ascii?Q?0lgkPWQ4ArG152vGyMgnelCAQWBpCsIRcu18rIKwD8UuHnHCNgV1klMjgUu4?= =?us-ascii?Q?xokVQoPUAmk+SmsHbIAQZM0BXO99OFBDzbe+4kiEVs3jcCQyh+lVD9xRbiKd?= =?us-ascii?Q?vDR5oZ7UxTAGXUaS+jEubbAZkUlG5qsEZ1uCZ+8XEak6SOh6lewnl91jq0rs?= =?us-ascii?Q?VWplRTFO+3QSwBijqhrEXeccJdyGKkzafctMdhTcy?= X-Microsoft-Antispam-Message-Info: oOQqdw/19Zk59np+C75jo5VEnLrbjdz2ePky/9VTyLGu9auE1vFdhVVTJ5KKJLwHgjCZ8ZfWzo9jd49ptS6yTBqlXiPwOfiKlCos57I5e/VqtnSAMZv0Qp5F7rNCYvqhlgz4fw5v4jSM1q6g9jX6ItniKRhPWMjtfR1XURUYaQZG5uYsyX1OMwNswesh8b0N X-Microsoft-Exchange-Diagnostics: 1; DB6PR0402MB2775; 6:69cDVCxIk2JkBymbORUlaIXhIfhTLp+SC25XvsSNeHHuSseFwebhqrOWd6ZTz+sfi6Y+eY7SDdVUVz8VMpn2FKXis14Ll6VzeG5yzDKmq3dtrSFa2oNSKN+FGLHa7a1gWnF8DW+uVYbHkYrpFfBVTfTfwaPB0peD3xa0U3rlBhBGF4Zsz8bSmynV/WL5NRxQNqKGmlhYAYUDNdTbkr0tnYprGER5Xdw1IaDPv09pXnPJfmO6YAiNQv/aPBd2NSWc9k1Nfr6hxMM6Q7sSme6Cjs+z8diLy/z5R+9122v9ey9CjbU3yJpH/BDGUUQZevT95C/AwrgS2BRWxgG/UuHdsC7CfKopBxoWum0phKF22tTPZd7HxA6SnV7C4oxB8EGNAT8Zob5R3+O9/07DHmn2vYBon7EP0h8XMMVxq3Tk6+fzAPl2iDRFV7feg5YVZ47d+gp3TlZYejOgrJUyWxR3DQ==; 5:M6OenXdmydQgjcMvpeerPurHBKzXkGNkRaDV+wVga0lzHwTf7Qa5T3qQq6EjbUSx6/+FCdzq2tb2CaI2/XdwM9cyi/IYO+Y919gyS8DEJBU9uxqpHKwUWUWxqMuVJD2A+WakIAYuazLs0pk3O00E9aebEMkNBASqhc/SzeBEq9o=; 24:GJZ5iSoOiaMhpv4mv7J8AKO7/LPhW4NL+b9Nj+X4/8KpuNp8/gZv8yMMA522nrA7NMor193cUVEOmkGM0D4CPnqqBklEO+GGdbF7RkquWEQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0402MB2775; 7:OpOVXWPlg7FufcdyCiDMtM+043W8h7X09/KoDAPBwV+u36CJZ7FSenBzFQTHOSkpmN2b6WcmhiAzgT56VuXjr8RhpWM759GGVNzG/xKr/eAerfRY/gaGImS+84LGSUmT+Z7YgTxFXSs1al1YgJrfD+Xbcoz75e46s9k1C8bBr4g4FVQ/fMLPZ0VFe1O+hr4AHFarXASnhNg2cUMBqqPpOlchyuRjcM9xB4P2G1SjD2/fDy/0snW2PuuZxSODT1/O X-MS-Office365-Filtering-Correlation-Id: b67b2dce-dcad-4350-b612-08d5bf1ac2f9 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2018 12:59:59.0242 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b67b2dce-dcad-4350-b612-08d5bf1ac2f9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2775 Subject: [dpdk-stable] [PATCH] drivers: fix build issue with DPAA2 drivers X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2018 13:00:02 -0000 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@nxp.com Fixes: 774e9ea91992 ("net/dpaa2: add support for multi seg buffers") Cc: hemant.agrawal@nxp.com Signed-off-by: Hemant Agrawal Signed-off-by: Shreyansh Jain --- 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