From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0044.outbound.protection.outlook.com [104.47.41.44]) by dpdk.org (Postfix) with ESMTP id A21B0916B for ; Wed, 23 Aug 2017 16:03:02 +0200 (CEST) Received: from CY1PR03CA0040.namprd03.prod.outlook.com (10.174.128.50) by BN3PR03MB2259.namprd03.prod.outlook.com (10.166.74.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Wed, 23 Aug 2017 14:03:01 +0000 Received: from BN1AFFO11FD035.protection.gbl (2a01:111:f400:7c10::142) by CY1PR03CA0040.outlook.office365.com (2603:10b6:600::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18 via Frontend Transport; Wed, 23 Aug 2017 14:03:01 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; 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 BN1AFFO11FD035.mail.protection.outlook.com (10.58.52.159) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 14:03:00 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.39]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v7NE2Q32004389; Wed, 23 Aug 2017 07:02:57 -0700 From: Shreyansh Jain To: CC: , Date: Wed, 23 Aug 2017 19:41:49 +0530 Message-ID: <20170823141213.25476-17-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170823141213.25476-1-shreyansh.jain@nxp.com> References: <1499179471-19145-1-git-send-email-shreyansh.jain@nxp.com> <20170823141213.25476-1-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131479705804812139; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39860400002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(50226002)(53936002)(68736007)(356003)(8936002)(36756003)(1076002)(498600001)(97736004)(189998001)(110136004)(50986999)(50466002)(305945005)(4326008)(8656003)(626005)(54906002)(105606002)(6666003)(104016004)(86362001)(6916009)(48376002)(85426001)(5660300001)(47776003)(2950100002)(33646002)(2351001)(106466001)(77096006)(81166006)(8676002)(5003940100001)(2906002)(76176999)(81156014)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2259; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD035; 1:f+6qW7BsB/KYnaqYmDnw/oAhC7RdYbMFdyxQbf0PrxszMyLxQg6ZUsOVBy2Ytu7eeOEYzY9KlOEipCDm2BKBehtJZbxvP/HeOZunid6cWQ1iMUX1S3fzUpG6/0flf5Hg MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a002683b-d0f0-4e0f-2463-08d4ea2faa0f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603185)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN3PR03MB2259; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2259; 3:XjWh8LDa5n2HD54a+OelU8qLAfmnPfW9NzdRyQnRVGfWTdmGyQNwu1qiQ2ZUAmjNeLlLU038V6fyDRYoDYhjET0epdRy6L5hD9wI1vnfSO4dDb6P9aXvl54ua3PUs3LgAxdgq0xP4zL5HUJSMuql0d4jCPXdl/ERj+fly8KnrDjMMqq8B12CAN7lJ0Jw8pGk9rU6HatRkTRfmfNqiORDXgjW3dKl2kBUikBlD3zAc67VQ+G9vhMuV74kP80ee5dY5xtnh5edtgne6J2G9eO5emZSPkH13VNP7707IhOHHOAinAR7IXMl7KpofTUJ5h+j5v1E00+96//u4xZzhh64O9l0Qj4Tbi0mdGHVPNz3SNQ=; 25:07NpTVbrNgLPluhyHm7kcQ3zN1uXNZeMiV7Vy+NEPNeNSn8JJNYoO7qTB0yfCQEEk/f9uv8+ouGIC6vnyEVCaq0Em64Yc23yBSc2rBOOhAcPoDdAtCP773ojxKpiV1NzOIC14OKij3FcQ9CoovKkoyqYat+W1tdUEyUOyuVl0X2+bVRGzO7187oxAb5dDBbziIVAnR3yJOhNuEY5Pqtv7NmVN/VVzUubJgykUkc3DAPMwlhYUSi8bbdOWjGrK2NNbvLCoSD9I0Hb8CUtoY7dn+9JieSxErI+lJTY8wD6HksHDLjy5fLta6peiUqGh3A8K3nFACBtr2IMTZtItbZoHg== X-MS-TrafficTypeDiagnostic: BN3PR03MB2259: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2259; 31:GA4lfvu77oQlt02Ffj2/xTfRwk3mG7tiwapv2WaRrdJme5aNYoEoPMPfTK+I4cF+MC2ibG8cfYWZNBODr0IQkI+nicTMGLACIS7PgFD7UGiHrSU3NEXXuDqYEn4UC8ZuqWruqXSLBxKncU0m3kLjJ8uQjFHTTWC/+ok5wLQFlgEYgpqzeH5ULgMB0V4UaSqYskIOG6zQ9eDt/dtvr7UOuCV6Ix1HRF0bFwduUqAVTOQ=; 4:OBmokGrl409Fxc033eBLp829ynRygLf2ZZN6c5ki+VLpHjERb7SgKJyKjBpHR2xcTzCDTvQAerw12nu545XiNFiqk6tk5KlFYW2mc+DGqyoQywPFOzBlN9xlfXkUQlh4NELzA+gGZuZ5Y/TakJpjgpLPvp8zKAFNYdn4UnMenX+fYNJHHN/ODvUwk+6jkl/Rj+wESlIfkzIH8cOp1OgPhDt7Lfr3V/3z1fXWAN2J+LjxxpFIgsf7H7OLJrAVEvho+IdryjXEFBa2tdfyQBHLbq4xlj+ojCqi//5pGWN1aiWzgRyJkO8VRCjLYJDEyRQUCeLsW+aO2mGqsI72EeGnd5UXHWJgIDteBfLz5pSFMoFBUs9JkKlnPajBeeS/axdF X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(227817650892897)(275809806118684); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123563025)(20161123556025)(20161123561025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR03MB2259; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR03MB2259; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2259; 23:DOSh4L5am1/kLeh1PrY76hbMuJx/hmnCOcwjUbEjA?= =?us-ascii?Q?47P5cn8JyR8r4HWFhS3AlGE/NcJG/l5jkDW4IZmNnvYEZDFOnrwJr3X5fizw?= =?us-ascii?Q?3nqDs+EA03WDJSw7FUJU9Zop20zRTRIZcImazt0ipCPjjjIEisms6nVQ1Du1?= =?us-ascii?Q?1v5oVqWhZHC1EQMJ7MyznX44DmjfzdEzAmG1awNVOWQJVoxNAcQudTtDijBN?= =?us-ascii?Q?NJA9/afW9jKfqbWsdutl/taqXi7rAVoogTwv7vJsTv+aGm+wG/1ZFut/Z6NP?= =?us-ascii?Q?drrRS9H9/r+3/0xY09H9A2fhXPq3hZFdtBaWs+gDY4L47O71w5P66ysp2/GF?= =?us-ascii?Q?nQwYyE/CAPLDTOdq56uN86BOAADqauR3qjzBuygklQmFBh+Ib9RabHy/yOLn?= =?us-ascii?Q?u+ooLzlCp7XNB6Dh5mHM72xhKxzLFKWKG0lWASooibJ7x+6L2TH8p3M1/Xa8?= =?us-ascii?Q?F0DQG1d8AyakypsEVHOutKFEYj2RjlGWcK5ie3Mv/SHl9O8cf4q5hGaPZXpa?= =?us-ascii?Q?aoaNZB3SkcfSpYk+60o9iRk5TMU+MxqtAOCtTdbMZ8pKAuYUH6jggZRkvDGn?= =?us-ascii?Q?1py6KINzQ/bl78WxZOlvqqDB5mMRdHd753bbhuyGef+i4jqqitaOSYGGkN6q?= =?us-ascii?Q?/SzzmzDKNnTxjB7Dx6TMpHGLNlCCURhHOTy9BjZSpOaJUZcJXoKWxGU3XOBL?= =?us-ascii?Q?hujDi/i/BJBqZnsjjqO16P+LOPsTYOMCpldaVITBlCdvQi8gHxmJvy+G+Yn5?= =?us-ascii?Q?RiXF7JdzKoxLyukXYgel/x2TLgnTp/1p3kQVm3Cd3f2rJJfvIvhZdhwjWnbr?= =?us-ascii?Q?YxUO3V+HMFrAhctZvBZES/D6uvf2STKfIU+2TY/z42jzqariTdT/QHPsLBpn?= =?us-ascii?Q?UpBSwljcNtylX3TeS4dzqM9zbqo+e5xdnzKyFtxWT+8pRt+gp8IbCUljjZaj?= =?us-ascii?Q?NxkGRu6SSCjDn84hjmRVPxWAxm7SGNAGsxIbUfiNhJ5s9d6yggElKJy6yIyk?= =?us-ascii?Q?eGiVDXUsP5Sr+uqMDdtKrJtIJvCAtfX7SnQ8HuwMk9zYowW14pwQ4DdOzGHK?= =?us-ascii?Q?5Ud0wRCGCl4/QHWhjrTukeogLz+NCGEyaU91LxFsrDwHY/gfT4XbvAZIQ7UY?= =?us-ascii?Q?WTjNHApcfMFLgGAQXEFkzSQXtLBw8w78kQHBSF0Wz2I4gWN9qy8rw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2259; 6:YS1+RctFuoY9dIZ9LfBhOeSSRQ33MU9KFAqp7QRy9/xo9niMIsraiJ01F/vWb5CayW4L0gDy0GAgE8sbzqXU3FH8ZNtvPUdoVnMfVyEEQbA3ObaX+RI6MANR2Ssw+oRSvZ1e/mk9yES78DMgZR+R+CaIF8yvUJW6FTb8jrlMGUXHlUfDdzz4uIheNSqcXAFAxP7TQFIH/gAfftJuStqBU1qEbaVcy/vL+vvG5W1o4JOTcXCMKCFuKUxRlGjCuXl8aXRa6NikX9ZEM+a/lkYlBo9arqd9Xwbz3DvLt/QkGhL1pLMfz1zaBZKbDmURRF62u+QjKU2boG/FWbm0nY3Egg==; 5:Hf6vJy6ULkyvJzVp6R5ZFSqaMNTRvm5fKkCsnl6QpofvaR31tUoOuRaz4DHVm8BhwCuLTkThSbn/KlckqhP3xorpMbb8GGMtulQjkSVMJDTlW2e8lpP35DvSWvUwIrty+HoDLVvyVq27dSjWsmBUpg==; 24:LNIP2AztLkMIqa1aTS8EQ/XEAKoVqn1rwq68HdeS/gY2JK/2mRSMbXZJKshafxyT2X4Lwi5p5mthK9T6JzK2yAWOl+3TuS04pIFaadEmxDA=; 7:bDWPKvST71Danya/qLfNQC4pxW29w1c6ryHAc9OlpHNoF8Rjbjhfdv9obpawcUIFi7iKMDJPO9TNuAdnKN0aot/qGLkRVjXJ5L77Is4NiH9j0EAKXWJ29Vcun+Op4xQebZqEYUFozW39pQK3JTOAekxh0DgfSn+iBTzQfVc6L4tw53+erPRxH0Q6o/VQ2RVU/HmMAa8MU9r0VxLXPUHprMdyNabIOvCmasNxCghNmKg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 14:03:00.0600 (UTC) 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: BN3PR03MB2259 Subject: [dpdk-dev] [PATCH v3 16/40] bus/dpaa: integrate DPAA Bus with hardware blocks 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: Wed, 23 Aug 2017 14:03:03 -0000 Now that QBMAN (QMAN, BMAN) and FMAN drivers are available, this patch integrates the DPAA Bus driver for using the drivers for scanning devices and calling the PMD registered probe callbacks. Signed-off-by: Hemant Agrawal Signed-off-by: Shreyansh Jain --- drivers/bus/dpaa/dpaa_bus.c | 248 ++++++++++++++++++++++++++++++ drivers/bus/dpaa/rte_bus_dpaa_version.map | 39 +++++ drivers/bus/dpaa/rte_dpaa_bus.h | 6 + 3 files changed, 293 insertions(+) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index cc343b3..8017df3 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -63,9 +63,21 @@ #include #include +#include +#include +#include +#include +#include + int dpaa_logtype_bus; struct rte_dpaa_bus rte_dpaa_bus; +struct netcfg_info *dpaa_netcfg; + +/* define a variable to hold the portal_key, once created.*/ +pthread_key_t dpaa_portal_key; + +RTE_DEFINE_PER_LCORE(bool, _dpaa_io); static inline void dpaa_add_to_device_list(struct rte_dpaa_device *dev) @@ -79,11 +91,247 @@ dpaa_remove_from_device_list(struct rte_dpaa_device *dev) TAILQ_INSERT_TAIL(&rte_dpaa_bus.device_list, dev, next); } +static void dpaa_clean_device_list(void); + +static int +dpaa_create_device_list(void) +{ + int i; + int ret; + struct rte_dpaa_device *dev; + struct fm_eth_port_cfg *cfg; + struct fman_if *fman_intf; + + /* Creating Ethernet Devices */ + for (i = 0; i < dpaa_netcfg->num_ethports; i++) { + dev = calloc(1, sizeof(struct rte_dpaa_device)); + if (!dev) { + DPAA_BUS_LOG(ERR, "Failed to allocate ETH devices"); + ret = -ENOMEM; + goto cleanup; + } + + cfg = &dpaa_netcfg->port_cfg[i]; + fman_intf = cfg->fman_if; + + /* Device identifiers */ + dev->id.fman_id = fman_intf->fman_idx + 1; + dev->id.mac_id = fman_intf->mac_idx; + dev->device_type = FSL_DPAA_ETH; + dev->id.dev_id = i; + + /* Create device name */ + memset(dev->name, 0, RTE_ETH_NAME_MAX_LEN); + sprintf(dev->name, "fm%d-mac%d", (fman_intf->fman_idx + 1), + fman_intf->mac_idx); + DPAA_BUS_LOG(DEBUG, "Device added: %s", dev->name); + dev->device.name = dev->name; + + dpaa_add_to_device_list(dev); + } + + rte_dpaa_bus.device_count = i; + + return 0; + +cleanup: + dpaa_clean_device_list(); + return ret; +} + +static void +dpaa_clean_device_list(void) +{ + struct rte_dpaa_device *dev = NULL; + struct rte_dpaa_device *tdev = NULL; + + TAILQ_FOREACH_SAFE(dev, &rte_dpaa_bus.device_list, next, tdev) { + TAILQ_REMOVE(&rte_dpaa_bus.device_list, dev, next); + free(dev); + dev = NULL; + } +} + +/** XXX move this function into a separate file */ +static int +_dpaa_portal_init(void *arg) +{ + cpu_set_t cpuset; + pthread_t id; + uint32_t cpu = rte_lcore_id(); + int ret; + struct dpaa_portal *dpaa_io_portal; + + BUS_INIT_FUNC_TRACE(); + + if ((uint64_t)arg == 1 || cpu == LCORE_ID_ANY) + cpu = rte_get_master_lcore(); + /* if the core id is not supported */ + else + if (cpu >= RTE_MAX_LCORE) + return -1; + + /* Set CPU affinity for this thread */ + CPU_ZERO(&cpuset); + CPU_SET(cpu, &cpuset); + id = pthread_self(); + ret = pthread_setaffinity_np(id, sizeof(cpu_set_t), &cpuset); + if (ret) { + DPAA_BUS_LOG(ERR, "pthread_setaffinity_np failed on " + "core :%d with ret: %d", cpu, ret); + return ret; + } + + /* Initialise bman thread portals */ + ret = bman_thread_init(); + if (ret) { + DPAA_BUS_LOG(ERR, "bman_thread_init failed on " + "core %d with ret: %d", cpu, ret); + return ret; + } + + DPAA_BUS_LOG(DEBUG, "BMAN thread initialized"); + + /* Initialise qman thread portals */ + ret = qman_thread_init(); + if (ret) { + DPAA_BUS_LOG(ERR, "bman_thread_init failed on " + "core %d with ret: %d", cpu, ret); + bman_thread_finish(); + return ret; + } + + DPAA_BUS_LOG(DEBUG, "QMAN thread initialized"); + + dpaa_io_portal = rte_malloc(NULL, sizeof(struct dpaa_portal), + RTE_CACHE_LINE_SIZE); + if (!dpaa_io_portal) { + DPAA_BUS_LOG(ERR, "Unable to allocate memory"); + bman_thread_finish(); + qman_thread_finish(); + return -ENOMEM; + } + + dpaa_io_portal->qman_idx = qman_get_portal_index(); + dpaa_io_portal->bman_idx = bman_get_portal_index(); + dpaa_io_portal->tid = syscall(SYS_gettid); + + ret = pthread_setspecific(dpaa_portal_key, (void *)dpaa_io_portal); + if (ret) { + DPAA_BUS_LOG(ERR, "pthread_setspecific failed on " + "core %d with ret: %d", cpu, ret); + dpaa_portal_finish(NULL); + + return ret; + } + + RTE_PER_LCORE(_dpaa_io) = true; + + DPAA_BUS_LOG(DEBUG, "QMAN thread initialized"); + + return 0; +} + +/* + * rte_dpaa_portal_init - Wrapper over _dpaa_portal_init with thread level check + * XXX Complete this + */ +int +rte_dpaa_portal_init(void *arg) +{ + if (unlikely(!RTE_PER_LCORE(_dpaa_io))) + return _dpaa_portal_init(arg); + + return 0; +} + +void +dpaa_portal_finish(void *arg) +{ + struct dpaa_portal *dpaa_io_portal = (struct dpaa_portal *)arg; + + if (!dpaa_io_portal) { + DPAA_BUS_LOG(DEBUG, "Portal already cleaned"); + return; + } + + bman_thread_finish(); + qman_thread_finish(); + + pthread_setspecific(dpaa_portal_key, NULL); + + rte_free(dpaa_io_portal); + dpaa_io_portal = NULL; + + RTE_PER_LCORE(_dpaa_io) = false; +} + +#define DPAA_DEV_PATH1 "/sys/devices/platform/soc/soc:fsl,dpaa" +#define DPAA_DEV_PATH2 "/sys/devices/platform/fsl,dpaa" + static int rte_dpaa_bus_scan(void) { + int ret; + BUS_INIT_FUNC_TRACE(); + if ((access(DPAA_DEV_PATH1, F_OK) != 0) && + (access(DPAA_DEV_PATH2, F_OK) != 0)) { + RTE_LOG(DEBUG, EAL, "DPAA Bus not present. Skipping.\n"); + return 0; + } + + /* Load the device-tree driver */ + ret = of_init(); + if (ret) { + DPAA_BUS_LOG(ERR, "of_init failed with ret: %d", ret); + return -1; + } + + /* Get the interface configurations from device-tree */ + dpaa_netcfg = netcfg_acquire(); + if (!dpaa_netcfg) { + DPAA_BUS_LOG(ERR, "netcfg_acquire failed"); + return -EINVAL; + } + + RTE_LOG(NOTICE, EAL, "DPAA Bus Detected\n"); + + if (!dpaa_netcfg->num_ethports) { + DPAA_BUS_LOG(INFO, "no network interfaces available"); + /* This is not an error */ + return 0; + } + + DPAA_BUS_LOG(DEBUG, "Bus: Address of netcfg=%p, Ethports=%d", + dpaa_netcfg, dpaa_netcfg->num_ethports); + +#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER + dump_netcfg(dpaa_netcfg); +#endif + + DPAA_BUS_LOG(DEBUG, "Number of devices = %d\n", + dpaa_netcfg->num_ethports); + ret = dpaa_create_device_list(); + if (ret) { + DPAA_BUS_LOG(ERR, "Unable to create device list. (%d)", ret); + return ret; + } + + /* create the key, supplying a function that'll be invoked + * when a portal affined thread will be deleted. + */ + ret = pthread_key_create(&dpaa_portal_key, dpaa_portal_finish); + if (ret) { + DPAA_BUS_LOG(DEBUG, "Unable to create pthread key. (%d)", ret); + dpaa_clean_device_list(); + return ret; + } + + DPAA_BUS_LOG(DEBUG, "dpaa_portal_key=%u, ret=%d\n", + (unsigned int)dpaa_portal_key, ret); + return 0; } diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map index d97a009..263c08c 100644 --- a/drivers/bus/dpaa/rte_bus_dpaa_version.map +++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map @@ -1,7 +1,46 @@ DPDK_17.11 { global: + bman_acquire; + bman_free_pool; + bman_get_params; + bman_new_pool; + bman_release; + dpaa_netcfg; + fman_ccsr_map_fd; + fman_dealloc_bufs_mask_hi; + fman_dealloc_bufs_mask_lo; + fman_if_disable_rx; + fman_if_enable_rx; + fman_if_discard_rx_errors; + fman_if_get_fc_threshold; + fman_if_get_fc_quanta; + fman_if_promiscuous_disable; + fman_if_promiscuous_enable; + fman_if_reset_mcast_filter_table; + fman_if_set_bp; + fman_if_set_fc_threshold; + fman_if_set_fc_quanta; + fman_if_set_fdoff; + fman_if_set_ic_params; + fman_if_set_maxfrm; + fman_if_set_mcast_filter_table; + fman_if_stats_get; + fman_if_stats_reset; + fm_mac_add_exact_match_mac_addr; + fm_mac_rem_exact_match_mac_addr; + netcfg_acquire; + netcfg_release; + qman_create_fq; + qman_dequeue; + qman_dqrr_consume; + qman_enqueue_multi; + qman_init_fq; + qman_set_vdq; + qman_reserve_fqid_range; rte_dpaa_driver_register; rte_dpaa_driver_unregister; + rte_dpaa_mem_ptov; + rte_dpaa_portal_init; }; diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h index 8a1e192..ed6f77c 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -35,6 +35,12 @@ #include #include +#include +#include +#include +#include +#include + #define FSL_DPAA_BUS_NAME "FSL_DPAA_BUS" #define DEV_TO_DPAA_DEVICE(ptr) \ -- 2.9.3