From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50057.outbound.protection.outlook.com [40.107.5.57]) by dpdk.org (Postfix) with ESMTP id 16A111B4F8 for ; Tue, 9 Oct 2018 13:26:55 +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=3shk2Kr37RArH9TYYQzNEvc8yLhdeaHGKL0eCWmUULw=; b=JhoJXH6+isyE03DTL3FMFKML7K2cBdk+v1jz68n+ChqLQGVawAJtYX8PexMtqVCMSiG9eo09qgxtqQ8zmdL558LB8SOGkYU2jifXTSxBIHQZRWfStd/3g7LWXvAzfRGd2W81kapMv1g2823KeV1/NxtCcAs/dbT4qhfgBGDa33g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by VI1PR04MB4686.eurprd04.prod.outlook.com (2603:10a6:803:71::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.27; Tue, 9 Oct 2018 11:26:52 +0000 From: Shreyansh Jain To: ferruh.yigit@intel.com Cc: anatoly.burakov@intel.com, dev@dpdk.org, Shreyansh Jain Date: Tue, 9 Oct 2018 16:55:47 +0530 Message-Id: <20181009112548.7025-5-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181009112548.7025-1-shreyansh.jain@nxp.com> References: <20180925125423.7505-1-shreyansh.jain@nxp.com> <20181009112548.7025-1-shreyansh.jain@nxp.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR01CA0097.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00::13) To VI1PR04MB4686.eurprd04.prod.outlook.com (2603:10a6:803:71::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fbf30ac7-aa51-4d87-34ee-08d62dda1ce5 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:VI1PR04MB4686; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4686; 3:ix8FOBMu56f/XnWT0sDid7RrL1mybzZ0StuXCnAacy/ULmXbOM5/yuJalGk88nPAjIz1EokYAzyx+5+57expzW5zc/HZHgSpovL6vWWRwOLYaBYcKRI5W0B7ScSvamgKBSJLc7mGQc44/q5T7PcGBmN3WUjqn4u+etyVNGdKGAG6Pe5GZ34CiFyD2UPZMAcfs/PPvPSY+285nSWU5FRmthhXMrcZccz/a+/iAqKWzRlvNSp/bp5noWQVrLFYpVY2; 25:JJiYzAHLJUbKAx44lbaNfK46lqG7j9cYrthr9asXsG097LUMzNfHhbfTgoHXKBH3MyMgoaCBQbX5yKjzADSav7ROgsIAUYef6itcr2BHNQYHV/pFNCvNjZkmLAd9dePaDDtTTC+ie9bMpgY7OWTKHK/yzNJ3w6pIaxThJN4srV3Fdajx0qTqL/92RqDLe2ln/ra5+y1thhdzDfwihqCxUEkParrdYE4B0ynSj64vgAbRSBpx4PVzDj8GVOQhgaIZSxeLer297GGWkUDHNpFq0XkihMLqnGD/O+ivMM0ZtI79LuP6+uGlVcamLA3+edDMstPkS7j7skUIvquT7K+bUA==; 31:BPtCRnmGp4w4VpyCimM+jPFVRTTDur0ssaVODOm9WNu5bec5Nrueg6Tc5HbO7ndK/YpeUfp0q/nKbGJ4c/+wiPHknrUgr2I2N+7zQWF7OLd8yodurLovd5wpM49FrtqMaXMAQxYRyF8G1dZSJ5J9dHTYpPb5IgAbwlW29ntjO6+w51LjtCTW2GI/+lSr7RVHv7dXZ9KAsWxVcEONcuDJrd1PIhuaM106FryC0JaJ2Xg= X-MS-TrafficTypeDiagnostic: VI1PR04MB4686: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4686; 20:pe4ZsYKmkD9CTemzytnSHLkqDkz8GWxLl+iRtEyTaZqeaJs+MqHskdC0B1ggbWAWKbb5vbfIhSYvY404kMEAuPfEvB9uiVouURwrX7KfCp13HebsjCTzxBRQ7YJuvZKX9+c+YCKjDm45TaHDt1UpAKPwm5Zfawc7CBH1gTSDx5ZWF9Q3q/tyWXJSuxUeMBvsP4mQ7V8OpaSwXuWOIFFm9l8k+EaLJ06dPaqZ/75dvLpHZhawjqvcYW23U+8FRVzG4gXx7tGhjGlV0zCNUyrQ6DjfaZYXyKYquPEb3BHJUhDL8iCR/N7jbeBbMqEH2tI/pqlgI+UKaEiq8kNQfLNlUDDLaRRLwwLnmC4ilLSZRcHDwxUIyXHUyzPmt89nBsFGXxzzEvjXTAM4AJ4noApm1yy9+kS5EQCmicQi6z4FK/IajQ7QBm5gTIjaL5f5pnxQjAmTbZm0LB9Krp9eKsLDn+1OKeNx5aV0Du698b1qr/y0SnPNFokG1r9ekqQMGDK8; 4:Y9G0bZQEZK+5LwJxM5vOPreV3UPvs4sD5m/FF4tGfn7coC9ffCgyTeLpA6ttESaEAQZdn5ZeUXkrsFxF8dPGnDfQELFtnrscsDhod5nuWQvjcXRetIGOoAFOnDVe3wV09krXGYNWstAd5eZeiFXlbSZxqOfjKfSn6aU+vXrXGO/Bbq7RvZ2KZs+P67Ft2y/YA/WNNHtzJBWorQkrIAk5s0tlq+iY46/CB+4XKV9BKLBl90FHt+0LUM7db1KPv3T/uViM5hJkR8gLUV5frG1Q3m2QM7mXMkQYDy8wf31AQ+GOyZsTvLxX+kn9oA/7LV/G 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)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:VI1PR04MB4686; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB4686; X-Forefront-PRVS: 08200063E9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(366004)(396003)(136003)(199004)(189003)(2616005)(476003)(6486002)(446003)(1076002)(8676002)(25786009)(50226002)(81156014)(4326008)(81166006)(6512007)(956004)(97736004)(11346002)(386003)(55236004)(6506007)(86362001)(575784001)(68736007)(76176011)(50466002)(486006)(51416003)(14444005)(16526019)(8936002)(26005)(48376002)(44832011)(52116002)(53936002)(186003)(305945005)(5660300001)(478600001)(105586002)(7736002)(2906002)(6116002)(3846002)(106356001)(36756003)(47776003)(5009440100003)(2351001)(316002)(6666003)(66066001)(6916009)(2361001)(16586007)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4686; 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; VI1PR04MB4686; 23:kxVQrZBbCRy038C1gZ8A9S/WK++qYPY9eEHZHWnVX?= =?us-ascii?Q?R8EatdqGinOxX51yZSuDGND1s84WoFqpT10wfZp6doCTx33EmbVz9YPA9rV4?= =?us-ascii?Q?2Vg6F799jbTmeXw8ZDBknCYLYZP3qGcaIqP4NHS0dfUm91xGkYtIPCoafIOT?= =?us-ascii?Q?+yaZNRQX6IsOlncL2Ohx2GSGiziB/dQ+YTMdlylWeBdUO6tOuy2QLZXIPGez?= =?us-ascii?Q?VxhS+FlIcdVtqNGhEMOeYCD84W12ZKMAp+J2kF/ytae783Avp2gbl/EQBPnX?= =?us-ascii?Q?1tKUyhcmbIWCKLsXrUJONZHEPbbrI5NQoaSESE+6eQMnMIvhtcd7rvT/G3OS?= =?us-ascii?Q?yCKutdI5L0m51vEZcudQ2wh0I+ioktNQuwm2ZoFN8ElHIq9tZ7DfIgCyiM4j?= =?us-ascii?Q?432/6QoWNCU2Sirjq5uUln1vufVU5cqmGYdQPNp6Liuiuts6Jb8bms/V+6d3?= =?us-ascii?Q?zryjJ097Y3RkqWtjS0TuLUKHfv5l20SnONeTqKrenlgntyCTY2Mh9IRGHbLh?= =?us-ascii?Q?4pBevv0EVdluncATtZTVEeN8lxoU+ORkTg6Irw180ETfigkLNaeR33ALMAhP?= =?us-ascii?Q?loayZ2r3d25ZTEPizXMOIFbfGBxBLhJT4Np3qcWgoHQsMNIeE8j9aiD0n70M?= =?us-ascii?Q?sa7zl6ZgiWUc7TAUH/L2TRnMuk1FmsXgjk0gp7Tqin8lj5VEbKfmJ7w55QEN?= =?us-ascii?Q?ja9Cx7lZmvI1GXqXzs5iEK43c6LqfvzSm73T5/iEkAvAMbJSH+baPvnFwZsx?= =?us-ascii?Q?p8GTTlfXwEgSODaXPOmRkrcpCufyJEAcK/fYsCqo5ivxL9oHMUbdTZQQoMlE?= =?us-ascii?Q?QKbAcsOupnOXVhE+c4GvrltjX3kjVYflmGxi7ETi0mIHtoxI54Xxp2JZa6P2?= =?us-ascii?Q?uWJUG1vt2TLuJJpYEvtCfj3CP0MLGo8vIdoaPp0C6gWZ0v215PpXAUIziQnn?= =?us-ascii?Q?9eADn4g3rOwkbwhyXXklTh9uTEY1NLZTiGZLRl6oFFHRW02/74JXrNdpZ/lq?= =?us-ascii?Q?Z+m+5zjdOQaED/ydfmTOe9b/i5xEq2XTuTaPEA5tavR5TkmhhtFn8lwNIz1h?= =?us-ascii?Q?xZS3SrdEQdOfwm8PevA/odbnDNEZ3SeKVUXU5l7/JUdMwGJHqzcXFvlPGeEC?= =?us-ascii?Q?viuZkMOV0g5Ya3MizaQNmnbVdkKH04kSahA8+QaYWCcFyqW419pJXJlv/C2a?= =?us-ascii?Q?4RL0UGIufOXoAgXR4RH/CBLa5VtfNYs0Qux68IEXxvz20b7cDZoLF/10VXiw?= =?us-ascii?Q?Jjxcf0jW71Vv/gK8J+4cbOb5cUy+NS9UUeFQIobar8iR4pJcW5J9ENCNEfbT?= =?us-ascii?Q?gcc6JNWhhitT8cCyrwEkPKCYnB/blk4UgMjHv7XMsnEOsYgnx6JD3NBkHZBI?= =?us-ascii?Q?zJYBw=3D=3D?= X-Microsoft-Antispam-Message-Info: F8kzbTmOPm9EkLskZPGJYs8jnHXJSWfywUB2nQBQTZb7HO+71zkN2yAr/lufgHfWLwuzNwfoz3Z+tl9sCAdLBaBaQW224aCl0woruYqdjU9evo9pjFNSsYoKh/xHYpYa7XYrFYlZzkrBijcGHeQI7ZFQQUtFIpBUxaGzgRFwIQjFZbaLnqV8n75svi36oQffIodcznTvZYH14XJzL7bmfakgm6JpX86zyOA2oFiOYV4pdun240fXkaIN4fFOXLCuz65tRC6WcVxusXkeoeHKCpy/H3/5Cd2ereIqXkw/FK/QBp5YzAwYOomr+1x4HmkIyf0sKkM/zNIjxp2cLY5fdiu+p+EiN7wNxtpYiu8f52k= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4686; 6:yJOpljmHm5CJJG5HpAwI++EzK9UxD8YMxIPUQ9Zm5/GnNva50Kh3udPQoUQPInYYY0vB72ZcOttFIL2UrqRohxcWYxQi0M3H1I4BZUzoprfvIETi3Yy7gBnHPNCwKe9VqgaH5igozIvmYF6WELdK3LWgamqxufrwNlp+bY5bYR0T2/LfNsGWxB3DHmIlASl/pnaMA8MDI5uok3e2XNSeNDp07hCPr6JADPKho8Q4k8t+y/PX3gRvpZKuYmFth1+2j2HwRFczrcfSnVMb8L9Ug+p9/2XVmurl/8UnBnar+Fk6Xf758EBU4KLmd66ZgG1OKlBnpVqyzm3pgzerZXzMHepyRbiUknWKU1SrGNXR3LGsKIRyBMWSJEWcCr/hjFKIid2lK10L5loQP/I3Y101UTfvhCPdcm5beCOfZ84TNhG8rW9G+l1HgOodXgJ1ZAcFkbfN5p3CeEgqv8Cq1vmruw==; 5:lS1vJgFTKisdKMN3BJ7w1U6BtRON+SynQPfIL7MGF0mw0OuP/P7NNy4Gv4LBb1MD3IkeBrvTO39I5z8N1jEmxxg9yQCoUF+MKUW5zH7LuWjlv+KHIvOmuVwD+/21c3Wp/SAcxAVvuQcrgHaiN3HWy/8f9+q4LgtP6kAbv8D94hU=; 7:UksWSg8q4aRui+RtZ8AY501RXe4RU2tqe9ijctp7eP8zK7YQNpXREmbtiN/i3WeVbcmIOrIW19hPOzDSYUZ39+unVXVVafBw1kh9J4FBmYmaPgksGa/zmNQSjO9RCUS3jTYAAQCkiuz6kwlkbVwqvxpKd3swm1gazPHWJ9NBTmNO3+N2JLuwdtxJnr4tQ+0lGHfzLpAFpsRsWZB1cgJVz0ND1CyTOZtWdBxB/uclIJWF8lgn+W/bVWWcczuOHf8p SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2018 11:26:52.0851 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fbf30ac7-aa51-4d87-34ee-08d62dda1ce5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4686 Subject: [dpdk-dev] [PATCH v2 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2018 11:26:55 -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 --- 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 | 1 + 12 files changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile index bffaa9d92..5eb7c24db 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 49cd04dbb..b373742e7 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -546,6 +547,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 d10b62c03..42676fbc5 100644 --- a/drivers/bus/dpaa/meson.build +++ b/drivers/bus/dpaa/meson.build @@ -5,7 +5,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 #include +#include #include #include @@ -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 #include +#include /* 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 32579e4b7..15097995e 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -115,6 +115,7 @@ ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) _LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += -lrte_mempool_bucket _LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += -lrte_mempool_stack ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) +_LDLIBS-$(CONFIG_RTE_LIBRTE_COMMON_DPAAX) += -lrte_common_dpaax _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa endif ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -- 2.17.1