From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0053.outbound.protection.outlook.com [104.47.1.53]) by dpdk.org (Postfix) with ESMTP id 14FD8493D for ; Tue, 1 May 2018 11:59:31 +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=1r+uxt46UrcQmKPUq7Z2ySCiVWZOwjggsI9nxaWFalY=; b=IXxXWmRYXeTHAfoa8BYS6APkLrOJp0U0WIbcEaVcGIwnJNdvBZbmW83mSODiow5GBClQEm6VYlQkMoUc0xJXGQajcJu864/rDAJNndGDfYzC2DKlqjpNgFBvNGMnse0qH9eGewz9o4MSODnPVu+IYIfLmryO96x+NsOqJxOaXbc= 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 HE1PR0401MB2427.eurprd04.prod.outlook.com (2603:10a6:3:25::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.23; Tue, 1 May 2018 09:59:28 +0000 From: Nipun Gupta To: shreyansh.jain@nxp.com, thomas@monjalon.net, hemant.agrawal@nxp.com Cc: dev@dpdk.org, Nipun Gupta Date: Tue, 1 May 2018 15:28:49 +0530 Message-Id: <1525168731-30912-7-git-send-email-nipun.gupta@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1525168731-30912-1-git-send-email-nipun.gupta@nxp.com> References: <1524570589-20148-1-git-send-email-nipun.gupta@nxp.com> <1525168731-30912-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: PN1PR0101CA0028.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:c::14) To HE1PR0401MB2427.eurprd04.prod.outlook.com (2603:10a6:3:25::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(2017052603328)(7153060)(7193020); SRVR:HE1PR0401MB2427; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2427; 3:uQtqQtSngYEXudMCqB0al0tGEEpALXLHpD4JsGvbczgl6b4xKMarl4FWsa3EwcTnB+68f8W9eYElggGbcDOjjFDvw4/VJT1aS1mca3pgOVo6tZZmwHVkIOd647HrG/b1LxFjRS8ASK96ue/1eFfeh8OKirKzXRuuI7ozwNA2YDy3W1ZNIBXIeomdjzoN4Q3t5MFMm7D7A0s3JpSRU0xQqdmGeixOD9iX+O1gVepK8UCRehlJLuuO9c0/Li9p+sej; 25:ArSX3GUAAkhVnxxCt7oKUC7ELHZpprX17kxfsAw535JDxTFzhUXkdpCmj0Eho8MxLwAcOjFxbQPDP2YusDCVUG2HBHLNVcs8L03JkET2zpNGmjKD17Sl1RT4fGzjMDA+aPfBi7Tt1fprhY+xvkJHdK4cWo4kSuh5qJEsVralRKLfoM/yK1MTlpeBVCFWgzXI/UCQSbV0ePMu9+Vkzh8Xxvu8Vu5XTvhTfERx8xaQ5ldtkuD0o8eKMSqazeX7NRSUibTgiTPiuB+KHzLF6WRJMg/pSUvjqNv9wK3vRdt8PKLuxd00sTMzCHurCmhDa/xO+p8SkGSSeX5e/ykb/dnjJg==; 31:xhZhBJCQHqFL6namJ1OrXQeoy+F8PMbLxh3n+tIkldu/mCR7dQfiPZ43EZwRmpFlxuVXiCCigGSJVkjKrJZzrPTKMc/7LFaPrg/IX3w2XiROBrTWw7yGEbL+rYJJ4IvwOHJjmm6BRHfunotju2IYBWP1ELhWRng8gQ4KXfE5DdWczGTgU1dY4sEWOBQR+VkSkqQg8kX6IFx97pW2iArvItali+OzrrT9xun94eYhruw= X-MS-TrafficTypeDiagnostic: HE1PR0401MB2427: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2427; 20:kE1Bb7l09qyeC1wCpDe0UxhMjY0i+o+BPKSqzybIDeR4svN2wKL79tGpAIAkNzUoeXZUfBrC+WmreoPfdQUcKa4lHvBNgLU0hApqWCjhPCAI7/TiLOHZdHf7AAMzNZTVSXnjS8NSDCxQDA5V0Z6r12kxRLETJeTSYdWjJTPXkpvABwXS5rcA2u1bDW1SnZS7JEK5zjxSdJrFCPEJ7GIUZ6Mp5hO6zC3MqJ7CaEUNepqrd5E7jxEHk5d4EM1yes+lIZWcmn7gNVT5EVvw4BtNEB32wYUjMiwjvPS99XFOLjedO322VxXhcF4RyGQGIqdh/xkjbGeHUH+2lCpHBNM1IQSyKu/V+e7Jt2DbRvZ+mi/eam6QZ2d15mlaai8BgyhUobumLdjHmAHoRClnhSTOAaZss9PoE9NyJp+S5rfvwFFebnKtIRAcyMbv2yeSuZ2sAYGp1J597+8v5H3sKkNUvdXVu5Jd8wK/NZcBETjwlXsjOH7MRzXQnHcpiBoIlqvs; 4:bNHgcRuGA4zVY+S2jeJPU9rfghiGFplUbyzV7X+d/xC5CZVmlFl//U0cyBIU6cnkCjuTpBdb01PuMJvfuPEAxUiKEj//fmPu575yFOKmVyIO2zxPgXgtngxEbI5F+/piM7qMrGrbt0zyZejJ12HIAa5qoEIDSQRaA4pmYL1UJe8UCPPSJoRjlTSiy8cE3KV0zX1Ljq53mAft6akWD1Vg7PsMD7UlTMWh+kQEjOG4JJ+zLpWKGYaOCHYAnIUF49OvzQIhYiY9SPfBE+j7Xch0OpEKj/XF3bEs/f28+DC8JTi2SMJP3tB9Zb3RkUXYHdST 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)(5005006)(8121501046)(3231254)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041310)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR0401MB2427; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0401MB2427; X-Forefront-PRVS: 06592CCE58 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(366004)(396003)(346002)(376002)(199004)(189003)(81156014)(3846002)(8936002)(97736004)(50226002)(48376002)(81166006)(316002)(50466002)(16586007)(2906002)(551934003)(36756003)(44832011)(478600001)(5660300001)(8676002)(6116002)(486006)(16526019)(6512007)(53936002)(476003)(4326008)(446003)(956004)(11346002)(59450400001)(386003)(5009440100003)(76176011)(52116002)(51416003)(26005)(305945005)(68736007)(6506007)(105586002)(106356001)(47776003)(6636002)(66066001)(7736002)(86362001)(6666003)(25786009)(6486002)(2616005)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0401MB2427; 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; HE1PR0401MB2427; 23:XKqBFbNSwa5tPUtyF4holPJaoqa6bgRj3x6tah5?= =?us-ascii?Q?DUsX0vZqYZ5LioC6Q6x0NrvrTiKyLp8OE+nVr2KTIK1WzPcXOb7KXJXQlVx9?= =?us-ascii?Q?KZlhOKjpjBiv/mLZAYl4dhlbGPRqL35mTPR1u8wu9SSmzaviHncb+GGhBYBX?= =?us-ascii?Q?RR+MjEewiJAUzHqbJev96taI6mYBKV1GMbFHT7eoz3iupYAGggKi+IRS3bNG?= =?us-ascii?Q?x7iCDfhaIetXYShZw6hrhzeegxttF1ZsCb2OfGJNNSYee6uFF+yOL5jTJZh+?= =?us-ascii?Q?q3Nwa5MMCKdiqbUn7vt9vqBzzzqdt8ImdqLTsVaTuzhEr9I/YM9snytsuyPP?= =?us-ascii?Q?ZGgiMSwRgqIBRQmEJVX/22VOErXRP3LoyiLJ+k5WSuAL9AHkmMk3m5pmmcz3?= =?us-ascii?Q?Wj8b5EPaxQm5MABZJuRGbIGyvp7CD4+SMQ1tzAEe+zpAgEPWloqGiAq0mGmv?= =?us-ascii?Q?C3S3o/lWlDCmVsjFYetBbNG+ARaAO55gCuZNDQkC0JiU3sDyZ3ieN+r2dzXG?= =?us-ascii?Q?f7i2VynUgeIc0e94eKqsRV6+j5jQinn8nBOtergPNVIgk/jsmC1rf64dGiHM?= =?us-ascii?Q?mBKi+L1QeZPX82tJH65E548IWcte+AATFZNT0H77i622rxBwOz2YYC77z8Op?= =?us-ascii?Q?ecN1+kaP1Y8o6J2hJdirNhGN92yEQdUi14FoIKK6fyB4PlFkeZTypDeX62BP?= =?us-ascii?Q?4UlVlmw/BMvILblE/HOgouRx0rzlzMscCa1WtBHgTZ1pI1oXb3G2XTUdg8NS?= =?us-ascii?Q?7eCVXkDqbuSW36SZHxGTLqGxJ/F3FZ1b5k5ouFuPPzjzhixAzf8CsjU5qCE+?= =?us-ascii?Q?wMbp3mIJuGx+UEZ8VjuB804e6nmq/nUcs6A670y4Ylg3fnB2fSvGyc79BrK/?= =?us-ascii?Q?dMEelXhpJSAtLHIFIFQoWQaJunWFAZJExwnruKjt52enzDT9pKum6gR3o/gV?= =?us-ascii?Q?TyPeE60UrMh1R0VMPLFfb4tqsy8qWaAwLfRRvd+CiB978j4yGmSonWJpuLZs?= =?us-ascii?Q?KYxZrNyniRxpiG3fW0hjqjRz9j1WYe3eJcwS/tl+hizFjtdQhyJi62mSpmzx?= =?us-ascii?Q?fXHASc4VZ6dYLgGedgnIhqIg6FiF6w0DTHIhQBUD/dufosmRuEVdmVXyCPFG?= =?us-ascii?Q?F4brZ4BwleuW3SrvPhl/zfwdAt65XkUueDtqS7IhQSBx1aBxHvLhlRbXfJMN?= =?us-ascii?Q?pUprnFCHcYo6/r7AMmqLin9EBl/J9ezKYfbwIeuaTcxHg4wcZQzFUGnt5q2O?= =?us-ascii?Q?7jEGGK2eXwYHjjchd4P4DXFxjfGG03xXhIW4TpYUuiL9LIeuII4toFAPZobV?= =?us-ascii?Q?gZw=3D=3D?= X-Microsoft-Antispam-Message-Info: wPUdtT7RcJ2l2aDU8u/OB6TYXOi678THXPlIAqJmTuMAjLRlGLBueHEYbU2NkDxXVlPtae9wuQzoCaoChH5HeRv6NzzpH7kEdwQMfTNnnE4nFj4znkKGXcKVwRRyWCn+H7MWeqCbs2ImlAomSTPq6wpdRxbCSYiUcrtxYyzSvX8VGMR/g/OfMq2+NIeEF0lW X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2427; 6:QpK6/oS/P+MjO0gNzed4Jn0kLuvaGGOZcMOZUtsehW0isZCe7fnR5JjPuSzVsijhecOB9HJucsGkreDjKOcKfP9BF6mrY6VihHcG06mOBYhL15YtD1qCQNvh3QaN+sry6GhrQ9pVUvFWYKcIkfxjkhVK4DBrdrz/vursdA2DkbDHDix6fIqYW/SQ+ehJkV2F1k18RZ76NiyrXj2sFVbwEbTc1Oef8mNVYOtEr7MS8A7qJ9MDmNzkXsconQEUQ8bzOp06lA9+ykRXwNp2XAk5AXo8dQ+2rJIc6PJ7FmXXlmu+RqGJUHeS3Ut92iOuP0F0HxCTlFfko3dxgoU6y15XQZgsKukOOw3JVTNLj+6Ht+I7d8WqJb+0H20x6h88bFmsy0X6Q2U/GyGBB+DlDwclOyweDajPc9BaRKzq0p/fd5TQw3UmsTF1fWONywpTjgNgbSETNSAcxtrkogp0r1MUvw==; 5:MDBQy9Il7DPcPfUCH2oZ+zi3SQkASToaQhliZlcz5UX/PFbXi8uUzileBa/nmhhtxDtk/NsbaKtqh7wGXPmWMHJyfOZRQfmond/9HsS8nfDCz9FHKjIiDOPDbvb2FgJXFsNZlsE4cC2A3wQEyTlxbIz5WipS9H7V7XGdXWqAavw=; 24:kNCOFZeE3YRhNWisMq0Q/KpReE52iFzd/fXp2I5DKJ2Rb9o77s0VBW85nPpogI79puTJDVAS1fpANxS+8n/4nich6KuoZ3QoPNnrBVi69RY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2427; 7:OUty6RPo7q1+GigpEjHglk1M/weCfjmpcC9BAil2qXKmJ+T+Ckq8SCjfEr3wjXMV51aR4Ku6LLew0Vz7xjioL+Vc+daENWNsCf1V1gN6Mghp3OLx17AbGgmv7H4kKJqfcxRUS+0Ry3Q4ShZRpfPdiCCAIPNbv3LVLmvYaSIUUvbI1IY6zDtiC6LV3dQXvuXiWBlNq1XwMrYh+l5K3vRPtx+gAJrhN4yMhih/PsD7rgVGcc3Dx78lIlEVepABcnCF X-MS-Office365-Filtering-Correlation-Id: 6c115441-d4bc-4f37-50b1-08d5af4a3b3a X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2018 09:59:28.6880 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6c115441-d4bc-4f37-50b1-08d5af4a3b3a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2427 Subject: [dpdk-dev] [PATCH v6 6/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: Tue, 01 May 2018 09:59:31 -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/meson.build | 2 + drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h | 216 ++++++++++++ .../raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map | 12 + 8 files changed, 672 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 26ce7b4..437d903 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -38,6 +38,7 @@ The public API headers are grouped by topics: [i40e] (@ref rte_pmd_i40e.h), [bnxt] (@ref rte_pmd_bnxt.h), [dpaa] (@ref rte_pmd_dpaa.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 5686cbb..88bee03 100644 --- a/doc/api/doxy-api.conf +++ b/doc/api/doxy-api.conf @@ -37,6 +37,7 @@ INPUT = doc/api/doxy-api-index.md \ drivers/net/i40e \ drivers/net/ixgbe \ drivers/net/softnic \ + 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 3b5a45a..264eca8 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_RAWDEV) += dpaa2_qdma.c +SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV)-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 9288350..b38a282 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_experimental +rte_qdma_init(void) +{ + DPAA2_QDMA_FUNC_TRACE(); + + rte_spinlock_init(&qdma_dev.lock); + + return 0; +} + +void __rte_experimental +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_experimental +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."); + 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", 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_experimental +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."); + return -1; + } + + /* Reset the QDMA device */ + ret = rte_qdma_reset(); + if (ret) { + DPAA2_QDMA_ERR("Resetting QDMA failed"); + 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", + 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"); + 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"); + rte_free(qdma_vqs); + qdma_vqs = NULL; + return -ENOMEM; + } + qdma_dev.fle_pool_count = qdma_config->fle_pool_count; + + return 0; +} + +int __rte_experimental +rte_qdma_start(void) +{ + DPAA2_QDMA_FUNC_TRACE(); + + qdma_dev.state = 1; + + return 0; +} + +int __rte_experimental +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"); + 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"); + 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_experimental +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_experimental +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_experimental +rte_qdma_stop(void) +{ + DPAA2_QDMA_FUNC_TRACE(); + + qdma_dev.state = 0; +} + +void __rte_experimental +rte_qdma_destroy(void) +{ + DPAA2_QDMA_FUNC_TRACE(); + + rte_qdma_reset(); +} + static const struct rte_rawdev_ops dpaa2_qdma_ops; static int 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/meson.build b/drivers/raw/dpaa2_qdma/meson.build index cf14c01..7b53370 100644 --- a/drivers/raw/dpaa2_qdma/meson.build +++ b/drivers/raw/dpaa2_qdma/meson.build @@ -5,3 +5,5 @@ deps += ['rawdev', 'bus_fslmc', 'ring'] sources = files('dpaa2_qdma.c') allow_experimental_apis = true + +install_headers('rte_pmd_dpaa2_qdma.h') 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..29a1e4b --- /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_experimental +rte_qdma_init(void); + +/** + * Get the QDMA attributes. + * + * @param qdma_attr + * QDMA attributes providing total number of hw queues etc. + */ +void __rte_experimental +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_experimental +rte_qdma_reset(void); + +/** + * Configure the QDMA device. + * + * @returns + * - 0: Success. + * - <0: Error code. + */ +int __rte_experimental +rte_qdma_configure(struct rte_qdma_config *qdma_config); + +/** + * Start the QDMA device. + * + * @returns + * - 0: Success. + * - <0: Error code. + */ +int __rte_experimental +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_experimental +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_experimental +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_experimental +rte_qdma_vq_destroy(uint16_t vq_id); + +/** + * Stop QDMA device. + */ +void __rte_experimental +rte_qdma_stop(void); + +/** + * Destroy the QDMA device. + */ +void __rte_experimental +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 33d2379..7335c35 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 @@ EXPERIMENTAL { + 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