From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50082.outbound.protection.outlook.com [40.107.5.82]) by dpdk.org (Postfix) with ESMTP id 92C6E8D8D for ; Fri, 20 Apr 2018 06:05:14 +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=cyhHEM+x/NgCvu7PlZsf6gpjWi10brYEtp3Jahgteio=; b=m/iO/7ZfhsaXKoEZoD4gqIYl2RNy+GnctUzbLIxmCMQreDOk+bW2LfJh1nTVj7eUrH0aA/Suo+JIETgyCR+oh70tq1dtYjz+qbIAczeitgV6rT330jpt2+PLqZxjOsPbYgy5UgE8ioZgYU/gHzsfkH2s1dOTsHxZsXtwmZx8pFQ= 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 DB6PR0401MB2422.eurprd04.prod.outlook.com (2603:10a6:4:4a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.14; Fri, 20 Apr 2018 04:05:12 +0000 From: Nipun Gupta To: shreyansh.jain@nxp.com, thomas@monjalon.net, hemant.agrawal@nxp.com Cc: dev@dpdk.org, Nipun Gupta Date: Fri, 20 Apr 2018 09:34:19 +0530 Message-Id: <1524197062-1230-7-git-send-email-nipun.gupta@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1524197062-1230-1-git-send-email-nipun.gupta@nxp.com> References: <1523114224-9852-1-git-send-email-nipun.gupta@nxp.com> <1524197062-1230-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: BM1PR01CA0092.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1::32) To DB6PR0401MB2422.eurprd04.prod.outlook.com (2603:10a6:4:4a::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB6PR0401MB2422; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2422; 3:1p5AH53nsP/8jRMSk+qpaN11TSfOONalgQeS81sYZH/q9CwqGqCgzngF3Z8IGg4ON56p8D7mDhwN0MsDoNAB2NFy06txHFYv/jzZM0VGbrnUygG9bOkMG6CfCir1sEtPULXDYKSy8PUJOWOSQ5wIpUoDOvCHUeZfpY41onaaarf1TgsKKxcFAhUVJQbgUdkxkjWxeob+yNA111LHp29c0OHoNpjKVFAgUlRWbhlvWAQhOc2//vsqBDIpVGTtkg2Y; 25:7ZCDkyjaA3aUGhpA4RXzFS25RgNbSL0xyM7DQHJW63IJb+aXecY1mUyNsL+2v9VMiLsK2UsN1hHOBDOu2az2PmMc7PEw6N6b4rUZkPAtSIW0uaSgU+Be4yuch2HvHey/y8V36JxURAYo1ZMvdmS62y2JlftHC+eKw3AQBaYmciNlx3iMxJO2AxnB7dK131vBDSnJALZNwoZmutKD+8UbbRrXAjraEJn9GXqadMi7IGaGEjVrk+HCaJ/aVRyreT/wvkj9lUlf0i+eli+/5LPler2erGgmuNuQSPE6PbEvuMoiRctMqmZwMq8lNmwU/KcuFkhTremDcmVnG3eBqxolOA==; 31:v5tzRI3VbekxK+hKg6beotJ04e173DCEsMlOtouGU3gf5x+SRDJI2x9nSexAjN9m3Ufrm5TAsyzZmXxgj3+uNfYW8ILKoV2qLdhs2WBbzvNxLWh3e1KJE2jrLAPskPTYLe7xaH78/wTtADUO5z8mqPrasw1PdcSWm1kU2ui7F0Nkx1B37A+GDoQZuq84xLYD/bxfIfn9DQe4NILRUjkz+n9loiyrkUQB3PkOvQhhs5o= X-MS-TrafficTypeDiagnostic: DB6PR0401MB2422: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2422; 20:f/4F1QDNsnIKLmi9rxf3WKJa3FF8TjZY5P/vDFRkcIjSO0/2Ai52iAmGzQHnJH/tdMhrYBLlHxgFXO5vnLVIgw9MD5QXo5zUarwsDIuSTumHc6/3nbLeVAlJqk+BNuzA2Srf71mZuWSe/yq41FTVVqUSpW9Za3hhZISiJTiwZhKTK3Uebn9phnZI2vRPuP6MPGMlmBxWxKfKNKFb2PQlriCOlpgpk1oBHCzpEDUK+Kk6HUomh6eqE8RC8KuUZOK6CQ6N27JwgC4pNYA2u8gWXrbfgK67xTSvV5E6Xg1E9VYTT7drVrE2LXnX6Nb/gdEn26CldzMwjUZMTuvNF1IzMksIjDUr/mx5AOtbSVAv5LGEBKw7XBp5Z5VNpSptw82GPBZdbG4pvw89vq427SnhQWDlt8eu6Lrc+zv4MFqEvsd6lirhRWaGacbXcFJADm47t0x9fHoxYOwSCERV01ecj+F8+4Gw/g4eAuAq06PJEqmSHGqhHzGQDdssyTcQXFxP; 4:f4tKP3tRhn4a/X+NJuaiXrlVGBzRVHryHHV49QhhBq2mq9rBn54zl77qG0ANrOdXKt7g3h6otp9dWMEEjNQ2XG0Sv/YLyFyNasxqcv9kJ7itP2fMcfTOyU1tobn3cGsGeqdgsPSQ8V13EpKNcxtRPNosdxQMlX3lCSDFYiPwjnp4sr1TL5E11WGeGPwh32unxp5u+oq7pX1IUuyrjKGTvfmuwsZKvFbv1euw9t0/iNk6a9I612inQiab8Me5PQcGTAqbgnaXTSaXl+CdW5ZvKs/726YBgVoAng+hCggWnHNJuMyVfsVAwqRwiP4fovaB 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)(3002001)(93006095)(93001095)(10201501046)(3231232)(944501327)(52105095)(6055026)(6041310)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB6PR0401MB2422; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0401MB2422; X-Forefront-PRVS: 0648FCFFA8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(39860400002)(39380400002)(396003)(346002)(7736002)(316002)(25786009)(51416003)(50466002)(16586007)(76176011)(66066001)(16526019)(47776003)(48376002)(81166006)(8936002)(8676002)(551934003)(6512007)(50226002)(36756003)(52116002)(2906002)(4326008)(476003)(305945005)(6486002)(53936002)(2616005)(6636002)(956004)(44832011)(386003)(11346002)(3846002)(5660300001)(26005)(6116002)(6506007)(5009440100003)(59450400001)(446003)(575784001)(478600001)(86362001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0401MB2422; H:b27504-OptiPlex-790.ap.freescale.net; FPR:; SPF:None; LANG:en; MLV:nov; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0401MB2422; 23:rnGVKLgj5sdcNxZwFSTad+FCXVtF7V5/6sWZ4xv?= =?us-ascii?Q?TjzwZI2ozvQtpXXkm+mF4vUn4ZPMnAmPlDLpoMIyGQvQ5C/IXgS5fr+nrOwC?= =?us-ascii?Q?vjutVkNrerWF1zmKU9a4Pj+J/vPhBbBdTsbk5OJvxUtDTQrZCwfr3EjRpYcF?= =?us-ascii?Q?nCmSt5lgl9Aeg2cnpvHtoseHXI8fMPxp1AHulgucNy/6szkWeMGbxUJHYo0X?= =?us-ascii?Q?K3POCXcKtLGBGInMqRr0K4ZN7TkpNF9D1sQsBYfSIsiX+pZTysL84crAzWc/?= =?us-ascii?Q?6hz2Bd2t0J5OPhUr0GhpGD3cqHACtI+oJEPtSPGnh9MwawqxsWZ7WKCzMWiV?= =?us-ascii?Q?w1WW2XTAacm8KSloXpFVlrg7QqkIdxXn0TmYlItG9V6Dj5dnIJ5eXo7cQXa6?= =?us-ascii?Q?flVQvilDu2+nJSIApc3fbqOSN2UX3tfaByH3uXcxWuyA7XPaV+kjXmZChJdZ?= =?us-ascii?Q?GZvISiLvvtX+GChjXoesRyGySp8za2OYlW0hys6La0TONZvT6zZdAM3uOrLO?= =?us-ascii?Q?oSyuCEE4hYPTpD7l3iSfXRVGlpFUm9f7FGlPtqlkMdDXUYUrgLbx03zEXLhw?= =?us-ascii?Q?uNrumIe6Aelp+rLYPBRTftsjTupTqLOOj5sQV7S8KIXQelA9qOFKiGDViPGv?= =?us-ascii?Q?kC0pNVKAJA6pCWzVt6BTspiM3o1BJAw2jfHJrVF4MQu7J2dVii+Weo0cSxoR?= =?us-ascii?Q?VjvEG7IIrrWKXYcngoUvaNN/Oq0ZWeSx6S0YSTUZUPjzBNTb5HsFpucX4h85?= =?us-ascii?Q?MUUPqrO0kK/wT20mfDzvMryF+3mJ6tTwJpEYBrZVcoYW1bmW9ztTA1IJKyA4?= =?us-ascii?Q?4+LDjnDHAmPM74/7W0J/QDXuFRFM3i2LGmLLaxQ4BuSbkLR1XV4fYmcT9/uP?= =?us-ascii?Q?fRxKw8hD8RHo3rVHydY0R7nrndpKqVruPpuQttlQiwzDkhzOwpIN6wX2s9Nm?= =?us-ascii?Q?rGuRxmvDkZLoMstA5sEkHKPxb9Hyi69liTU2VxapDznedgf1nnIOMXEYuP5L?= =?us-ascii?Q?FPECkgQ+1SPFsOTHuzz8yuyOCRzD/Qzy9dcsFKv/TDM3fQgGC0NJIYw4fc0/?= =?us-ascii?Q?/4vn9mXDHCut4j1F9bTK8KrKwHPobw2zplVHoNf+y088x7SqbyQ9qwl5H1iJ?= =?us-ascii?Q?WTDnTq3qK5iCUK/IBSbk3ZhB+VWwf7rAb?= X-Microsoft-Antispam-Message-Info: X72ymHbm9IM2aavwKFT353Wy9dnmtiSyw6ztIs9t/fidlcFCzY9YzSOfekrwlWze+oLTppz/sQlo/zvwcHkpFq+5idItV7+3Cnejf6ReZHvssdFElf2z3+Sl2Ur4Dm79z14zerNeBYiIu3M36qq91YMX4PaXD6aKvz6GYpQ2Zn/C1j0puqdiYoGmU3ixmiqN X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2422; 6:BZRNQY4MmUIGiMv6wlxu/TLZwW2f0K/mms9tBkcqhRcY+keaesN3DMWgOgOZBI2sp+EeQXgh5lpzXijhV+UYsaa7nuTH+ROM/Kis80/bSHbD2dgM4hWxfSANqUr1UFFf0iKo/Xh0u5DuRWqmmPOTp4FTK152ZpaOHg03qo3rErCe5/quWFPualx0hZxC7ujQfGTK8me9hUGwHU+MWerxLLYkfv9Q7FVMFkZbDLNl0Ni1t/8HoukYbfluHkzjhz7pRqKZIWCI4VanbkPswjtVLY+WGS14SW6Svs5PFldFvvvEyVuKxA7+c3zOzbBRNoCXvFbZx896l5TrlHFHQ5OB+LYqPPpD3tlWHw8gpW/JQiIxcNYUBwC3oIozhbXvhSpNVVWxJkWICq9WfvQvl9EeBBn6FcNJk5StorE1LqBtULkqQ/oiOCS9FwBTYeiL0fKFWzdC3z5jAO3Y3j1Nm3I4yg==; 5:F1xulpXq1Fr19YeoE723OAFoyDwePr7meIQ/by+hWGjPimQ9mRzLNZogDP573vgS3m5sBfR0c1sF6+m7R1ThZkmLE8L4ZpamCm/bvlNczRvc3FY7qTybPaTUbT2uy0UiqPo5PmeJxmurrVbcAZrTPW0VocTtmsjPRNLhXzb+pyY=; 24:aR3ilJnnI9CM6KOtAd2cM2nOO0dfTZz3qlWjwt6F42gfqUfmbwNk5vm5ivn6E7v1SuRh9Iesce5CF5qZi96ox40sVML0MKICfeGvmBgXoFY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2422; 7:n4WQVwIinUvmxkk8/VlcYU3SmCy0612MQ1XSJKaZcAfmtwP40L4434p3Dtp6j2lsgzxX+Q7jzNtBeKuoGUcPdcmJyEZzRiVee49NO0/Ze5c6NZSnUPKGI6UqWob/Fo+gPsIY1aHhomJz7Z8ahQ0TN/YjPB5S2R99tqR0Oi+8GYbh/z8SZ8xDphaTun8kX7xQnqwBObgTXqP39Orme6mhILLHJocS3QqX16jF58T2JaASq8abEzYdM+zce6Jriqmu X-MS-Office365-Filtering-Correlation-Id: 08b0a596-e57c-4ac2-7e52-08d5a673eab7 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2018 04:05:12.1511 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08b0a596-e57c-4ac2-7e52-08d5a673eab7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2422 Subject: [dpdk-dev] [PATCH 6/9 v2] 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: Fri, 20 Apr 2018 04:05:15 -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 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 ad8bdcf..18a7ed4 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 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 9c5b0bc..2325a8d 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."); + 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_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_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"); + 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_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