From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20046.outbound.protection.outlook.com [40.107.2.46]) by dpdk.org (Postfix) with ESMTP id 1067B5F34 for ; Sat, 13 Oct 2018 14:22:22 +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=UmsqcwKJlQ4mQ69TqNPtzVtwWiuQ0O129svT6CHDj1U=; b=fAEYScxU7GMTehU+5hU/BHcPkuHk4I3Of4C+5Ql5Ykv6Cope6FLVPUmi3YiAgF4QUVyF96otx2iK0SGW3TOevu+zrCsUPLNJg3lQc6KNv9re8ADJ7uiGR1pnGgEdQXoOMibT3RW1ze9LCIqz39k9dtOLdR1q1G3YJ3Uesep+x+U= 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; Sat, 13 Oct 2018 12:22:19 +0000 From: Shreyansh Jain To: ferruh.yigit@intel.com, thomas@monjalon.net Cc: anatoly.burakov@intel.com, pbhagavatula@caviumnetworks.com, dev@dpdk.org, Shreyansh Jain Date: Sat, 13 Oct 2018 17:51:29 +0530 Message-Id: <20181013122130.22588-5-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181013122130.22588-1-shreyansh.jain@nxp.com> References: <20181009112548.7025-1-shreyansh.jain@nxp.com> <20181013122130.22588-1-shreyansh.jain@nxp.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0046.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::32) To VI1PR04MB4686.eurprd04.prod.outlook.com (2603:10a6:803:71::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82c87c58-b032-47e1-ab3b-08d6310685f1 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:54CzLbeyfppRG1TTCFxaxy7l4jHukaSNn3jTmADCtCu0hjjBOyXqzRLv21zFJe/S1aEMbLjDktg0nqUUcvwLmZlVRkMP6UD1K+hsRObDL1QG9yKN8yvL36sMkwueI1/wSN5psgFJEfSSL1zJoZDfcscuEVdcSkxFQR2H5sdv2R+gJM+FH+OeZOZI1N9BNhadwLVAAIjeBjjRY+a6halsMsZRrsUjDpNlxCGJDoH1d8oUsjG6r4oh65Eh2d3Or6sp; 25:Yc7KiSM0Kyph0NHZdlH/kHVMi26Fu9xCxtOx5s7gM+yBieuEbxHHz/BX21lF19f/IChQI1p33MQ/O1coIchxbgKO65VWOe3++3qEthbz/TZJoGCYyNg4bNXcbBc2ULUB8FK4R1uCPMyHPYv2/uQyqfvS95LGTM/1tLnkfrYSuSA/F5fl30SdTghJmxlmMQopSIKMXQmninvV6YEhBfn5zWP6+bnl5fN6c8BT8dGk7MzM4J+4hrwzHGk5d2G2iNo5sG90le27q0UnXjglhXKv3p+TmzrBntcARq5WncUAojkVNf58QMfKei8zt5LdY9JJ9hM1C8lUgOV6n6J0iyO8EA==; 31:lmmL9jEA4KIAyY6If1T5rr95qwaMfWD5Ak/dBJBHU4lkxuempww0LzXTYJ123eK+QPTSOtsRuEOkT93uyTY24T3B1szGp8hOJbKPezu6CnAtPlbTZj5imYVr4BxWvkDeyIO41ksItBFFWgyuBmPcTLMtFPkKSS7Vd5o8ZwiyUoDamnDyc+MDgl2/xfRHOYZeP9rtCKXvqgY4QbSRv3zUK0myiNC0PlpbmudjcShKItw= X-MS-TrafficTypeDiagnostic: VI1PR04MB4686: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4686; 20:TQL1wBfaourvSZAogen8VJAFNZf89ZO4Na0HPI1Kli1XnmkVc7mHqZIdOBVWcYnhzwo648ni5KaVfRlzuwdx2iY1BucnRTlZHRorpdbt/w1zyIIqDGgPOaZVoJk6RnYuFUPKavhW/TmV/k1aAfmv/i7GATnE/JEeJAiCoowWq64fYyK9S/+qzuCoXjdTjjLiQgTzJweucvfAbbXZzS2ewHkdpdPJhvoLTnN2R2iu2tSVjPhnpgvuAx/q4ne6+fksjQ0dwU+12iJqhyUI47cQ1OphgV/FaMZUTtOWVUhxUD7nNU3bLGtGNAYZ1vX7eFWZWQxq5AuSFpRmET8adBUMu7mu3P3Qy58Z0R/hsfuIn+nIM2XbvNRG0wdzg0h7YJADwZlhhoDg9EEgioE08HhaW/3xBHQDJSICQYamaI+1yijn3mWD4OxQy+tcqV9MVi7rhxTL/A6x8L7BrVdPijCcIHox0q8dbehXYNBUUL7Qxz5StZwb/Phr+4wIXHFZUx/r; 4:7y0nIXiL0Aa7YYr/v2/5Iuu1ZPpWTGZCD+gLo+GVMnUA1Lxm5zg4PnXr5D0wGzjM7osnAxuQBITNyoiudk+dnKX2igZtxNQr2nnCv3cwuX2yOQmAMtZFCMFL5wMD23Gmyxf1+FtD3UfwMLxNs6mXgxTFiSlO+zm6FC5K23H9Zi6lMb5DEW76X18SuEvS4BMNXV0HWhSXjfpWTx62RI9TYPMT1IY9yzfs4H6la/bWgRskOt3RDDtai1FCRtKwcXi6ho4QChscRza0o5et1ME8tuvdk9HfX4Y6rN/j8ev3jOi4hcgqi37vznZzY30oFe7T 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)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699051); SRVR:VI1PR04MB4686; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB4686; X-Forefront-PRVS: 082465FB26 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(136003)(396003)(346002)(376002)(366004)(199004)(189003)(6666004)(14444005)(36756003)(486006)(47776003)(11346002)(44832011)(476003)(956004)(6116002)(446003)(2616005)(106356001)(66066001)(1076002)(3846002)(16586007)(5660300001)(316002)(2906002)(1006002)(97736004)(478600001)(50226002)(25786009)(26005)(16526019)(186003)(6486002)(6512007)(8676002)(55236004)(4326008)(6506007)(8936002)(48376002)(50466002)(53936002)(68736007)(386003)(76176011)(52116002)(7736002)(105586002)(575784001)(305945005)(86362001)(81166006)(81156014)(51416003)(78486010)(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:ERBa7P7AKFwHPfWxN8h9NPj7dqady1xg39D4KlQ6i?= =?us-ascii?Q?0EdQ9Wwi+A8KZ+g5xr1uIU0aljL+2tADzZy43xOyV0Sh5Kge08Ev+BMmdukZ?= =?us-ascii?Q?Fc73rpxwe2D3l0DNlqMJUFKjHnswq6kd2pm8o8bbSwnkPRhzQcI27WPECDXH?= =?us-ascii?Q?UMmPA4NC6HoNTl4ofwuVVYlAlfruS1UEU/LjmDs4hAhrz3T9er7Mg80zPYJK?= =?us-ascii?Q?qTAzEaq+0dm+Ygv/i0l7BR+HxUbrQ7mb0EcHKHGDufGCTIb/VZzp9fG6G+nG?= =?us-ascii?Q?UwrxIfZiVefZc5G7ggTJY45Dh9wixOsAFCoiep0uCh+eDczBpqjvqL60PxhO?= =?us-ascii?Q?rmMbmG5zkfLCd7rm/dEbJrgrSMwlgWeMFeemNBq5M4tdOitLlFyaPgCPel+O?= =?us-ascii?Q?1WDc1/9M265MSD9BCCXva+rEPlqGp2tFozAtTzsSGKBiZwPScJsdcD7mQ7fI?= =?us-ascii?Q?y2tgUtYeKklE9chahU0j3UuBGBg64Z6D1yC+cgi+V/yP/SwJZvS7/0uZuJEi?= =?us-ascii?Q?Ozp9LECLK2ZQJLtMpDEg2C/laBwMHxu4O8V7RIh6okkrhmXKqB9wEehi7bg6?= =?us-ascii?Q?oK8vh2OdYoy6XD60BkizionNAu4KFFoFj3658EyPG0G67qCMeT8J1tjR9Rd8?= =?us-ascii?Q?Z/xKw5fWAWN2ZoL3SoFtAsOSHVkZ30yZDySVwQpIQpxoY2zKKcpNAsZ5N6J/?= =?us-ascii?Q?xrK/GTwRSFpVy0q2UBRTA7ejBTXmJRTtIvsr2u+DW6kkgWZIuGO4YTkb/z61?= =?us-ascii?Q?WuolXjH/UEt9zQDMkQKFvPenmNOmdr2PEY+qH23sNkz59tpNsLv5qJfh6TQ7?= =?us-ascii?Q?CX818lOECkdzZSYHFl9snhuG6713NRykb+UHHtDQwPwBu4hpXiZ+Ct5dYEqs?= =?us-ascii?Q?A0KPZbquMT+KERlGeKg9WPmbhXDwn+MoRuCi5mQwQRylxKk2SSB+KZfDyBuz?= =?us-ascii?Q?BwseIoxRtSdllvU6OJHcdEumwD+t25z8C7FTayH56OkHCdUMfS/p7USHuNzx?= =?us-ascii?Q?PBqXCQ7lQBivoe8NHKPR3cPDBzoHmdJgsk3WQzNE4/qw1hErAnNWsxFTVidw?= =?us-ascii?Q?ZayGZgukxhQTSAzfXOvd0mgZtf9BlMVJivtxiIm+4NN3tAN1AwpdebwnoYpq?= =?us-ascii?Q?0Dr0n6OG+uXWGmlbCvtAE00Sv6g/VljprSLCDWkGeWou4iX0LlCmxLT0j+V0?= =?us-ascii?Q?xOwkHSGquXjriYlEWng6pEMHpeVcPn5xH9JmJptabnpsenJPvJTsafKf5jpw?= =?us-ascii?Q?Hmr/av5vLCWtOkgVLa3DjsQGMp3UzKj2VPaoAzLadtMgGwnUD2dFDOuC1ur5?= =?us-ascii?Q?C7ci74miBx6BMleqw2GOEk=3D?= X-Microsoft-Antispam-Message-Info: cUjxonbJ3Nrx30goT2x4wx8ul815poCbQrg/VAExRE68/bkhvs7FfIJQjfoGaG4UNgVvy/yzC6B7Nsuccqiah/6hOaANjXZkVH7kQ/zbc4PE7bZBdue9ZFkHWAAJsYn7UBQ0lLWnidrZmP+cTz3aJ6rzmM+38yWyhGtCzfoMiU8nd/6LgT+GC3n4uFqNu1PfsjWBONNUdBlZf4jkqGJPe2ik8eBk3HMxuZypBJZe7xzgm0aBpMTLiHMEQOSDASCW91jMHHIuC5+ZwnhA+nL6DXHnr8o3+PI7qHWpngciOMQJ9tk+Av9tvffY0P8LMBVIDM95uRLCg/e42kREr1kp17EihK6t0CJPVberqxV2oaE= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4686; 6:VTwzswvEVKUcqvVyDtTb3JIULXqjTLQDviBSMRHdf+UZR1ZOtSkzIsI2kXM7MjocukYYz1usDD7IR6LneRn8YYSwxdRv2jxtLzxadNeRcHzt9R7HMVrccnUPoqcdk5uWB1XCWz0cK/WA+2m5O7JRv+KQ0s0bZHxsPi0U2DBerc7r1RA+1PZ3dgolDKz3IGnoHw8KdIpcj9z759bOol0hpfrngsX2FCimTCQ35qoRWuEEkYkpmDXcvXv2KnJw/xyliLeNunsMu/Y5l7g1mtGV/EPUY33wJ0fWQCiY1VjdXmwp+sQz91EA2P+4wGhABlhvS/qfM/VtUy2pa5P5QXun3iqS8nOVQo4f1lNXQ0gNWfHE1umgGLjYq/ec988kn0pxFciVmkA9Bpofzh+sWK63jPg6VDk+bgLRCO1j2PmZURyraUdmYcp7N6QMUEbeFOT8UecA9quUa+3YEGEW2Q+23A==; 5:MpZHkw37jI5GSb3OfNkjq2b+54cYtTJphgJBc7NHNehypv8LT6cveHbSCzcbKYK+jKfzut0Xd4QPfLz87I0mOS6hIWwvv8MCj1Ej2n5nMKY9Q4mTc/uC9L782IrOVTLFKBYM7kVR13m+VhEiZnkOmOe/86TpOtUx+I95Q4hVRp0=; 7:3hE/WLcDYs4O3Qkr05Pu5D7vyrUMVeoArI/8A3ARBc/UKaZ2J+L/gwtRjzBJ6inYDW6QFeADV/3DqSo7nWMK8LzW4otxbsLolEwAK1+Dy7vmLYXcSvvDfA+ZFJLG2mwPyNVrpUtvT84FSOsjSPlExRPhfRDttGRqj2jwcqT31drhq/LXCgRHbMfPnAguq9fFsVenhByOoPcoexAwK/7ngq/vcaIqoklXcY2QBxRigtfyvZUdfxCewN+iL+jVATGw SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2018 12:22:19.3107 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82c87c58-b032-47e1-ab3b-08d6310685f1 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 v3 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: Sat, 13 Oct 2018 12:22:22 -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 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 #include +#include #include #include @@ -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 #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 3ece996e8..85605e38e 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -117,6 +117,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