From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10087.outbound.protection.outlook.com [40.107.1.87]) by dpdk.org (Postfix) with ESMTP id BE7AA4CA5 for ; Mon, 15 Oct 2018 08:44:26 +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=IlrOATEw0U00VBeYSI6fNoxoNIAfs2zg8sQpsIIICtx17qFwhvWup8M1ZyUCQpyLvVZTzJKb+gKYGyqg1KNSguZYKkRuzzdJw+xdMYmEFjVqogqZBtkCpwKA4MGAHdmPk338o6TY4npNB+TAoUDNhNlGNnlTU4i5fxDOPHhuTgg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM6PR04MB4677.eurprd04.prod.outlook.com (2603:10a6:20b:1b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.24; Mon, 15 Oct 2018 06:44:22 +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: Mon, 15 Oct 2018 12:12:01 +0530 Message-Id: <20181015064202.20802-5-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181015064202.20802-1-shreyansh.jain@nxp.com> References: <20181013122130.22588-1-shreyansh.jain@nxp.com> <20181015064202.20802-1-shreyansh.jain@nxp.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: OSAPR01CA0083.jpnprd01.prod.outlook.com (2603:1096:604:b::23) To AM6PR04MB4677.eurprd04.prod.outlook.com (2603:10a6:20b:1b::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b9db1be-a4bf-4ed1-bbcc-08d63269a60a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4677; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4677; 3:L6zQg5AlowxEyHIx2vBbpQBGnRl3hev0h668N1DEOhz6Z6I2ACeUPabR2kpxW0egY8oxKcADysaNs5eBul7Xz+fj780/O28PH827wFx0QrKP9uvraoX4WyU23swOutKAmI4sn7EdB9YpalLCaQ6BsvV6hewlUgrH+FX8GY3CY9nqCaHDtc9uDXasDHRcX0sjvjpDtPI1SOSWom087USCLlP+QAjQFKuNN+H3zXC70CTlRkcEvL9hPWv1Q2adJhlD; 25:ieknUkjWB3JLOYyx38vajiSmiO8xY/xsitnFwu/43nfkoANWNrn4nOFzmohwC9kcCyRlkOZoSiI5CGM2r0rlWTC/v6nYkQuySg/1/yNK2RhIxK8f8IU3DEAn5ohK5gB8FIIq5C7X3hp1Lu8/LxKiddZnSHn5DTmJ41TXt4TsdB7Gx6SHjL91eTyvJBwNJwExH+FOF1FwdFIYWGLFmD1JioAwdYNV/6Jtdx3/8fEhhiAsQVhKNmHsaeTJ/+M1cB0TtbS7+4LFShfI6COof2+LS9O7WpXz98cudyZYxJndDz0C2mHJWZSHtAjdGhReYIgqn3rX9DM3e713XUIWCecBLA==; 31:v/UDgiwFlJLZ8aMsxoBlFabHoUEPal79Nem8QIeKFg9/I5gauMMr6Fde8ozdMKIni3nfeUPcTNEFITXmmioxiwrsyWOAdwXd9dOUpdmjNm0S3+JLe2c2QB+Ml8kZeRgEMuQJ3wHZbNVzCrHoA8zFRyyggXIwi9pB4aleAmbwy16wT3WlBMcrz7xCe0vnC8H3VdmDUT1HJGX4RSLDHOb0186F8WJ9yKw/uRf/ndUTsSo= X-MS-TrafficTypeDiagnostic: AM6PR04MB4677: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4677; 20:67RMxEgP/a+dBL57k9XKvBdJfP6heggRYfRpoUVf3rV1GeBS7sqGEngvQWh8bNmuxAq57pVEu9aBT2HRAkOXvTZHLmqR1+32Vg6TcJK80HZ8okZQaIMQc5V8gYgUH//9m0KPcVJrb5qVWVnjKe46WXCPJoQWZZCnunYySazYeA/M602S+k3BT8wHGfmS79lqrYe0U8/LrpK2N6d+7rbY9CLSVuDtPYLnMONPdukTpQUwCl6LgoPf+jSWQKTmFt6LgKJYACw3UGh3w6+90hb+dOdNXuiXL2sWAr4wjiCYzfLWxOnfhRSKSkvvJUWr3UQhPWdka1u7TzL0lrHX2iP6o5WNY78Bir+OMPdvN2u3KIORgU4IRtv4DxuQKeGEbCOTP0n9+o1XR1PS+PcZFTslyx2amDBKiLbed1yf8DlF5B7kniGTrkFUniD8ZrXg22yZcKck3PThtnA7uXKXYLA+5SGG1wR5TNB7Pu1IgCI+2WrZYgPbNlqsly5plF4O35w2; 4:XhHxXGOQJ5rpdmsn2UYRO9EejxA2LM8rxL4v/d8OYR5u5NkCCwp2TacMbbigyKymzWhx3ga8UMr5jKqLf8VfKlk8tLlC29aQgw6bFfPczBfKLEIyYrZ2T/rTzvJi1KllKbGs48AL0Voln+iGo92V0+cjSjTNly5LTQbZFAbYPHjPD7l//jwBFJ0UzNj6MNivSlwi5LFaW9UCgkdOCQW/qywcMCeARp00uc1TU6qhPLA4NVINZClYISW+Qi75HoIaOckLtaPLtypGmhz5yx/dR/gugk5/v+w1vapgvzA24+jtzk9ZgRX0y2taES3rqEnN 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)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991067); SRVR:AM6PR04MB4677; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4677; X-Forefront-PRVS: 0826B2F01B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(396003)(376002)(346002)(136003)(39860400002)(366004)(199004)(189003)(3846002)(68736007)(50466002)(6116002)(478600001)(4326008)(2616005)(476003)(446003)(1076002)(486006)(6512007)(53936002)(50226002)(186003)(5660300001)(956004)(11346002)(78486010)(16586007)(14444005)(55236004)(6666004)(2906002)(16526019)(1006002)(52116002)(81156014)(6506007)(81166006)(316002)(386003)(44832011)(48376002)(76176011)(8936002)(51416003)(8676002)(86362001)(575784001)(7736002)(305945005)(26005)(6486002)(47776003)(66066001)(105586002)(106356001)(97736004)(25786009)(36756003)(110426005)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4677; 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; AM6PR04MB4677; 23:6zemPjYK2WXTqwkQ+qYfkFwvnEN94oLhogikMgTNi?= =?us-ascii?Q?y73jG96OlqaS3Os+RJBx4iGCfGTujjz1EzR1YY/xWLbM8+GXt7TiNo98Fxeh?= =?us-ascii?Q?YOHTabfdy7dHtYKdaRhLd7CNwUDA+x/cEJyO8C6qULAS0Nd7tYmjY+GHHolV?= =?us-ascii?Q?ZCI9N6HdNXnvz6PIBMv/ns4AccV/ZkSGI6DrpuY7yRdD3+MrBj38pHBTf9dG?= =?us-ascii?Q?F0LCud9L1/qHOi0hIiEqGhd9SMLxDNjlsiOPlgbfR8RsC6eBCk8kJPYVRjW9?= =?us-ascii?Q?ujnaXYKUzlwv6v5W47H3nh6qbIkCSTG5Hsh6n0H4jZ52jPbjRAzRdfO1weqz?= =?us-ascii?Q?4qcw9RFasz13fMmLr1NvL5Nhj3o4fSPzqMvvYaekFFCR8MY2ZelP/Uu3mKBq?= =?us-ascii?Q?olb7nr0bhFOAH0Idi8Bbl7lkyX+8cLXoPykrBQuGFH8vNwyd9x+IFwVw7ejE?= =?us-ascii?Q?CkVnBd0Z9MTKxnfCQUXZ68NryRB8ABH9Mp4vdEhVkMKH5YzwXG/vcotyQDPK?= =?us-ascii?Q?+4IVVPyohuvAS6eNzoACaYrRgR+Y1vmvqFXQCvz8rvlbmEY5GQ/3KYG+VYtl?= =?us-ascii?Q?5TYahWuh+GxwkKWTgQ214g8I6M0+wjTb+9AdA6zl0xz8shOTKCjFX9uru/nK?= =?us-ascii?Q?ar15d2nBO9k9xC6IH/5qb111XMdAvbh3oZSZ8fmluhymMvXgXjvhSDiMdkux?= =?us-ascii?Q?OJj38cKQP2pKdQImGiuKo8BMtBiliKY4qO74XGJ3NTPdWlqyDUY+H00ypWWf?= =?us-ascii?Q?rCtQo0slwdzbcg276uAX0NjIaFvTM0VjMOgMRg1W/j8PYilxclYaicf5qlWU?= =?us-ascii?Q?vUPq3xpOnt6nKS61y/YWV0PcEKI13nvetariHLSC2r+MnBVgCjTEwTKzBBNx?= =?us-ascii?Q?oiwF+TUgkFAbeaUDMeBwGp2ixOCFCPOJ8k1EzBjpqA5E81gliZK4tFE9GTOM?= =?us-ascii?Q?xHM01GdmAW9oon2a+yizjAlM+AW7jaZW7LrK79l5j39Gqy7p4FL0AnSZwGo4?= =?us-ascii?Q?8CGI/5rnd3cTalAOAvkIC9HFUAcXw41pdKSxA1WD+BoauMspJGEb++v9zZqw?= =?us-ascii?Q?g2J413bMFRqL1lNv8M4lYjF/R2OGBr9VOLaLmzw0rEefa3l8L1m6sLmGhUCg?= =?us-ascii?Q?1i4ep7uF6LqY9EJ8uhuR1JUvXYTp49LLXgmtsxrTgBBrnu9Et6PqFH9Ik0AE?= =?us-ascii?Q?sfzid7nhfwhBH7AQMwNDXAUKDhH74Y+i26RwaYQSQxTIlQ9VdW80h21jUk3T?= =?us-ascii?Q?ukaSrnT2ftWp6C7ircXUrXA9dwoaGYlFSd6/Z44Fok7q+dyO1Agi7RMx2cgr?= =?us-ascii?Q?9wEm+wpTqFWCZNpgSWySKlcb55eRWcMYNvS7Bpxy4zMOEeUKBi7VcIezMV52?= =?us-ascii?Q?hhJVY3w37/0T6xC6Yi1QXC8R3EGRzuDE7Z5xD/aHH6zaBf1YSEH+br1XP/i3?= =?us-ascii?Q?1h/kfDXSw=3D=3D?= X-Microsoft-Antispam-Message-Info: F4h6dZaDtHj5eSPNtQACb3gO/l3zcH1xV1YYUI5OemNjVlkqLsUjgZQV42fkww04eijCyLkxsdQ5XyRReKdyuiNiJzlE6YYViaWc062mzDmHtVArpQU4yBTIcR9TbrmSn9PEt+pdHrSmsUnxzYU4hEeYQPhwMZ5zXArVPGSAM092PUvvF6Tfdfob6qDjdaamtwaWgFNYDZU5zQ+LciiSzzAKC1Ub3gDeJ9On+s+OVpz04ahYOKlFVNoAGaYOuloj1n6mnZ6dsgfK41FMSKoQ+9CKKCwWaYSD03BeMJnVVQiTw9txwTSE26jkB6V/LRjShTHd8HYgECvHQgzZHe8HLoF3FWuccocl0BsoA93Dg04= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4677; 6:qd2gvLZhlks2UymWK/VxrRGxdetli6yqKTM72biOggyG0jVMMiUH5AAzzY6zuC1KxBjKDDyi3dbMekyv93CiAB12JcGCIWh+RQElgt+oNkYQtjV1od1UClCU5MYNW9bdzZK9JLD6s7n1Kx0fO9tnRaYNqCieueuKjSDwskMBeoVqqZZA3+NTXWYbFEpIMr60f9tHcSqKgHMTC9HgBU9QF5qIvN8cM3vWmSpujh5JtbhA2wUpPWc3o4N1mv1YeA5ccT6CAicZsuKcKaxrPvQWity/OsX6LZqNduXJS+UbiEs3wvpeMzkVReBOJdjar+hqqYXdP4lyisCOsSrBHAOsl3ZwFUICKSXfQmQ1Y75dWGRxcFqDu7i7+8ZUxqnefX0ixtdBiJ2+GZmNXeHhfoU4GVhDcj293JFhwouO3MT7MGxe38qt5vgKNbuK/tQgianYqt+niYco0JDKml6BckrXlw==; 5:qk2XZlB1LqOaPuyFgUr02qzOGddzS/WyQKd8wOgbL6vE0sXS1OIlPcHQ58NFRQ964BqBTYkXedIO1y94VWXa9FkUW15TbnlMCUdtEKLQd460bc/V3F4WiPMV6/UMoEacoAyd4cTwIqOl7P0oECkx0W2X6uoKCIN4lwv3JUvsM6g=; 7:NS4WZjwN3c8nUSB6yqBPItuILb6EHh1C2/TupIhReQQ2UTtdviBnU9JPyvUXSkaNYWaOd0HjXMynWhxRhGHTTsJmpQDA2AjbYg6/oV1Nfa+Yv592r7uwphEY0FAd1lhPZvxndocJ6dMaWHc0uC3aQaVMpEeFmQnLlRT659IZRhaucdVLD89PiYEXhj4nU07EYYHyiTy29tASP4USQ5tkT4UFgtrg5nqjqNPa1k2V+eFe0/FW5XOCnht+NIt3fZ+L SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2018 06:44:22.7398 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b9db1be-a4bf-4ed1-bbcc-08d63269a60a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4677 Subject: [dpdk-dev] [PATCH v4 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: Mon, 15 Oct 2018 06:44:27 -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