From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0085.outbound.protection.outlook.com [104.47.0.85]) by dpdk.org (Postfix) with ESMTP id 5BFEB1CA6A for ; Sat, 7 Apr 2018 17:17:44 +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; bh=TMQtYPSlTSC8XisircwPRfFPe5f5opgnirdaRdwyGVM=; b=UlaGmTebjruYx/O10KumanydBGqaTioFpJu9LKArQ2nKAHhyiCQa4qY0QIQLK7/SwzE/jXvr0Ykh9/SniLWQsQRki4e/nTJafLCMir3HepewvQZynvT6aMylMWlbgDP6WAGVpmPFaAwMblsHvJF2csh6dRQZJ3m8iiqO09RCwoU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=nipun.gupta@nxp.com; Received: from b27504-OptiPlex-790.ap.freescale.net (14.142.187.166) by HE1PR0401MB2425.eurprd04.prod.outlook.com (2603:10a6:3:25::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Sat, 7 Apr 2018 15:17:40 +0000 From: Nipun Gupta To: thomas@monjalon.net, hemant.agrawal@nxp.com, shreyansh.jain@nxp.com Cc: dev@dpdk.org, Nipun Gupta Date: Sat, 7 Apr 2018 20:47:01 +0530 Message-Id: <1523114224-9852-6-git-send-email-nipun.gupta@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1523114224-9852-1-git-send-email-nipun.gupta@nxp.com> References: <1523114224-9852-1-git-send-email-nipun.gupta@nxp.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0058.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:19::20) To HE1PR0401MB2425.eurprd04.prod.outlook.com (2603:10a6:3:25::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d44ba002-5094-41e4-3da6-08d59c9ab516 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0401MB2425; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2425; 3:k/sGBObHYmtFHRoX+ykf0WlkqA6VhTlV4fQhE1z1Mp7T+vBh6ychdjRkLaxdqs9oQBDWfQr4BDlSMqalzXk8Prg7kpUr2SofXpiQ4AcW7V6XYNQWw51lmLwb3ifeBzx5EnXVk2wSNhBvQFfeO4P9F8BljRxqRAmJ5kDVVIjwIw1eFacYtPqW9g3pX36XOYmMq2a63khCWK5nynUbAB5AYIM+mzwZbC1IjiIgR2nlrKUfjFY8EVTJI4WMQT7QjoYD; 25:ckNOiEkV+vL8pFRH/uG/DC/YOLLVU1UpOZ/juAq21sm23f7X3QEYnnTNGqL7rvqqdRJdSMWPales54toSHHDPIeCoc+Pl2uWvSewlLCsz4bjj8SR30K+lfeYRleYeVfOemFJivV8OU7ciJOakLDjJs4/Ui1DG0VFYKzRzzWkhIMcx5KTDp/qxtaGFD2T/p5Wzl4DMDSxNAJeUdgX0drD6+So3+DT6rmajrGankNGCi9MuqEta3Fj5/pGeQ6I//VawZ/p5ZhUmVFCx/f7x+F1a1lATP77pmZSSM3TNPNQGOvCV2zVNiIwQ13e9uIYszbOkZdwwC6kGmQvFEbSEjK3sA==; 31:1xqBfVvdhijcMribppJq26U//TD7QME2ZR/UR0mh1Zs+4lQFR4k2FfCDe1fm1DbgAxuT/9H2xoTIulpG7FoP4Yp4QgeKkGisGaFWjwOPtzD+MAUAPoLPEGMQ5KK6EmOhvbNLVo/rg25S0tZCVrb9dYkPCukUS6gOzsK/9BqZmQ9Iwa34gjy29DC/2pq/NZWC1kh1CLNIMJUWzvpTZ8RpXWMSfE7Otsrf/HML2EZAg0E= X-MS-TrafficTypeDiagnostic: HE1PR0401MB2425: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2425; 20:qTOW2+5XaNVr0TSi/MkRxuLUZZZJbDLzW5AexlgPEPvHvy2YbQtvswRMb3AZ95H3OsC2LiiNUVTd5YNhFXdzP1BNc2jojVNPLIaslOuu6YLp7Zc+GUp6nAdRBVdAACIrYBQdn1xJoyu7g60b/JDzlliT2mD0CC+cC4Tb6naaQ6AQ7L6hU6zIK+08FwPvAOw4QK2qe3zCNt91i8mXmL1ZrmHPwcG/60+4lQCcJrxSARzhlpICrDLjcazP06ZzfwczHeANScmE0QeBXhJweU3CC33YO0zEN4j3lzYKXeG3X6ntg5vsTyyw/3ZEjbP1hkfdATLefzFd2Y4VfBoOJ7UE50+SxLJ6Y4nYdI6L+swDm+hDcWYDgmAC7anwT+34nMNieNPjhevXJ43NytRTeB/wz3chlCVFh+86vCBBZDm0bxV5AeItcJZ+qe+0ueLVb+216O6OVmi8OOnllJT4ipXvEya0df5Q3vQs+yr2X1KgG5pXWKXyPmjBC4dNHRStJBbm; 4:XiIv6ITyutxH411d+AcBwCvHqlnABDt8k1dmnxyaTqoYdHuT6QpCzSS/1aCifXIO94kKb+/Ie6pFiQu8D8ONbVpyi+gQ+QTV7MhdRQuVD5EUv1sdv3joiy2Tnk7ZnG9UYVyFJkmu1zGKZ2I1RL+eMqGr+brtOWhTogNPSwstJYsgJlacFocw1oy5uzxsskNLb4OlcMg4n8vRpt9UXbkHEN9+Rcbl4kEUdfEoWXgPJG8kRqK2A/w+RMj2Gs1BbLpYogQt7KKg8StHOA2h0Sjw2D03hP2F3o1ImM1E7EqMKHZ5NgtlC6RirzEqjN1HCKOg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041310)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR0401MB2425; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0401MB2425; X-Forefront-PRVS: 0635D5275E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(39380400002)(376002)(39860400002)(366004)(396003)(346002)(199004)(189003)(575784001)(2616005)(36756003)(6506007)(52116002)(6512007)(4326008)(478600001)(50226002)(66066001)(51416003)(76176011)(386003)(8936002)(50466002)(97736004)(6116002)(5660300001)(6666003)(551934003)(86362001)(7736002)(305945005)(47776003)(6636002)(59450400001)(3846002)(5009440100003)(48376002)(16526019)(316002)(81166006)(106356001)(53936002)(55236004)(16586007)(68736007)(26005)(8676002)(25786009)(6486002)(186003)(2906002)(81156014)(486006)(446003)(476003)(105586002)(956004)(11346002)(110426004)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0401MB2425; H:b27504-OptiPlex-790.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; HE1PR0401MB2425; 23:glGX99LXzbofUcnMiNzJCEN0nIalz9lq6MPFdXw?= =?us-ascii?Q?CLfQ8IjVLF1akx/1pSW3vp/ad6SUU1bno2AJhsCaitDlWShtFd+BYgZRRAwz?= =?us-ascii?Q?0o+Z5fNmhfBbfbc+u8clAbqXTwEd9JjY2H0pIPTJeEQVZxiIEqPrS75h8ji6?= =?us-ascii?Q?y2pHifvL6/jrSWUcQqr1tWtyS7O7Pu32asR0Dd97LhJXU7x6Bl2pPvF3KASA?= =?us-ascii?Q?8QljJ/Xic8DtMnOws5/3kO1+NHIIzsoMt9bc1aNg2dce4M0v5hAlt+8k9wtk?= =?us-ascii?Q?2DC3H67PlXbsyk4Cwg96lIaDedNFDM9yqQmr5qdtWcUFNBR8wCxeKjSimSxs?= =?us-ascii?Q?42CjWOdhZUmcVd8q2/a6bsYxX+oFdiCbh2XoZxuNLPwkA6bwd7OYDYectxmO?= =?us-ascii?Q?OEu/xba1Vlwli9ukENfoyzekqZsMQ390DbVCXshvM5fn1qQDsNG59r/FgdoA?= =?us-ascii?Q?0dMHqYOHqBBaqbw1wITdLPzYlZ+TkFwPH9+45QvWT4iuh20Vp/wY+esnJBAO?= =?us-ascii?Q?u9Nw0GTN1kH4vZ7T9vFMfYqMXYljUmpxwfK91fKzVh+5PP3qsm602BVM89lX?= =?us-ascii?Q?j5cCagvWhZbNheK23j6WDx79SgoFLUyVlGZ6Oc0JexN9ISE2puT0U2/7Pa+U?= =?us-ascii?Q?hsviAvDWgonEVfhdfH/dl5bzD3CASuwZSp5iZstd+nOZ1NX09MwW+7CwX+zi?= =?us-ascii?Q?ELN6J6ljWUbeBKOMbk2QFVdFq2w9Zrx1/sz7XOUf141/m+aWkIvlsopezXHh?= =?us-ascii?Q?iauY6GGHTvAYcMiAQKLEX3x8xn3GiX8uI8rj5G03jDL+qA167gOqlQYJkRe5?= =?us-ascii?Q?/Ee6vImDDX2pVf0jqOq5ya0v9FvADyqyAhdZ5ZQWTvyIWV7Ko019x/W/hGnE?= =?us-ascii?Q?rEyWQSmWwd/YjzTQ6jdMLBeZcQtJdGvc6ZSp8aWqFxmPrvMqwhKkHgJN4gyt?= =?us-ascii?Q?MMHTywRYncgKxs+lNtMrOgVCOBV0aY9iHj0wUr2ykD2vYa4F4b7Nwww2UdJr?= =?us-ascii?Q?ylVFdRn5uO2ddhYvNxNEUiLRVQTzzf1x/bCvZObRCco7zqVhW2//T2dny2mM?= =?us-ascii?Q?B12+D+fBJVugzGP8jy5r05tfDL1NR8Piq0VFcUV926L6YRG8FFQapoZppC3o?= =?us-ascii?Q?IT7TuC/ZieZbnq57sZt5sc9D6ArnXIDylAAle4lWBNxHpIVM84fL1ArpLwTy?= =?us-ascii?Q?vWPCN/tsDkorpDAohTaBiUQbVvMjYVHIHwI05zj5yLL4/baG/eOnJKh6LXrq?= =?us-ascii?Q?5LyIc34UjWvh3kitkCTmh/8TkXrZquuhK/8NnGTpOznDpNToXvwcTphDUM1c?= =?us-ascii?Q?f+1Ai9SuKkcyG8jYWKd/UavFtLd/YHBEi4eiTX8OctMYHtcs+zCeLZyOtfve?= =?us-ascii?Q?HuvMIkwiAdbuqbg13ZvNzErOUtxQItuq7SMhP1/6DfVZy7M7tw80KXVgx9nm?= =?us-ascii?Q?2u8nhMUOUnA=3D=3D?= X-Microsoft-Antispam-Message-Info: Cc/W7BbxGlX4UhMM8XDv0Pa0WYIMgALdsMrklCpWrQMbspQ95rboZkH3N2MKtGdX7FsYqd6A2aT+po0vVpO7exlmVx6IiSAfoP+iHxEDN1z/5YwgRbL4Iiyn7GSKw+osipKuTkQEMl50e4BBiiO69cAlSFjHPfP5ij2gjxvGRsrvIHimFwZRfbsy5MzZP9s6 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2425; 6:uPygnH9Pi6ZRtPcTXlC4aOuIvFKeyZWwc0tX0OJYeClQEESGEWuvtXvaYYmK///XSlK6bbr3BQ9nY82ZQ4LE+8bCnKQROUbSBlviBmpIu1aT4E/kJwwLRogxagTd+qgqQdmWoztGr4L5I/YYp46UK6ZVnB5kWXNFV+hyAoc2Df4rtZzh4KnTrw0QkullQLzlKjZUXbIc8O9iQ6qEXvTyusxtIoLHfC5JLqtWwVgMnpzGSceUpyMo45VSf6aeJuf+8RdPUB1XVsGnsR01br6xrUqtPNdwKG/ktV3SIdt7wrAUmb8+bPz4N0wg4j0XbAckaITNLMsg7dNoVvvKTJghrYLs2Ky/vBrqrrEl1IJnfRQ6azy2vHht13x1PDhhBl6FagC/6RyAoaedhJEUiNaTuDFlnztj0mj8FjL99virLZZPZLgEIahE/U1sLg2J/FVqYFch6JiheHSbWyYwKI5/gQ==; 5:atEGJkmye0zMU2JybwPNHYLTo6h2f0uJhwkUxO8JbD1uooqfQTZsXk9JU/PYVBW+o5QS/dAP6v1BUPdlGVB+mEcRUMrfNxbSmAy5aZp5YurwQBYiUOyJ8BC6hV9SCVbsGn+wZogfwhErMTdXD7b73yWYPWlZ4e7bZ46U8l+dtso=; 24:BKVHpc4JjFQYbcHWp0s8ryjZCZAt91NUlCTj+iT3QcY2X8y1iHgvGM4OvaCJuYXuAkDinJmqpzse+OU+bJLtkspZUiW3iLxBntyYWdQrKKg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2425; 7:SfA13wiln6fpThy18sNocF/GTreVNwWD0HMei7LjuOawnEgCf606LS5stT6Ix8jZtuo7oE1XnjTseady96Yn7XJNWQ6HvB3htC11Dja7kSi8UHRZ3wjDg1/RPm8snDh5SR5+NDOjHdkgo+V4mpytt6d7522Y3b7zG5ojVi1UFaVjWD0pe0f+ojh1smqtzA+XW9vjEsjA6DeHTr4yuBuweVcFO6gr2vfTgdiWTZ6hfDC7HyqEqJGjpl8BuviZOVSn X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2018 15:17:40.6229 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d44ba002-5094-41e4-3da6-08d59c9ab516 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2425 Subject: [dpdk-dev] [PATCH 5/8] raw/dpaa2_qdma: support configuration APIs 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, 07 Apr 2018 15:17:44 -0000 Signed-off-by: Nipun Gupta --- doc/api/doxy-api-index.md | 1 + doc/api/doxy-api.conf | 1 + drivers/raw/dpaa2_qdma/Makefile | 2 + drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 375 +++++++++++++++++++++ drivers/raw/dpaa2_qdma/dpaa2_qdma.h | 63 ++++ drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h | 216 ++++++++++++ .../raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map | 12 + 7 files changed, 670 insertions(+) create mode 100644 drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index b9f28be..c0b5653 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -65,6 +65,7 @@ The public API headers are grouped by topics: [dpaa] (@ref rte_pmd_dpaa.h), [dpaa2] (@ref rte_dpaa2_mempool.h), [dpaa2_cmdif] (@ref rte_pmd_dpaa2_cmdif.h), + [dpaa2_qdma] (@ref rte_pmd_dpaa2_qdma.h), [crypto_scheduler] (@ref rte_cryptodev_scheduler.h) - **memory**: diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf index 88088d6..0840b34 100644 --- a/doc/api/doxy-api.conf +++ b/doc/api/doxy-api.conf @@ -39,6 +39,7 @@ INPUT = doc/api/doxy-api-index.md \ drivers/net/ixgbe \ drivers/net/softnic \ drivers/raw/dpaa2_cmdif \ + drivers/raw/dpaa2_qdma \ lib/librte_eal/common/include \ lib/librte_eal/common/include/generic \ lib/librte_acl \ diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile index f81ee08..6711df3 100644 --- a/drivers/raw/dpaa2_qdma/Makefile +++ b/drivers/raw/dpaa2_qdma/Makefile @@ -31,4 +31,6 @@ LIBABIVER := 1 # SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA) += dpaa2_qdma.c +SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA)-include += rte_pmd_dpaa2_qdma.h + include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c index 4b7fa13..b5f6bd9 100644 --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c @@ -20,6 +20,7 @@ #include "dpaa2_qdma.h" #include "dpaa2_qdma_logs.h" +#include "rte_pmd_dpaa2_qdma.h" /* Dynamic log type identifier */ int dpaa2_qdma_logtype; @@ -32,6 +33,380 @@ static struct qdma_hw_queue_list qdma_queue_list = TAILQ_HEAD_INITIALIZER(qdma_queue_list); +/* QDMA Virtual Queues */ +struct qdma_virt_queue *qdma_vqs; + +/* QDMA per core data */ +struct qdma_per_core_info qdma_core_info[RTE_MAX_LCORE]; + +static struct qdma_hw_queue * +alloc_hw_queue(uint32_t lcore_id) +{ + struct qdma_hw_queue *queue = NULL; + + DPAA2_QDMA_FUNC_TRACE(); + + /* Get a free queue from the list */ + TAILQ_FOREACH(queue, &qdma_queue_list, next) { + if (queue->num_users == 0) { + queue->lcore_id = lcore_id; + queue->num_users++; + break; + } + } + + return queue; +} + +static void +free_hw_queue(struct qdma_hw_queue *queue) +{ + DPAA2_QDMA_FUNC_TRACE(); + + queue->num_users--; +} + + +static struct qdma_hw_queue * +get_hw_queue(uint32_t lcore_id) +{ + struct qdma_per_core_info *core_info; + struct qdma_hw_queue *queue, *temp; + uint32_t least_num_users; + int num_hw_queues, i; + + DPAA2_QDMA_FUNC_TRACE(); + + core_info = &qdma_core_info[lcore_id]; + num_hw_queues = core_info->num_hw_queues; + + /* + * Allocate a HW queue if there are less queues + * than maximum per core queues configured + */ + if (num_hw_queues < qdma_dev.max_hw_queues_per_core) { + queue = alloc_hw_queue(lcore_id); + if (queue) { + core_info->hw_queues[num_hw_queues] = queue; + core_info->num_hw_queues++; + return queue; + } + } + + queue = core_info->hw_queues[0]; + /* In case there is no queue associated with the core return NULL */ + if (!queue) + return NULL; + + /* Fetch the least loaded H/W queue */ + least_num_users = core_info->hw_queues[0]->num_users; + for (i = 0; i < num_hw_queues; i++) { + temp = core_info->hw_queues[i]; + if (temp->num_users < least_num_users) + queue = temp; + } + + if (queue) + queue->num_users++; + + return queue; +} + +static void +put_hw_queue(struct qdma_hw_queue *queue) +{ + struct qdma_per_core_info *core_info; + int lcore_id, num_hw_queues, i; + + DPAA2_QDMA_FUNC_TRACE(); + + /* + * If this is the last user of the queue free it. + * Also remove it from QDMA core info. + */ + if (queue->num_users == 1) { + free_hw_queue(queue); + + /* Remove the physical queue from core info */ + lcore_id = queue->lcore_id; + core_info = &qdma_core_info[lcore_id]; + num_hw_queues = core_info->num_hw_queues; + for (i = 0; i < num_hw_queues; i++) { + if (queue == core_info->hw_queues[i]) + break; + } + for (; i < num_hw_queues - 1; i++) + core_info->hw_queues[i] = core_info->hw_queues[i + 1]; + core_info->hw_queues[i] = NULL; + } else { + queue->num_users--; + } +} + +int +rte_qdma_init(void) +{ + DPAA2_QDMA_FUNC_TRACE(); + + rte_spinlock_init(&qdma_dev.lock); + + return 0; +} + +void +rte_qdma_attr_get(struct rte_qdma_attr *qdma_attr) +{ + DPAA2_QDMA_FUNC_TRACE(); + + qdma_attr->num_hw_queues = qdma_dev.num_hw_queues; +} + +int +rte_qdma_reset(void) +{ + struct qdma_hw_queue *queue; + int i; + + DPAA2_QDMA_FUNC_TRACE(); + + /* In case QDMA device is not in stopped state, return -EBUSY */ + if (qdma_dev.state == 1) { + DPAA2_QDMA_ERR( + "Device is in running state. Stop before reset.\n"); + return -EBUSY; + } + + /* In case there are pending jobs on any VQ, return -EBUSY */ + for (i = 0; i < qdma_dev.max_vqs; i++) { + if (qdma_vqs[i].in_use && (qdma_vqs[i].num_enqueues != + qdma_vqs[i].num_dequeues)) + DPAA2_QDMA_ERR("Jobs are still pending on VQ: %d\n", i); + return -EBUSY; + } + + /* Reset HW queues */ + TAILQ_FOREACH(queue, &qdma_queue_list, next) + queue->num_users = 0; + + /* Reset and free virtual queues */ + for (i = 0; i < qdma_dev.max_vqs; i++) { + if (qdma_vqs[i].status_ring) + rte_ring_free(qdma_vqs[i].status_ring); + } + if (qdma_vqs) + rte_free(qdma_vqs); + qdma_vqs = NULL; + + /* Reset per core info */ + memset(&qdma_core_info, 0, + sizeof(struct qdma_per_core_info) * RTE_MAX_LCORE); + + /* Free the FLE pool */ + if (qdma_dev.fle_pool) + rte_mempool_free(qdma_dev.fle_pool); + + /* Reset QDMA device structure */ + qdma_dev.mode = RTE_QDMA_MODE_HW; + qdma_dev.max_hw_queues_per_core = 0; + qdma_dev.fle_pool = NULL; + qdma_dev.fle_pool_count = 0; + qdma_dev.max_vqs = 0; + + return 0; +} + +int +rte_qdma_configure(struct rte_qdma_config *qdma_config) +{ + int ret; + + DPAA2_QDMA_FUNC_TRACE(); + + /* In case QDMA device is not in stopped state, return -EBUSY */ + if (qdma_dev.state == 1) { + DPAA2_QDMA_ERR( + "Device is in running state. Stop before config.\n"); + return -1; + } + + /* Reset the QDMA device */ + ret = rte_qdma_reset(); + if (ret) { + DPAA2_QDMA_ERR("Resetting QDMA failed\n"); + return ret; + } + + /* Set mode */ + qdma_dev.mode = qdma_config->mode; + + /* Set max HW queue per core */ + if (qdma_config->max_hw_queues_per_core > MAX_HW_QUEUE_PER_CORE) { + DPAA2_QDMA_ERR("H/W queues per core is more than: %d\n", + MAX_HW_QUEUE_PER_CORE); + return -EINVAL; + } + qdma_dev.max_hw_queues_per_core = + qdma_config->max_hw_queues_per_core; + + /* Allocate Virtual Queues */ + qdma_vqs = rte_malloc("qdma_virtual_queues", + (sizeof(struct qdma_virt_queue) * qdma_config->max_vqs), + RTE_CACHE_LINE_SIZE); + if (!qdma_vqs) { + DPAA2_QDMA_ERR("qdma_virtual_queues allocation failed\n"); + return -ENOMEM; + } + qdma_dev.max_vqs = qdma_config->max_vqs; + + /* Allocate FLE pool */ + qdma_dev.fle_pool = rte_mempool_create("qdma_fle_pool", + qdma_config->fle_pool_count, QDMA_FLE_POOL_SIZE, + QDMA_FLE_CACHE_SIZE(qdma_config->fle_pool_count), 0, + NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0); + if (!qdma_dev.fle_pool) { + DPAA2_QDMA_ERR("qdma_fle_pool create failed\n"); + rte_free(qdma_vqs); + qdma_vqs = NULL; + return -ENOMEM; + } + qdma_dev.fle_pool_count = qdma_config->fle_pool_count; + + return 0; +} + +int +rte_qdma_start(void) +{ + DPAA2_QDMA_FUNC_TRACE(); + + qdma_dev.state = 1; + + return 0; +} + +int +rte_qdma_vq_create(uint32_t lcore_id, uint32_t flags) +{ + char ring_name[32]; + int i; + + DPAA2_QDMA_FUNC_TRACE(); + + rte_spinlock_lock(&qdma_dev.lock); + + /* Get a free Virtual Queue */ + for (i = 0; i < qdma_dev.max_vqs; i++) { + if (qdma_vqs[i].in_use == 0) + break; + } + + /* Return in case no VQ is free */ + if (i == qdma_dev.max_vqs) { + rte_spinlock_unlock(&qdma_dev.lock); + return -ENODEV; + } + + if (qdma_dev.mode == RTE_QDMA_MODE_HW || + (flags & RTE_QDMA_VQ_EXCLUSIVE_PQ)) { + /* Allocate HW queue for a VQ */ + qdma_vqs[i].hw_queue = alloc_hw_queue(lcore_id); + qdma_vqs[i].exclusive_hw_queue = 1; + } else { + /* Allocate a Ring for Virutal Queue in VQ mode */ + sprintf(ring_name, "status ring %d", i); + qdma_vqs[i].status_ring = rte_ring_create(ring_name, + qdma_dev.fle_pool_count, rte_socket_id(), 0); + if (!qdma_vqs[i].status_ring) { + DPAA2_QDMA_ERR("Status ring creation failed for vq\n"); + rte_spinlock_unlock(&qdma_dev.lock); + return rte_errno; + } + + /* Get a HW queue (shared) for a VQ */ + qdma_vqs[i].hw_queue = get_hw_queue(lcore_id); + qdma_vqs[i].exclusive_hw_queue = 0; + } + + if (qdma_vqs[i].hw_queue == NULL) { + DPAA2_QDMA_ERR("No H/W queue available for VQ\n"); + if (qdma_vqs[i].status_ring) + rte_ring_free(qdma_vqs[i].status_ring); + qdma_vqs[i].status_ring = NULL; + rte_spinlock_unlock(&qdma_dev.lock); + return -ENODEV; + } + + qdma_vqs[i].in_use = 1; + qdma_vqs[i].lcore_id = lcore_id; + + rte_spinlock_unlock(&qdma_dev.lock); + + return i; +} + +void +rte_qdma_vq_stats(uint16_t vq_id, + struct rte_qdma_vq_stats *vq_status) +{ + struct qdma_virt_queue *qdma_vq = &qdma_vqs[vq_id]; + + DPAA2_QDMA_FUNC_TRACE(); + + if (qdma_vq->in_use) { + vq_status->exclusive_hw_queue = qdma_vq->exclusive_hw_queue; + vq_status->lcore_id = qdma_vq->lcore_id; + vq_status->num_enqueues = qdma_vq->num_enqueues; + vq_status->num_dequeues = qdma_vq->num_dequeues; + vq_status->num_pending_jobs = vq_status->num_enqueues - + vq_status->num_dequeues; + } +} + +int +rte_qdma_vq_destroy(uint16_t vq_id) +{ + struct qdma_virt_queue *qdma_vq = &qdma_vqs[vq_id]; + + DPAA2_QDMA_FUNC_TRACE(); + + /* In case there are pending jobs on any VQ, return -EBUSY */ + if (qdma_vq->num_enqueues != qdma_vq->num_dequeues) + return -EBUSY; + + rte_spinlock_lock(&qdma_dev.lock); + + if (qdma_vq->exclusive_hw_queue) + free_hw_queue(qdma_vq->hw_queue); + else { + if (qdma_vqs->status_ring) + rte_ring_free(qdma_vqs->status_ring); + + put_hw_queue(qdma_vq->hw_queue); + } + + memset(qdma_vq, 0, sizeof(struct qdma_virt_queue)); + + rte_spinlock_lock(&qdma_dev.lock); + + return 0; +} + +void +rte_qdma_stop(void) +{ + DPAA2_QDMA_FUNC_TRACE(); + + qdma_dev.state = 0; +} + +void +rte_qdma_destroy(void) +{ + DPAA2_QDMA_FUNC_TRACE(); + + rte_qdma_reset(); +} + static const struct rte_rawdev_ops dpaa2_qdma_ops = { }; diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.h b/drivers/raw/dpaa2_qdma/dpaa2_qdma.h index 8b3b1b9..fe1da41 100644 --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.h +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.h @@ -5,6 +5,22 @@ #ifndef __DPAA2_QDMA_H__ #define __DPAA2_QDMA_H__ +struct qdma_sdd; +struct qdma_io_meta; + +#define DPAA2_QDMA_MAX_FLE 3 +#define DPAA2_QDMA_MAX_SDD 2 + +/** FLE pool size: 3 Frame list + 2 source/destination descriptor */ +#define QDMA_FLE_POOL_SIZE (sizeof(struct qdma_io_meta) + \ + sizeof(struct qbman_fle) * DPAA2_QDMA_MAX_FLE + \ + sizeof(struct qdma_sdd) * DPAA2_QDMA_MAX_SDD) +/** FLE pool cache size */ +#define QDMA_FLE_CACHE_SIZE(_num) (_num/(RTE_MAX_LCORE * 2)) + +/** Maximum possible H/W Queues on each core */ +#define MAX_HW_QUEUE_PER_CORE 64 + /** * Represents a QDMA device. * A single QDMA device exists which is combination of multiple DPDMAI rawdev's. @@ -45,6 +61,53 @@ struct qdma_hw_queue { uint32_t num_users; }; +/** Represents a QDMA virtual queue */ +struct qdma_virt_queue { + /** Status ring of the virtual queue */ + struct rte_ring *status_ring; + /** Associated hw queue */ + struct qdma_hw_queue *hw_queue; + /** Associated lcore id */ + uint32_t lcore_id; + /** States if this vq is in use or not */ + uint8_t in_use; + /** States if this vq has exclusively associated hw queue */ + uint8_t exclusive_hw_queue; + /* Total number of enqueues on this VQ */ + uint64_t num_enqueues; + /* Total number of dequeues from this VQ */ + uint64_t num_dequeues; +}; + +/** Represents a QDMA per core hw queues allocation in virtual mode */ +struct qdma_per_core_info { + /** list for allocated hw queues */ + struct qdma_hw_queue *hw_queues[MAX_HW_QUEUE_PER_CORE]; + /* Number of hw queues allocated for this core */ + uint16_t num_hw_queues; +}; + +/** Metadata which is stored with each operation */ +struct qdma_io_meta { + /** + * Context which is stored in the FLE pool (just before the FLE). + * QDMA job is stored as a this context as a part of metadata. + */ + uint64_t cnxt; + /** VQ ID is stored as a part of metadata of the enqueue command */ + uint64_t id; +}; + +/** Source/Destination Descriptor */ +struct qdma_sdd { + uint32_t rsv; + /** Stride configuration */ + uint32_t stride; + /** Route-by-port command */ + uint32_t rbpcmd; + uint32_t cmd; +} __attribute__((__packed__)); + /** Represents a DPDMAI raw device */ struct dpaa2_dpdmai_dev { /** Pointer to Next device instance */ diff --git a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h new file mode 100644 index 0000000..d27fd49 --- /dev/null +++ b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h @@ -0,0 +1,216 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#ifndef __RTE_PMD_DPAA2_QDMA_H__ +#define __RTE_PMD_DPAA2_QDMA_H__ + +/** + * @file + * + * NXP dpaa2 QDMA specific structures. + * + */ + +/** Determines the mode of operation */ +enum { + /** + * Allocate a H/W queue per VQ i.e. Exclusive hardware queue for a VQ. + * This mode will have best performance. + */ + RTE_QDMA_MODE_HW, + /** + * A VQ shall not have an exclusive associated H/W queue. + * Rather a H/W Queue will be shared by multiple Virtual Queues. + * This mode will have intermediate data structures to support + * multi VQ to PQ mappings thus having some performance implications. + * Note: Even in this mode there is an option to allocate a H/W + * queue for a VQ. Please see 'RTE_QDMA_VQ_EXCLUSIVE_PQ' flag. + */ + RTE_QDMA_MODE_VIRTUAL +}; + +/** + * If user has configued a Virtual Queue mode, but for some particular VQ + * user needs an exclusive H/W queue associated (for better performance + * on that particular VQ), then user can pass this flag while creating the + * Virtual Queue. A H/W queue will be allocated corresponding to + * VQ which uses this flag. + */ +#define RTE_QDMA_VQ_EXCLUSIVE_PQ (1ULL) + +/** States if the source addresses is physical. */ +#define RTE_QDMA_JOB_SRC_PHY (1ULL) + +/** States if the destination addresses is physical. */ +#define RTE_QDMA_JOB_DEST_PHY (1ULL << 1) + +/** Provides QDMA device attributes */ +struct rte_qdma_attr { + /** total number of hw QDMA queues present */ + uint16_t num_hw_queues; +}; + +/** QDMA device configuration structure */ +struct rte_qdma_config { + /** Number of maximum hw queues to allocate per core. */ + uint16_t max_hw_queues_per_core; + /** Maximum number of VQ's to be used. */ + uint16_t max_vqs; + /** mode of operation - physical(h/w) or virtual */ + uint8_t mode; + /** + * User provides this as input to the driver as a size of the FLE pool. + * FLE's (and corresponding source/destination descriptors) are + * allocated by the driver at enqueue time to store src/dest and + * other data and are freed at the dequeue time. This determines the + * maximum number of inflight jobs on the QDMA device. This should + * be power of 2. + */ + int fle_pool_count; +}; + +/** Provides QDMA device statistics */ +struct rte_qdma_vq_stats { + /** States if this vq has exclusively associated hw queue */ + uint8_t exclusive_hw_queue; + /** Associated lcore id */ + uint32_t lcore_id; + /* Total number of enqueues on this VQ */ + uint64_t num_enqueues; + /* Total number of dequeues from this VQ */ + uint64_t num_dequeues; + /* total number of pending jobs in this VQ */ + uint64_t num_pending_jobs; +}; + +/** Determines a QDMA job */ +struct rte_qdma_job { + /** Source Address from where DMA is (to be) performed */ + uint64_t src; + /** Destination Address where DMA is (to be) done */ + uint64_t dest; + /** Length of the DMA operation in bytes. */ + uint32_t len; + /** See RTE_QDMA_JOB_ flags */ + uint32_t flags; + /** + * User can specify a context which will be maintained + * on the dequeue operation. + */ + uint64_t cnxt; + /** + * Status of the transaction. + * This is filled in the dequeue operation by the driver. + */ + uint8_t status; +}; + +/** + * Initialize the QDMA device. + * + * @returns + * - 0: Success. + * - <0: Error code. + */ +int +rte_qdma_init(void); + +/** + * Get the QDMA attributes. + * + * @param qdma_attr + * QDMA attributes providing total number of hw queues etc. + */ +void +rte_qdma_attr_get(struct rte_qdma_attr *qdma_attr); + +/** + * Reset the QDMA device. This API will completely reset the QDMA + * device, bringing it to original state as if only rte_qdma_init() API + * has been called. + * + * @returns + * - 0: Success. + * - <0: Error code. + */ +int +rte_qdma_reset(void); + +/** + * Configure the QDMA device. + * + * @returns + * - 0: Success. + * - <0: Error code. + */ +int +rte_qdma_configure(struct rte_qdma_config *qdma_config); + +/** + * Start the QDMA device. + * + * @returns + * - 0: Success. + * - <0: Error code. + */ +int +rte_qdma_start(void); + +/** + * Create a Virtual Queue on a particular lcore id. + * This API can be called from any thread/core. User can create/destroy + * VQ's at runtime. + * + * @param lcore_id + * LCORE ID on which this particular queue would be associated with. + * @param flags + * RTE_QDMA_VQ_ flags. See macro definitions. + * + * @returns + * - >= 0: Virtual queue ID. + * - <0: Error code. + */ +int +rte_qdma_vq_create(uint32_t lcore_id, uint32_t flags); + +/** + * Get a Virtual Queue statistics. + * + * @param vq_id + * Virtual Queue ID. + * @param vq_stats + * VQ statistics structure which will be filled in by the driver. + */ +void +rte_qdma_vq_stats(uint16_t vq_id, + struct rte_qdma_vq_stats *vq_stats); + +/** + * Destroy the Virtual Queue specified by vq_id. + * This API can be called from any thread/core. User can create/destroy + * VQ's at runtime. + * + * @param vq_id + * Virtual Queue ID which needs to be deinialized. + * + * @returns + * - 0: Success. + * - <0: Error code. + */ +int +rte_qdma_vq_destroy(uint16_t vq_id); + +/** + * Stop QDMA device. + */ +void +rte_qdma_stop(void); + +/** + * Destroy the QDMA device. + */ +void +rte_qdma_destroy(void); + +#endif /* __RTE_PMD_DPAA2_QDMA_H__*/ diff --git a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map index 9b9ab1a..0a0d3c5 100644 --- a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map +++ b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map @@ -1,4 +1,16 @@ DPDK_18.05 { + global: + + rte_qdma_attr_get; + rte_qdma_configure; + rte_qdma_destroy; + rte_qdma_init; + rte_qdma_reset; + rte_qdma_start; + rte_qdma_stop; + rte_qdma_vq_create; + rte_qdma_vq_destroy; + rte_qdma_vq_stats; local: *; }; -- 1.9.1