From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <shreyansh.jain@nxp.com>
Received: from EUR02-AM5-obe.outbound.protection.outlook.com
(mail-eopbgr00066.outbound.protection.outlook.com [40.107.0.66])
by dpdk.org (Postfix) with ESMTP id A21882BF5
for <dev@dpdk.org>; Mon, 15 Oct 2018 14:02:51 +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=VT3X66NIuhavUL2sTTolc1TiCUVu6pA4rW/+qO554Y4=;
b=feK4QpUaoo6SD/eQOXENPv2mFSUuzqRsV3GM+G/QpvuPCuwzrJf3r6b0AwNX4FhjYEA2f6RyWXatFfwTVn+Eo9wlc2Wp8+tWQM8prcbaGWAPvtRz0rD7aSg62gwV3y0zVnSA9QDOmMEEJRCYx/rBa8Xd4oG99qY0HYnsYC8CMCI=
Authentication-Results: spf=none (sender IP is )
smtp.mailfrom=shreyansh.jain@nxp.com;
Received: from Tophie.ap.freescale.net (14.142.187.166) by
DB7PR04MB4683.eurprd04.prod.outlook.com (2603:10a6:5:37::17) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.1228.26; Mon, 15 Oct 2018 12:02:47 +0000
From: Shreyansh Jain <shreyansh.jain@nxp.com>
To: thomas@monjalon.net
Cc: ferruh.yigit@intel.com, anatoly.burakov@intel.com,
pbhagavatula@caviumnetworks.com, dev@dpdk.org,
Shreyansh Jain <shreyansh.jain@nxp.com>
Date: Mon, 15 Oct 2018 17:31:55 +0530
Message-Id: <20181015120156.27793-5-shreyansh.jain@nxp.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20181015120156.27793-1-shreyansh.jain@nxp.com>
References: <20181015064202.20802-1-shreyansh.jain@nxp.com>
<20181015120156.27793-1-shreyansh.jain@nxp.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [14.142.187.166]
X-ClientProxiedBy: BM1PR01CA0102.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00::18)
To DB7PR04MB4683.eurprd04.prod.outlook.com
(2603:10a6:5:37::17)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 76f4853b-da18-48d9-bd20-08d63296209d
X-MS-Office365-Filtering-HT: Tenant
X-Microsoft-Antispam: BCL:0; PCL:0;
RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);
SRVR:DB7PR04MB4683;
X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4683;
3:QVGw+EmqwyYEdo5qvHx0c49E7oHNABCqqpD1pUjBZ7MUvWEBF5GWfBxsg3/oTgOSpUSbAs/QQfMTbbk5QJaYSUZ3MBUKXskXkCNT4YVwRbUmutGS5rfYZxbMSKVufawQOUW5MYTSpg1OvJ9hAd8NU7jN9mAdhg+l/UnrvpsKvqmilrGbli0Adf7D6/TsxvjP9NV8EYn6GcopDeHDaimb8yqZMVHufdjItMKp9uz2GGqBEgNFd/ELtCIja0jAzlTC;
25:9nv1qerAbYLMa/rZ/N/FOIxOq43LRXeImS9SKtmMVXdK4Pua1lHHrJX/O55IPDm7HLzHIgIXY1ZlEzMbsES0zkmiB7IWhuM8rMYOrUspLXrrzIzmotIoXL2rgnxi50rTU0VNkkuyO4RICjI4GufhfyJzNbtsgOjIhAm/iJCwRuu6sFN52FeMGfZHPlqWW7D1QdMQ9pDW2wtUC3iYdW2gdrohbw8FXuhsQ1xljkAzGOUzczPiEYcX6pSpQGTs8MkLgB6d9tvzm6z64Du1z+eBlHplWyOBdJjy1aLAdHoFOzt8R3aD1c1fdWBPVvJds16IBGDaJn9KY3r44MJZlD/2+xCiWlY1UNV1/vWPpv+JfwI=;
31:ZcF6AqE9ZQuBqmCanQy1tTCgLzVYjksr8EGJL4OlBC2SP2EfC9CCK+Fi6uXpDnrZ+pFOrCj6kRV1Zw9TjXk9OKXIU4xkVX6byOAvPPT9CGwV1CJg7henjqVc9xldxuKq4JmrxS8ry0oCIGIqt6oBVOfjOrWTQpZJ4LCZ4QFNEFr7IXff4PrFbcFB3T6pFpii3d/zvyi8j0HOU/KVWyWDkx13JFSxYjNpawppt9kQxCk=
X-MS-TrafficTypeDiagnostic: DB7PR04MB4683:
X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4683;
20:SUvJbbqWbIPFmCknyLhzAfYB/l8it+uq3aqJ2lqMg3OfRtc5bjZ7zq7jeKgmauktEEAf4rdF7+dUQHz115AOcepaSJorF+O6pSLtUMsEgxh+k59NI4y/sR4ffTlZsVQe/WqeqFeXueCZ2MxN5DQ1qa0EJocN79XGJ5rqRpy2vsTPuIKQjKSmFEIKKJ+E1fR/K4eTu095b4QbT0v2xIzd+OmYn8uz6Y/eU0q8vgNmRffiEqw5qHNDPz4G6MA95B8oxqKRcq6Wv20H4WquIC3frM3Eb2TM3xk+grOs1bh/MTNHZJEL23+r9u0s77gdu3YPy4yPHjMIZI4Y4UguwYiE69UrWK40UrpNXizpfL03Qnb7wSXlin72Jrz+OdQ3pJyDMfSZmbLa7Q3qgCMFkbcU3+N0FRPRysqFr1hC39kNF5CEpPA8onpzehFvmkAH3XpuyxH95N95R89kU+YsNBV/QUVu7sCZialzAoMsBzg+1Gzl1+W1ZsuUfMNZY+iKH0dS;
4:rlPfJMj6CM8VdRlOICRvkC07rKiiFhVl5shZI3+iFNXK1eLnKmmlAsMSIn5D9CZntYnO2fRptc9HG7kILfQRPakXNdwbfiTHj6zI9u26M2C4woWChRQaicHAeEdJOV9a3kqG/KVn+T0wOrN2nEYMAo4R88lhT/FLelY/xftV1KVrSKJqBrrNwLyPr5t8DRWCpiYmDQStXeoz6Hv1OCloncxSoac2Y/bCdAQSYpAPqKmo86lm0ghxPDLhhcoAvjfCI+3XOh3e7VgvQvhWfi+vYXsXhodKH0gGYNK/k1Ep3c5ZzDN+LiaIliJkVOwm76JJ
X-Microsoft-Antispam-PRVS: <DB7PR04MB46833FF2B5D62F14F03DF49490FD0@DB7PR04MB4683.eurprd04.prod.outlook.com>
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)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991067);
SRVR:DB7PR04MB4683; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4683;
X-Forefront-PRVS: 0826B2F01B
X-Forefront-Antispam-Report: SFV:NSPM;
SFS:(10009020)(396003)(346002)(136003)(39860400002)(376002)(366004)(199004)(189003)(6666004)(68736007)(2361001)(50226002)(186003)(16526019)(26005)(106356001)(47776003)(305945005)(105586002)(316002)(14444005)(2351001)(66066001)(16586007)(4326008)(2906002)(97736004)(6916009)(36756003)(8676002)(5660300001)(8936002)(78486010)(81166006)(81156014)(1076002)(3846002)(575784001)(86362001)(6486002)(6116002)(1006002)(2616005)(53936002)(478600001)(51416003)(52116002)(55236004)(6506007)(386003)(76176011)(48376002)(446003)(11346002)(44832011)(956004)(50466002)(25786009)(6512007)(476003)(486006)(7736002)(110426005);
DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4683; H:Tophie.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; DB7PR04MB4683;
23:w5hTNH244RmYLlg1seSiWAglaIp+Qausf1DcdLJHC?=
=?us-ascii?Q?vtrqL9I5FQKRIzOd6n4sngs6iRjTiWuWpCA5DVawFHsPmDLOVh0/GIcl6dY3?=
=?us-ascii?Q?Sl5LZTOoxYDSL0chjPYTj3Nn/Gq1NCy3OXEpVH6yZ3vWb0kFMtU8Inp7yHiC?=
=?us-ascii?Q?UZfdMkXo421XIO4IS0CBYFhAl/MEEIWDayMvgsShwFm+qvioqi8RpcNPuHiG?=
=?us-ascii?Q?xWdN9lJ2QoxQIw5jj4aVQp5tjxA1qvafl1AxX5GjdcMLHCDAaUpypTXkna9N?=
=?us-ascii?Q?+uMslOoe/d0M4Nb015VypyukE+jzHxWwJvOeyA6g8PtbCONgJrPjZqTgZaij?=
=?us-ascii?Q?PWvI0796ZPnsjP9Lyxujsa7cgJTlFKQjVCNyFAQOEWceijCkGgZuQQRR5L0L?=
=?us-ascii?Q?gq9r/AbBDMo3WMs6kZV33Rwh1NKDbf7POWfwl9xysZTY63YU8lv9QEEoe94o?=
=?us-ascii?Q?q4AHwo7qkOX0tPYgkSyStH7jTIln9h2oNwR7i7N53i4RwXGBlGec/LqHszcq?=
=?us-ascii?Q?7ERCKi5OID9V2QKQfHa1tjx0jPux3T2wQ3gg22cuZTBjoUvcM12QpTw5Sk+/?=
=?us-ascii?Q?04zJcnxqTVgaYP2xXpHc5FdaRs7GHfHxFPEs5xDZKgL9cU+8K+7uS85EsOYj?=
=?us-ascii?Q?a/diR/fGeRMEyNIKI7lH9a3L731EKTqp1OfFHUOn0x1bt7MnMarInMkMoj2K?=
=?us-ascii?Q?8LMGvt6ijpjOrt7ajeuhrcQ9mHvQFYwZUXSXHVQhuAC9nKoMT/lszDZZ+hUF?=
=?us-ascii?Q?N4V2DQzlYTsl8sCCz9acG69WjGREi4tn+fDhCvN6vlWuf+J3JF9w0TuLbMZl?=
=?us-ascii?Q?sQjE9EyAyqDg+c4yZZrIxq52PW2nhivB5+/lmO98P9K2IxaVtD3bJhg0HRuz?=
=?us-ascii?Q?hJkMWgv4HDrliYOWanb9E64th2o7saVwIi2dGeKrP3vm0Ajcd8sqwzmPvmCb?=
=?us-ascii?Q?Fr80l6Fg8+mbLlktYhN4rY0iZEN0GN1GV3IQI/4AVUqDBJWzlxgxMnLeXRZ7?=
=?us-ascii?Q?Wpxcxj9V+cPnEDaTBz1RQgkfHj2/95BvehiRSJVIvRmeNDtMhT8/wkT7DZZX?=
=?us-ascii?Q?2yOwfzXhqsWFOXVD+7400sq5tmLCB05fbdAfn4NG8LSOmnpW4zEwLK0Y1e9R?=
=?us-ascii?Q?gh6bM4SfzSUTN1+UXTfOmk64qE+U2uxthl1j0L1eimFhboW18l8cqSrbdsau?=
=?us-ascii?Q?cQkZxP7qXy6W/Nx+gzI5An+HTclsCIoOAml+ZydENokL4HKt+oApnoR7SWFu?=
=?us-ascii?Q?xAs2unuziJlSkO3xJ05JUFBYBSxJHZvY1EOPXp9lhmYq+aalYryAGDlthjZv?=
=?us-ascii?Q?jm2rW5Mu36ugQu84wEY8jH8yU5sHmklCA4Z0SzLzGbQRWmYNXebzTC9OQgxt?=
=?us-ascii?Q?emeuUGrR7jnqUfuj6TI0SnYmk4=3D?=
X-Microsoft-Antispam-Message-Info: NMZZxzTnNq9ZZIBLoreVSv6AqBRjaVW4nYAP4okInBtfqNZJ/jVzZoZeKlcL8+oVZ17YjwV/BDqL1VHcwMwZ3jKBqXbhFG/EvU0qTJOJJVsJQLEEno51HKBp69CHjv8BnF1BkSdzSA1usd2HNnxMYwEzIbX63tau+rJKICZQlTfGMaE/NoEyAmMlTq3yoiiwZsNXkmYQCIznPCvp2+J2W2a4OCTJEEjs6YFGwjoH0KLcwRsADjyvDsR9a0OqI2o9KcJrlKLno9wiGE8ZruiUB5//tgGGUZfbP1O+Lw+8lC47krydV/apz0GUzxSzxntsSaG/jjFEQcSd9c4wGOppGA6E7nLiWzNsIVE+J4yfSPQ=
X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4683;
6:1Qtr5ftWFVCKXPdqpqoRTKy8PlKTMNZEnVlyAZ1rSQ911aM5j/7SskwS7qzKWwXP/Jh+iukcBjCCcoqlYn3MsdrTOcKpx9kvPtyiRsYXvDeE2KQn8z5ATxjNlrnQUddQLJQtEzQYxDpqBtqUw9hyMtdAOXf4dCpCikKVm7V4Nj4b2hXonERIqlze4FHY8e1NkNw/Yb2Ci+tE3yTMYOND/ygJtDADiXx3Ts6eFPUHqjyA1bp7qlqy+J30XDwIG31JE6KG4XM5LC4tT9lbdZfRKZRZWpacFzqpuzyjTB2CyFI5fq2QLP2vPe2r9ldty/EKbd4u54yaOelC2wP0I8eVu1qI73ZtGhz8N24Nr/VkDDyuFQoGgbfh596xpJjIcL6Y8FQZtHJ4P8cVkvSwsbrL0jSW/8QZQGD6JKsAljxKRGmBC2lBW0cxQWw4hVfCTaq0bpWchhvBUzYXn+vC9mn8Bw==;
5:rKI0RyIsvAShxt0KbPfMy+9t4+RwsHGo3S6/sPBFIYfWV6adYFPY3po5PIAwRprMK869lnTAF/EFJ7JtlMjJA4pRljzXHUdE0XJkLj+lCxoUAs0FjuUTv0C5Xmtq1n8d+ez0s8jV7HxFS8pCHXlgh5N9XLkI4CwnAeMDnDaBLIk=;
7:eSlkEIPssaTMUZq881AmRrSMaHvozZCEUR3oluU5Wv8boe5vK7vkDFW0r+1WLAle8XfN3QAKiXxLMut56yYJqi202EjlD1w/9Gb+EREnjw5dVQKae71SCOk7nvd2lIrtij7VgZYhcJvaZzMjXYBPXjH1jA99O5w28pgdkzPRidsxDR4Mveo8PTbLvnHLuZ0MSoyGNIcQxLb4hLl+CivykZFhXVL30Pqajsm4r1478OLZYnWMaXsF27G/WJjOTKrW
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2018 12:02:47.9715 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 76f4853b-da18-48d9-bd20-08d63296209d
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4683
Subject: [dpdk-dev] [PATCH v5 4/5] dpaa: enable dpaax library
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Oct 2018 12:02:51 -0000
With this patch, dpaa bus and ethernet devices on this bus
would start using the physical-virtual library interfaces.
This patch impacts mempool/dpaa, event/dpaa and net/dpaa as
they are dependent on the bus/dpaa and thus impact linkage of
libraries.
Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
drivers/bus/dpaa/Makefile | 1 +
drivers/bus/dpaa/dpaa_bus.c | 4 ++++
drivers/bus/dpaa/meson.build | 2 +-
drivers/bus/dpaa/rte_dpaa_bus.h | 6 ++++++
drivers/crypto/dpaa_sec/Makefile | 1 +
drivers/crypto/dpaa_sec/dpaa_sec.c | 6 ++++++
drivers/event/dpaa/Makefile | 1 +
drivers/mempool/dpaa/Makefile | 1 +
drivers/mempool/dpaa/dpaa_mempool.c | 4 ++++
drivers/mempool/dpaa/dpaa_mempool.h | 4 +---
drivers/net/dpaa/Makefile | 1 +
mk/rte.app.mk | 4 ++++
12 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile
index 9337b5f92..381a5c659 100644
--- a/drivers/bus/dpaa/Makefile
+++ b/drivers/bus/dpaa/Makefile
@@ -48,5 +48,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \
LDLIBS += -lpthread
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_ethdev
+LDLIBS += -lrte_common_dpaax
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 138e0f98d..381c3b17c 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -34,6 +34,7 @@
#include <rte_dpaa_bus.h>
#include <rte_dpaa_logs.h>
+#include <dpaax_iova_table.h>
#include <fsl_usd.h>
#include <fsl_qman.h>
@@ -548,6 +549,9 @@ rte_dpaa_bus_probe(void)
fclose(svr_file);
}
+ /* And initialize the PA->VA translation table */
+ dpaax_iova_table_populate();
+
/* For each registered driver, and device, call the driver->probe */
TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) {
TAILQ_FOREACH(drv, &rte_dpaa_bus.driver_list, next) {
diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build
index 5e7705571..11a3c9499 100644
--- a/drivers/bus/dpaa/meson.build
+++ b/drivers/bus/dpaa/meson.build
@@ -7,7 +7,7 @@ if host_machine.system() != 'linux'
build = false
endif
-deps += ['eventdev']
+deps += ['common_dpaax', 'eventdev']
sources = files('base/fman/fman.c',
'base/fman/fman_hw.c',
'base/fman/netcfg_layer.c',
diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h
index 15dc6a4ac..1d580a000 100644
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -8,6 +8,7 @@
#include <rte_bus.h>
#include <rte_mempool.h>
+#include <dpaax_iova_table.h>
#include <fsl_usd.h>
#include <fsl_qman.h>
@@ -110,6 +111,11 @@ extern struct dpaa_memseg_list rte_dpaa_memsegs;
static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr)
{
struct dpaa_memseg *ms;
+ void *va;
+
+ va = dpaax_iova_table_get_va(paddr);
+ if (likely(va != NULL))
+ return va;
/* Check if the address is already part of the memseg list internally
* maintained by the dpaa driver.
diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile
index 9be447041..674a7a398 100644
--- a/drivers/crypto/dpaa_sec/Makefile
+++ b/drivers/crypto/dpaa_sec/Makefile
@@ -38,5 +38,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec.c
LDLIBS += -lrte_bus_dpaa
LDLIBS += -lrte_mempool_dpaa
+LDLIBS += -lrte_common_dpaax
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 7c0459f9f..54f1913f2 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -107,6 +107,12 @@ dpaa_mem_vtop(void *vaddr)
static inline void *
dpaa_mem_ptov(rte_iova_t paddr)
{
+ void *va;
+
+ va = (void *)dpaax_iova_table_get_va(paddr);
+ if (likely(va))
+ return va;
+
return rte_mem_iova2virt(paddr);
}
diff --git a/drivers/event/dpaa/Makefile b/drivers/event/dpaa/Makefile
index ddd855227..6f93e7f40 100644
--- a/drivers/event/dpaa/Makefile
+++ b/drivers/event/dpaa/Makefile
@@ -34,5 +34,6 @@ LDLIBS += -lrte_mempool_dpaa
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
LDLIBS += -lrte_eventdev -lrte_pmd_dpaa -lrte_bus_vdev
+LDLIBS += -lrte_common_dpaax
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile
index da8da1e90..9cf36856c 100644
--- a/drivers/mempool/dpaa/Makefile
+++ b/drivers/mempool/dpaa/Makefile
@@ -31,5 +31,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa_mempool.c
LDLIBS += -lrte_bus_dpaa
LDLIBS += -lrte_eal -lrte_mempool -lrte_ring
+LDLIBS += -lrte_common_dpaax
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/dpaa/dpaa_mempool.c b/drivers/mempool/dpaa/dpaa_mempool.c
index 1c121223b..b05fb7b9d 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.c
+++ b/drivers/mempool/dpaa/dpaa_mempool.c
@@ -26,6 +26,7 @@
#include <rte_ring.h>
#include <dpaa_mempool.h>
+#include <dpaax_iova_table.h>
/* List of all the memseg information locally maintained in dpaa driver. This
* is to optimize the PA_to_VA searches until a better mechanism (algo) is
@@ -285,6 +286,9 @@ dpaa_populate(struct rte_mempool *mp, unsigned int max_objs,
return 0;
}
+ /* Update the PA-VA Table */
+ dpaax_iova_table_update(paddr, vaddr, len);
+
bp_info = DPAA_MEMPOOL_TO_POOL_INFO(mp);
total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size;
diff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h
index 092f326cb..533e1c6e2 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.h
+++ b/drivers/mempool/dpaa/dpaa_mempool.h
@@ -43,10 +43,8 @@ struct dpaa_bp_info {
};
static inline void *
-DPAA_MEMPOOL_PTOV(struct dpaa_bp_info *bp_info, uint64_t addr)
+DPAA_MEMPOOL_PTOV(struct dpaa_bp_info *bp_info __rte_unused, uint64_t addr)
{
- if (bp_info->ptov_off)
- return ((void *) (size_t)(addr + bp_info->ptov_off));
return rte_dpaa_mem_ptov(addr);
}
diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile
index d7a0a50c5..1c4f7d914 100644
--- a/drivers/net/dpaa/Makefile
+++ b/drivers/net/dpaa/Makefile
@@ -38,6 +38,7 @@ LDLIBS += -lrte_bus_dpaa
LDLIBS += -lrte_mempool_dpaa
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
+LDLIBS += -lrte_common_dpaax
# install this header file
SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA_PMD)-include := rte_pmd_dpaa.h
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 3ece996e8..4c70a408a 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -104,6 +104,10 @@ ifneq (,$(findstring y,$(MVEP-y)))
_LDLIBS-y += -lrte_common_mvep -L$(LIBMUSDK_PATH)/lib -lmusdk
endif
+ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
+_LDLIBS-$(CONFIG_RTE_LIBRTE_COMMON_DPAAX) += -lrte_common_dpaax
+endif
+
_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += -lrte_bus_pci
_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += -lrte_bus_vdev
_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += -lrte_bus_dpaa
--
2.17.1