From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0062.outbound.protection.outlook.com [104.47.37.62]) by dpdk.org (Postfix) with ESMTP id 935352B89 for ; Thu, 7 Dec 2017 09:38:13 +0100 (CET) Received: from BN6PR03CA0003.namprd03.prod.outlook.com (10.168.230.141) by CY1PR03MB2362.namprd03.prod.outlook.com (10.166.207.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Thu, 7 Dec 2017 08:38:12 +0000 Received: from BN1AFFO11FD034.protection.gbl (2a01:111:f400:7c10::191) by BN6PR03CA0003.outlook.office365.com (2603:10b6:404:23::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Thu, 7 Dec 2017 08:38:11 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD034.mail.protection.outlook.com (10.58.52.158) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.282.5 via Frontend Transport; Thu, 7 Dec 2017 08:38:09 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vB78c6Zn002650; Thu, 7 Dec 2017 01:38:09 -0700 From: Hemant Agrawal To: CC: , Santosh Shukla , Date: Thu, 7 Dec 2017 14:06:59 +0530 Message-ID: <1512635833-14803-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512635833-14803-1-git-send-email-hemant.agrawal@nxp.com> References: <1512635833-14803-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131571094900811513; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(336005)(7966004)(39380400002)(346002)(376002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(2351001)(33646002)(53936002)(76176011)(498600001)(105606002)(50466002)(97736004)(48376002)(305945005)(51416003)(16586007)(316002)(106466001)(54906003)(104016004)(85426001)(8656006)(86362001)(6916009)(4326008)(77096006)(8936002)(5660300001)(2950100002)(6666003)(36756003)(50226002)(81156014)(47776003)(8676002)(68736007)(81166006)(2906002)(356003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2362; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD034; 1:jvJRWBaPv6PQ71hzZj2gOmo3bzncts0+Vhs65UW8wNb2IbjIUTxlVHibgJ/JLlgzctNmZT20Fi2uv5jPGGKuWW0eNa7vTyS44St30QQAk+vN9BzTvCPOpah0m3PyC6D8 MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fdc2a601-9bfd-447d-a6f9-08d53d4dd8bc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4628075)(201703131517081)(2017052603286); SRVR:CY1PR03MB2362; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 3:2rVmot4NRaWqNT4rE0DTtGZ5AaC5+LuMnwJT9ExyYxgJps7U5Qxf8Pj+ckyJR7zEo9q0HLPuOk34VUR+16rug+A8JYvZktaBMvXrT9qjmpv2S0M8RC2zZc3NkNtqZ+SPTHikM3vEx7b2wYz1P72ShIxz5ZZ01HBtMnFkCr5HAwAEL81uiHMDSqTLMi8HgL+o/OyPSc4IULt7X2zfgzBTIuCkUMLs8UkSXcTFEBI4WWBugsuYFK0LtV2ve4lsgMPSE6OD6hDirtkbhFfYinvl8GQbqcFYhW9S1QHwPs0ig/GGkcsw8M6uYzhqv3Bs/cRQZ7/+UqvjhXlloSt2Eg05akCkYn2ZAD1mfw+JNktsAQE=; 25:/8zQgHszZxgdzmqItHiHleIatY2aZAfThmexHMT7jEwVoSES3cVE02KRcT6zpzsGIGQIkI49Mvjk6/yS/9G1ZZHcQHxD/4Fo3PMvfEXZj1qYUN394VHi9E/Xa+ELzMV+gPLI/eXMsXC8AorBy9WuwbJRgLDEFdYerY4NfQwzsJrCXPpm82Qfv1cZdU/lgUVGVE9ZeK/TxBUAoIv74CIMsyoQYRDqdyxbqbqXwx1eT4JmebFA9oPW//SftGvxlq2dUlCibJefpeaCIrFQJkie2rUBmiHOdhXHJxzNHZVA7YOhrZVrXhkqrHdBpKxhpaoZsSR60NrT6RR0LPVWoK4Cvg== X-MS-TrafficTypeDiagnostic: CY1PR03MB2362: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 31:cbukjfanfIZznJAOBPnpVZWS4XI8lEQBU5Y7T9AGgB5QAIu+mK4X4BQP57BzfN34IjKeLNJUgnFyTGcrWRnWiGjg/PeQdaeQz7v/GfzCGLwmIFfM9TCn4ckgEtmQn9vswuqvXnhFsynTL2YcWRnu9ikihHcqbYlJQtK0H4d5HgjKF5Hq27tS9gT20o08A1qUIBL+wp53Zg0mIzYQPlF7CQztZUtap29QX/7eo56eX0A=; 4:3VvzoTs2QPKm2rkfX01fgmNCxELs/a6HJbztihrDCqd5yMfX8rtqfn3/6HD+/8Oa+uLf70S24yb+ksmWqMGJ4KU2tEqcxQsfp1Jtj4MVg+DYZ1AR9nI85J7PdK83WsuB4oDdAJpGwLu+vmVHQqbqiQSXupa1+Pdu/RB70Dl0NN2uj8wWl89Z0+IcYlt9VIESWsGjfH6voS5JUY2/+4RJCxOvKjFswJybD3BrC4VBEgPlnDFGqhFOzzKGXdiXJYZP0ie9eMJdjwVfcCnbZ+IcIvbmYpXL4M00/ynAg9SBNXfSkz0QGX3A/lhV6z4YY0WpIRe12U5fc2nOXRvA5J5wNzHw02JgsOalWs9uI39VSDE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(3231022)(93006095)(93001095)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123556025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123561025)(20161123563025)(20161123559100)(201708071742011); SRVR:CY1PR03MB2362; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CY1PR03MB2362; X-Forefront-PRVS: 05143A8241 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2362; 23:Lx0Nx5VVWwOBVZvlxRqIN9Ng9/KDBF+bDxnpY7qhY?= =?us-ascii?Q?F6DT7S7+HTe26Of3Tsn0Jexmanc3Dcg+9AFPt2lm4OU9JpPwHqc31cSKOSt7?= =?us-ascii?Q?h838mjBu7qjSbpeRcQ1NIkPaWhzlbBG9oLsPdseHPGtpRksq4fEyIeCQ8ohy?= =?us-ascii?Q?PNUzSnruVDo5empBp8/vrnKs3rTTkrBG5B7EjNdg8KPFTT9qlPxcwCTck3QL?= =?us-ascii?Q?Db8j3iFN+OW8VQuiOhfdNL4d9VwsfsyuICzA/IoZzRINQqL//tyxpwvRpeiE?= =?us-ascii?Q?Grqde3FWxMn/YY8GAASrF6M6+EfgyxiNBxAu5rMhgb7og2gJvfMUQzyIMplE?= =?us-ascii?Q?kD3PtVW87OPYLj5obHwJgZ7ncHgxpiKIJKjYCZa9Bgl7dJxR9dvfoc8ODMuM?= =?us-ascii?Q?09iA/1VJGarypvBsBswqdMbJpkPRt5qXnjfbWf+1n8XIGqrIPjT+++tddWx6?= =?us-ascii?Q?bsbz5s1NzxJP14KLO32I2CnXjpvLE+hWwPmE+i47yBE4qkD6mhpo3nxxvdu5?= =?us-ascii?Q?X0KuHUZna32oE2mj7iWXBkiN4M/D13WsvdgVtkGQuQQrBs494hMXYnUB/2aQ?= =?us-ascii?Q?Nwf2usWpxw/YhFk6VvJsAEj+8/L6vbzTiPyd7a/eV8YNyjJGcQVZfgvQdxVZ?= =?us-ascii?Q?jqWdDBgOZJUgXKySsybl1/g8+IRIC357y8+84q7pyt5r0IG39xUDABi69afQ?= =?us-ascii?Q?RDNJyBd5J1S5A3XshZEfaz7Wz+5lrDOLizMoDwNCijjh7X6mdCoRZHVcj+gN?= =?us-ascii?Q?/tyOgPIOLiNXMGKqZqnK0HNiKFchiNiH+nwC6ebDXFJWUUizZuvoelHgQz2/?= =?us-ascii?Q?7tguDj6ye0IEtcn0GY80fr6c5BsFPloRziv8BOQEGVwIva/zdldSj8Z+FcVq?= =?us-ascii?Q?sqGpJdVvEOQBxmaWE0T0yJdiZJA951kGm+IhHyVqtMbaSwFyk2dXZ/hT3B06?= =?us-ascii?Q?flp1G0vxQ8zy6cylFUhUfvm4h/rbR/AuAgNLfAbgGsbr2Ad2ezUnX57arJro?= =?us-ascii?Q?MT0duP3ultEQIK2A+Yfk+wZQx5wW/0eyboAlLs4zRiiN0HctG3aep3ClDfYa?= =?us-ascii?Q?lKZTxn2x0ueSXOZT11DOTwjIpGRIyZNy/nolv6672lqf0oAyg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 6:fAkZDshm1xz+VwyJSQrNafbxr59BMj/e2BeTEhWDF1NxDF0CpUJkpJGnUbaZqcK9nnCsWubtB4zRw8HS813Hucr/oZ3wJs93BFn7KDkMQ0+J2q0e3OuINGROXy8GkrVHPFf4P54rEFjPOEQZPqwm9XH855ezXUV0vwzbIs09l/pI+zRBN7gGCX9GO6ERk1lGKiSIY/ERFFD8RdjQ31p0tWUr9AXnNZh9xV13/TXBFY1gf5MA1X6+8OBtqUemJaxDIU8yaG1vcrZNk2XV7mSH5mpYPdzF/C+V0Je1xIp+grbKB+MqHasHReSe+H6XauSdSlE25o1ypVpXx1udQpb1gUFJ90AQj25XpsGKUav+gNc=; 5:BiwlNHEmB2a/+3qI0s6IRL1bjoTkUY6D6MT/NAXdd3zygbH1jfWV2j1snyaNYG6WTnsi0EHhi4xwg0Ry9mPrz+K5iNpm+Yd9vQaM9oZcUPKnaR+PwWKgvsSMYBdhTXX74AgjO4zR1pk8qsHVRpZBa7VOyweoCHJyR4eBKQCJbNc=; 24:JhU3eEAhRYb89OzoH5NZqvgolkIW22NYyzexd4jcQXyx5rkG5TH6QRcsolVVUFY5rcXJOvWdp+Sk64qctYMext2S8SaV7eGS5DLVovcnqss=; 7:8cOVUy020Ron4eOrtrHO3LnkX0Dh6tF9Szw7WUpAI5ul2LSAXemkGZ1NqvoGeotZb02CkvGEpItyKgRbj/Q9OP8qDDtOEA9R1WQ2rCn73zNPbh8XJ6c/NqQFkgTqSv+6u/WciPQXFkPqksFsbZA2XRUcKhoHom0hf1Orcvp6LdxsL8paNhwmc2CDBbg2FUBxbwXfep0vHs6GId5k8iOSncXY8TS4eUeloLP42OAgcVTEDj+EWsqIt8Lmo3ZcyjyA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2017 08:38:09.9095 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fdc2a601-9bfd-447d-a6f9-08d53d4dd8bc X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2362 Subject: [dpdk-stable] [PATCH 02/16] drivers: change the deprecated memseg physaddr to iova 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: Thu, 07 Dec 2017 08:38:14 -0000 DPAA and DPAA2 drivers were using memseg physaddr, which has been deprecated. Fixes: 7ba49d39f14c ("mem: rename segment address from physical to IOVA") Cc: Santosh Shukla Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/rte_dpaa_bus.h | 6 +++--- drivers/bus/fslmc/fslmc_vfio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 8 ++++---- drivers/crypto/dpaa_sec/dpaa_sec.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h index eafc944..bc933af 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -113,10 +113,10 @@ static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr) int i; for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr != NULL; i++) { - if (paddr >= memseg[i].phys_addr && paddr < - memseg[i].phys_addr + memseg[i].len) + if (paddr >= memseg[i].iova && paddr < + memseg[i].iova + memseg[i].len) return (uint8_t *)(memseg[i].addr) + - (paddr - memseg[i].phys_addr); + (paddr - memseg[i].iova); } return NULL; diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 7831201..a936321 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -249,7 +249,7 @@ int rte_fslmc_vfio_dmamap(void) dma_map.size = memseg[i].len; dma_map.vaddr = memseg[i].addr_64; #ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA - dma_map.iova = memseg[i].phys_addr; + dma_map.iova = memseg[i].iova; #else dma_map.iova = dma_map.vaddr; #endif diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index c1b842f..ece1a7d 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -284,10 +284,10 @@ static void *dpaa2_mem_ptov(phys_addr_t paddr) int i; for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { - if (paddr >= memseg[i].phys_addr && - (char *)paddr < (char *)memseg[i].phys_addr + memseg[i].len) + if (paddr >= memseg[i].iova && + (char *)paddr < (char *)memseg[i].iova + memseg[i].len) return (void *)(memseg[i].addr_64 - + (paddr - memseg[i].phys_addr)); + + (paddr - memseg[i].iova)); } return NULL; } @@ -301,7 +301,7 @@ static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr) for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { if (vaddr >= memseg[i].addr_64 && vaddr < memseg[i].addr_64 + memseg[i].len) - return memseg[i].phys_addr + return memseg[i].iova + (vaddr - memseg[i].addr_64); } return (phys_addr_t)(NULL); diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 16155b1..438dd3b 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -121,7 +121,7 @@ dpaa_mem_vtop(void *vaddr) for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { if (vaddr_64 >= memseg[i].addr_64 && vaddr_64 < memseg[i].addr_64 + memseg[i].len) { - paddr = memseg[i].phys_addr + + paddr = memseg[i].iova + (vaddr_64 - memseg[i].addr_64); return (rte_iova_t)paddr; @@ -137,10 +137,10 @@ dpaa_mem_ptov(rte_iova_t paddr) int i; for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { - if (paddr >= memseg[i].phys_addr && - (char *)paddr < (char *)memseg[i].phys_addr + memseg[i].len) + if (paddr >= memseg[i].iova && + (char *)paddr < (char *)memseg[i].iova + memseg[i].len) return (void *)(memseg[i].addr_64 + - (paddr - memseg[i].phys_addr)); + (paddr - memseg[i].iova)); } return NULL; } -- 2.7.4