From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0058.outbound.protection.outlook.com [104.47.1.58]) by dpdk.org (Postfix) with ESMTP id A99224C76 for ; Tue, 1 May 2018 11:59:34 +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=DVwj4mdcg2Bj98lqc9+cFiiEtoN5yZ+KlnteOEP0oRc=; b=Kz0SxKfkmd1MeLszK2hMlTGdaWmK4G4rQ4+r28BLyoZO0EfEVjjXlLLtJ9wjIQDLRFvCLGcbNJWWHF/6WjqzhUqQLrJwsUYRqFx6lxe/4BHmZhRkRiII+Mbk3RxE+8yQcAKQxtqa4PxS3Dpa93LYyWAOqec/ZAdVKzpY9WGFuOo= 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:31 +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:50 +0530 Message-Id: <1525168731-30912-8-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:ZstYj7K4N5pWExxU5cxVq1XsIW+V4H345LRrJAXdKwcm3uRasKoFzhm1BkiLXQ9jPCuFjCCBgYHz6m8Ru7pMCn0Yrn+BIuFcrfq/IPKofFPb9BAtqc3dBFqSzhYtcXRHBqExCY5oFzvIyg0jBw/p7cZNv3hSe/rbMAzBOcnt0NqMhynHMLdPju+NIX7ThWAOz842W2MZkzoHaG7dp4Io7sN7j6hT2em+/z+BLhdM1HYL1nlD09Hv1j0uLZ+XWZF2; 25:6dASyH6v2P8k9BeDEMNZs5OK8VwmspUDtjnWZF6nBClbmsCnE9AlqUBCqBZcIsxAJsdglBQoMTQwX2r4mJ6GIuxIygS28CkkhqY+M+j8EAZ9DtkHzdcHR1FQtMhUy30CuILzOakBMWWv1MTlpjhxvwab+KNg/eySQyBkSgfCHrlVex+Dtvt/3KVpAk9poIglz86GYbjkLp1dU/c5eRMOP4ikz0oxnCzFKrkc99NUmq7JaoXBr9N9YFl/vsqzRfwHtyvPBrI8xxuDjxgCKKx0My1zYuYg2H1rKsyrt5Rk68/7UicYgYC/RZo1KJCQougCrhGoVEMMa0WFb5NajRfJag==; 31:zOKxOB0pxEZRHNd81NBxlgqqoQtbQtqHRK1XsDkI/SCOXDX7nj8xJWQdvxF086ElZuRvNO27z3KWKx7/uoKqAg4UC1KQwiyw5dJmWn5HI92D+QqGA5zW7mBp5JVVdxNQR8WmaTUSC6rYqWJq++KN8l+SGitfbs33lBffNK2TwapLKXRW72R15xoZ4qo1C0N8FErHAhA/9j+OORfzoktWZSdv116VwbmOlqXmK79aNWk= X-MS-TrafficTypeDiagnostic: HE1PR0401MB2427: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2427; 20:aC0tBNdsPGJqI5bGnVdnbdHB6bnLTpUsEsaiTdgE2xRb4cjPbsi4696tSyHm5ppQh4BHYRGPqhw6tExLr/r94Ec5AvvuICOvHxBvUr5mthwNN3c2avFm9Ne5HMWHlZ1SIGuB9uHSF++Yg/y1oqCGrhuF2Q/Zf2x1tRUeYlEvnZUmgb5EQ81o+0ThwSMFNmOgfYozYQWJj17CpJTbInzlgvaCrlb5wiTkbP7a2cqe8SiFRILusgV8/Ik1IfNBTpuIGlHKSSlEpSXdc7EJEEcLRDrLHs0mvQg8JG0rE2jqRuD8pWHcSM2IOFOidXlL1ATHW6AKADpBU+Ir73pPsehl9TNslxDPjKoHgqixxqZpSo8yX6NjZD8YvVwKPkadM+qgIhrZW7tamU2GA2RZMLgVPgO7B1xcU8iYOatGFihOTMD5+DXbfqiIcDf7hw2g/GTQLZfcU0MjjL2lhaBla+7Ay7f7wVIsdrzWaP1LtJkxopsQa4HcwjD1HER4b1DO+l3F; 4:m9rJTTLS06QgoZJpS3h28iPrAeN2kMfNEDutDHWWmlPwpOBRKXmp1BPnz02eZJPzSBH5RtiIOLp18S/Zp+/THCRQ2zkGeJtE53scsYkZO1MlTeVmPh+NSmoWMQdArtLjdeYcTxnX3N1qQlTGKu2H4IrltHEZZ9LB7tkhuRDH5UDkYVa6smc0q2U673zqkacKSbxF/IGkbtOuYzeYf0AI+sMGDFrfgexaOyNsQGlB5FcujGavInX7/QDhjppR4ufx0cKhX4EsXe2WZhllV8To6ZsitGDTtywjFb9b9Duau/FkUbHD2CvZVY+K90V+QmbzCE+XaTkSm1RxCNhyV53t8mZn76KFxSi13iqhpYmTc4M= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); 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:0FMJXrt/K15xYl9IGA8f55590S6/J+4g3dWisqE?= =?us-ascii?Q?zMB+Z0oKPC/Vk2KhMYTE1lMuY27ItafHaoURlePlwjXd1KhhwckNX7YTYHU5?= =?us-ascii?Q?uOcilWj/aU2r8iDwzAC0KNmWYiV02zN6NXGHLTuwfP58HxPEmO4KoL58P0Yn?= =?us-ascii?Q?mYSfvnJj6NyMg1m4fgvWep5Yr4bnkykcVWNmUmyFx7EdSIGA6yDlAuXy2aYr?= =?us-ascii?Q?0KiDjp9USwCbARq+MNF8SmoGyX9+Cf5Os0ha/0IE3nvz/FFEKfUl15EL6bxI?= =?us-ascii?Q?1ZEUj/BHP0QWExUzOrlQ7oxx9b++c99ubaBs+v+PHb1AL9XHxDEi8tA3p6iI?= =?us-ascii?Q?xhyLavfOBBWsDgcVxnRzU6JJs9lfAOQNwt3L80/U8/pszYdDI/ObAYd8XYEE?= =?us-ascii?Q?qMMc6Gw0EUBZfZY/59mbFilj9ywPkWKZt9tSQNfsHXe6NmUdi6SqYjkTJAcM?= =?us-ascii?Q?sHbhhQokG+9bg8NAk13XQoollZBGSWSb09JrDWRhaiwyjGTVNEZDlKB1ZOqD?= =?us-ascii?Q?GvKw9AZzQHIrxDAIpRLZN3VxQmSbpLUiRLpSX/Nolzi46AQGqytPd6mhBbsU?= =?us-ascii?Q?NvlBCNH7rBJ3DCqepdjSVQdQ+r68gZtsnJUTnBI57tzVFS1YxRzA2Ex84SNQ?= =?us-ascii?Q?KEh9hSFXW+Hv9v0Eju83Y3PT8oSd23ztYO15GSX+vK4tr1D+/BTwXaQGdhMe?= =?us-ascii?Q?g3SMrY0eyjFQY05jX8q94Fu86I3E1naBS2TUhk59Vmh4IMfPtMv1lrQBqO8g?= =?us-ascii?Q?b+fXYg6njwGKYCCZfgZZUpGZUUOg+5pj0y6ccQArUs1G/XGoZMgHaVJT6Kh+?= =?us-ascii?Q?iOQr6j4zTBjQVKRuzSasfu1qCtee00fp7i0ADMRZAO7YLihMrMb6F72Ca9uF?= =?us-ascii?Q?8Kay6ti5i1zv3w1iZ3kbXrEIb2MpfElCqgFZxuMLZrydNN0Xs8cO9Ch7t/oa?= =?us-ascii?Q?V+tiKvWHyQWxaCSuVR9zhNvEkyGpa/jvt94Lacy3yR21ZnW42nOHdBzGyNKi?= =?us-ascii?Q?+jE32JzB5IUMdqD2oDUErj1DpLNrH8WYOTnUclRva//q2COPdsfJhRMchILT?= =?us-ascii?Q?HWCRSy3VK0fD83OpX7wYWyelQWER5yNLxMpHvJi5RX/bxUezDrFILiIIajwk?= =?us-ascii?Q?fZmm0zMRYvTn3ZuNXRgLl91FAjikbv6AfY96AwazLWO/oE7398UEdurYJ4dM?= =?us-ascii?Q?0uItMNfoUJnk+hkIjKkpcgNbW+JlbJtRBE0lAffw/QUk/Wi9VnyV14EsDi0S?= =?us-ascii?Q?PKr6Sz2EqCdKoI9vEajM8W8z60oiMmid0zPd9miqpIiZJOnhRJ244f/PVtF6?= =?us-ascii?Q?ppQ=3D=3D?= X-Microsoft-Antispam-Message-Info: 9wIv/SannZmG2VEwFfI2UqAcT8ZIrDBBjnuzXy3SCAFWO8W40iEaY63r/sK204/LNeYKZ+uM+2VmuS9xZwnwyVA+rpa2eB2nFIWAARHGgIFXf8JDr5YjiFjHBjzApg0Ypiuq8FDIQwoNr0BWxpWl4X2WgMVb8tz/Y5EYaFOCTihLm91mAJcK/zxJWIfN24u9 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2427; 6:tik/qn9wGWUFmHuHNfefBLXJSkdLcDXX4bhofvy1SzxYGK3PwF9r0XUGyHPqdv5jWLuRY8gfPXdTe35XehpzUd7Z7mEioRad1pNiMYuVMul2+rjh8lUOo93k5DB7iamEGBF9IyNwdDq+dv2mO3CigLztdZBSslUwibzfzwJAZn4mDfvcOu/uE5FtljYj6HRa+FRoaUTFzDNh5GD/XSt0eLnm8ccbgs5GXRXL+kRpAMaz9z6Yn+aY3co4YQYCS+99HbK0aeXvM7wRIFDemv1zIL3bH50H806sHZpstONIHcZx23/TV74SjewbFXCpzfocZqDOHcAYrvP9dGHSv58Bmx39XMqHbsg5mYK+bRSMZZOobNBGwcB2a6xzCwSZ28UGkUXB7nbABU+VaKFhgLKAkNpQ/DfHQDxPYXKyefRyRDUmfOOenXDQBlVjBTCgflBSbQmzpzY9bk3ZgVWG33IP8A==; 5:ZUkk6TD0TliWtB9CG21D3e+VxahZw0xrYWg+AbbgccI7SpS+PDJUD6tlJF6hOJDlDnu4xVTjXa50x7NAoUHvwKJym9RaLg2HXsMsqRPt9LaTuAI/TUal7OArVK7yHzlNQvtwOSZ/FJZKh+baRaXAGlidVQ5a8jQhhjCcrhxqnPE=; 24:jqfIczCAlOi0WvjKxjPqSP5waSA7N48IGVVyCD/cmmo/ZIgvIGLVUyLsT+pplNkVkhCqFTcoV93QZfB/IR/Pe1KfdCSdfr5uebst88YuG68= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2427; 7:lvkc2mV0TA1dt0hhqgCMjGwfu26DRBuTYUgtBVAzDoS+EQj+C8M50MXYTVJV+0F28ckH7kkAcWDa5WxYjiMd5yof1TT46gljU+ghLRhil6kpoUUg0BJAObVx/DjYW8Ka+FcrAW4IGeera+qbBQ+9TQKeMSAGgzbuLqaV8wzM4pKDDi5tfP889vi6pnOiYXoVwopC3Wwi6ltK3NUjGvbO/arj8YZXL7s1doP6p1IYQmq0Rfe/FN5uh0fVQn1VSwxe X-MS-Office365-Filtering-Correlation-Id: 62a8028e-8db7-4170-61eb-08d5af4a3d31 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2018 09:59:31.9849 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62a8028e-8db7-4170-61eb-08d5af4a3d31 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 v5 7/8] raw/dpaa2_qdma: support enq and deq operations 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:35 -0000 Signed-off-by: Nipun Gupta --- drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 333 +++++++++++++++++++++ drivers/raw/dpaa2_qdma/dpaa2_qdma.h | 21 ++ drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h | 70 +++++ .../raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map | 4 + 4 files changed, 428 insertions(+) diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c index b38a282..1d15c30 100644 --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c @@ -344,6 +344,339 @@ return i; } +static void +dpaa2_qdma_populate_fle(struct qbman_fle *fle, + uint64_t src, uint64_t dest, + size_t len, uint32_t flags) +{ + struct qdma_sdd *sdd; + + DPAA2_QDMA_FUNC_TRACE(); + + sdd = (struct qdma_sdd *)((uint8_t *)(fle) + + (DPAA2_QDMA_MAX_FLE * sizeof(struct qbman_fle))); + + /* first frame list to source descriptor */ + DPAA2_SET_FLE_ADDR(fle, DPAA2_VADDR_TO_IOVA(sdd)); + DPAA2_SET_FLE_LEN(fle, (2 * (sizeof(struct qdma_sdd)))); + + /* source and destination descriptor */ + DPAA2_SET_SDD_RD_COHERENT(sdd); /* source descriptor CMD */ + sdd++; + DPAA2_SET_SDD_WR_COHERENT(sdd); /* dest descriptor CMD */ + + fle++; + /* source frame list to source buffer */ + if (flags & RTE_QDMA_JOB_SRC_PHY) { + DPAA2_SET_FLE_ADDR(fle, src); + DPAA2_SET_FLE_BMT(fle); + } else { + DPAA2_SET_FLE_ADDR(fle, DPAA2_VADDR_TO_IOVA(src)); + } + DPAA2_SET_FLE_LEN(fle, len); + + fle++; + /* destination frame list to destination buffer */ + if (flags & RTE_QDMA_JOB_DEST_PHY) { + DPAA2_SET_FLE_BMT(fle); + DPAA2_SET_FLE_ADDR(fle, dest); + } else { + DPAA2_SET_FLE_ADDR(fle, DPAA2_VADDR_TO_IOVA(dest)); + } + DPAA2_SET_FLE_LEN(fle, len); + + /* Final bit: 1, for last frame list */ + DPAA2_SET_FLE_FIN(fle); +} + +static int +dpdmai_dev_enqueue(struct dpaa2_dpdmai_dev *dpdmai_dev, + uint16_t txq_id, + uint16_t vq_id, + struct rte_qdma_job *job) +{ + struct qdma_io_meta *io_meta; + struct qbman_fd fd; + struct dpaa2_queue *txq; + struct qbman_fle *fle; + struct qbman_eq_desc eqdesc; + struct qbman_swp *swp; + int ret; + + DPAA2_QDMA_FUNC_TRACE(); + + if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + ret = dpaa2_affine_qbman_swp(); + if (ret) { + DPAA2_QDMA_ERR("Failure in affining portal"); + return 0; + } + } + swp = DPAA2_PER_LCORE_PORTAL; + + txq = &(dpdmai_dev->tx_queue[txq_id]); + + /* Prepare enqueue descriptor */ + qbman_eq_desc_clear(&eqdesc); + qbman_eq_desc_set_fq(&eqdesc, txq->fqid); + qbman_eq_desc_set_no_orp(&eqdesc, 0); + qbman_eq_desc_set_response(&eqdesc, 0, 0); + + /* + * Get an FLE/SDD from FLE pool. + * Note: IO metadata is before the FLE and SDD memory. + */ + ret = rte_mempool_get(qdma_dev.fle_pool, (void **)(&io_meta)); + if (ret) { + DPAA2_QDMA_DP_WARN("Memory alloc failed for FLE"); + return ret; + } + + /* Set the metadata */ + io_meta->cnxt = (size_t)job; + io_meta->id = vq_id; + + fle = (struct qbman_fle *)(io_meta + 1); + + /* populate Frame descriptor */ + memset(&fd, 0, sizeof(struct qbman_fd)); + DPAA2_SET_FD_ADDR(&fd, DPAA2_VADDR_TO_IOVA(fle)); + DPAA2_SET_FD_COMPOUND_FMT(&fd); + DPAA2_SET_FD_FRC(&fd, QDMA_SER_CTX); + + /* Populate FLE */ + memset(fle, 0, QDMA_FLE_POOL_SIZE); + dpaa2_qdma_populate_fle(fle, job->src, job->dest, job->len, job->flags); + + /* Enqueue the packet to the QBMAN */ + do { + ret = qbman_swp_enqueue_multiple(swp, &eqdesc, &fd, NULL, 1); + if (ret < 0 && ret != -EBUSY) + DPAA2_QDMA_ERR("Transmit failure with err: %d", ret); + } while (ret == -EBUSY); + + DPAA2_QDMA_DP_DEBUG("Successfully transmitted a packet"); + + return ret; +} + +int __rte_experimental +rte_qdma_vq_enqueue_multi(uint16_t vq_id, + struct rte_qdma_job **job, + uint16_t nb_jobs) +{ + int i, ret; + + DPAA2_QDMA_FUNC_TRACE(); + + for (i = 0; i < nb_jobs; i++) { + ret = rte_qdma_vq_enqueue(vq_id, job[i]); + if (ret < 0) + break; + } + + return i; +} + +int __rte_experimental +rte_qdma_vq_enqueue(uint16_t vq_id, + struct rte_qdma_job *job) +{ + struct qdma_virt_queue *qdma_vq = &qdma_vqs[vq_id]; + struct qdma_hw_queue *qdma_pq = qdma_vq->hw_queue; + struct dpaa2_dpdmai_dev *dpdmai_dev = qdma_pq->dpdmai_dev; + int ret; + + DPAA2_QDMA_FUNC_TRACE(); + + /* Return error in case of wrong lcore_id */ + if (rte_lcore_id() != qdma_vq->lcore_id) { + DPAA2_QDMA_ERR("QDMA enqueue for vqid %d on wrong core", + vq_id); + return -EINVAL; + } + + ret = dpdmai_dev_enqueue(dpdmai_dev, qdma_pq->queue_id, vq_id, job); + if (ret < 0) { + DPAA2_QDMA_ERR("DPDMAI device enqueue failed: %d", ret); + return ret; + } + + qdma_vq->num_enqueues++; + + return 1; +} + +/* Function to receive a QDMA job for a given device and queue*/ +static int +dpdmai_dev_dequeue(struct dpaa2_dpdmai_dev *dpdmai_dev, + uint16_t rxq_id, + uint16_t *vq_id, + struct rte_qdma_job **job) +{ + struct qdma_io_meta *io_meta; + struct dpaa2_queue *rxq; + struct qbman_result *dq_storage; + struct qbman_pull_desc pulldesc; + const struct qbman_fd *fd; + struct qbman_swp *swp; + struct qbman_fle *fle; + uint32_t fqid; + uint8_t status; + int ret; + + DPAA2_QDMA_FUNC_TRACE(); + + if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + ret = dpaa2_affine_qbman_swp(); + if (ret) { + DPAA2_QDMA_ERR("Failure in affining portal"); + return 0; + } + } + swp = DPAA2_PER_LCORE_PORTAL; + + rxq = &(dpdmai_dev->rx_queue[rxq_id]); + dq_storage = rxq->q_storage->dq_storage[0]; + fqid = rxq->fqid; + + /* Prepare dequeue descriptor */ + qbman_pull_desc_clear(&pulldesc); + qbman_pull_desc_set_fq(&pulldesc, fqid); + qbman_pull_desc_set_storage(&pulldesc, dq_storage, + (uint64_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1); + qbman_pull_desc_set_numframes(&pulldesc, 1); + + while (1) { + if (qbman_swp_pull(swp, &pulldesc)) { + DPAA2_QDMA_DP_WARN("VDQ command not issued. QBMAN busy"); + continue; + } + break; + } + + /* Check if previous issued command is completed. */ + while (!qbman_check_command_complete(dq_storage)) + ; + /* Loop until dq_storage is updated with new token by QBMAN */ + while (!qbman_check_new_result(dq_storage)) + ; + + /* Check for valid frame. */ + status = qbman_result_DQ_flags(dq_storage); + if (unlikely((status & QBMAN_DQ_STAT_VALIDFRAME) == 0)) { + DPAA2_QDMA_DP_DEBUG("No frame is delivered"); + return 0; + } + + /* Get the FD */ + fd = qbman_result_DQ_fd(dq_storage); + + /* + * Fetch metadata from FLE. job and vq_id were set + * in metadata in the enqueue operation. + */ + fle = (struct qbman_fle *)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)); + io_meta = (struct qdma_io_meta *)(fle) - 1; + if (vq_id) + *vq_id = io_meta->id; + + *job = (struct rte_qdma_job *)(size_t)io_meta->cnxt; + (*job)->status = DPAA2_GET_FD_ERR(fd); + + /* Free FLE to the pool */ + rte_mempool_put(qdma_dev.fle_pool, io_meta); + + DPAA2_QDMA_DP_DEBUG("packet received"); + + return 1; +} + +int __rte_experimental +rte_qdma_vq_dequeue_multi(uint16_t vq_id, + struct rte_qdma_job **job, + uint16_t nb_jobs) +{ + int i; + + DPAA2_QDMA_FUNC_TRACE(); + + for (i = 0; i < nb_jobs; i++) { + job[i] = rte_qdma_vq_dequeue(vq_id); + if (!job[i]) + break; + } + + return i; +} + +struct rte_qdma_job * __rte_experimental +rte_qdma_vq_dequeue(uint16_t vq_id) +{ + struct qdma_virt_queue *qdma_vq = &qdma_vqs[vq_id]; + struct qdma_hw_queue *qdma_pq = qdma_vq->hw_queue; + struct dpaa2_dpdmai_dev *dpdmai_dev = qdma_pq->dpdmai_dev; + struct rte_qdma_job *job = NULL; + struct qdma_virt_queue *temp_qdma_vq; + int dequeue_budget = QDMA_DEQUEUE_BUDGET; + int ring_count, ret, i; + uint16_t temp_vq_id; + + DPAA2_QDMA_FUNC_TRACE(); + + /* Return error in case of wrong lcore_id */ + if (rte_lcore_id() != (unsigned int)(qdma_vq->lcore_id)) { + DPAA2_QDMA_ERR("QDMA dequeue for vqid %d on wrong core", + vq_id); + return NULL; + } + + /* Only dequeue when there are pending jobs on VQ */ + if (qdma_vq->num_enqueues == qdma_vq->num_dequeues) + return NULL; + + if (qdma_vq->exclusive_hw_queue) { + /* In case of exclusive queue directly fetch from HW queue */ + ret = dpdmai_dev_dequeue(dpdmai_dev, qdma_pq->queue_id, + NULL, &job); + if (ret < 0) { + DPAA2_QDMA_ERR( + "Dequeue from DPDMAI device failed: %d", ret); + return NULL; + } + } else { + /* + * Get the QDMA completed jobs from the software ring. + * In case they are not available on the ring poke the HW + * to fetch completed jobs from corresponding HW queues + */ + ring_count = rte_ring_count(qdma_vq->status_ring); + if (ring_count == 0) { + /* TODO - How to have right budget */ + for (i = 0; i < dequeue_budget; i++) { + ret = dpdmai_dev_dequeue(dpdmai_dev, + qdma_pq->queue_id, &temp_vq_id, &job); + if (ret == 0) + break; + temp_qdma_vq = &qdma_vqs[temp_vq_id]; + rte_ring_enqueue(temp_qdma_vq->status_ring, + (void *)(job)); + ring_count = rte_ring_count( + qdma_vq->status_ring); + if (ring_count) + break; + } + } + + /* Dequeue job from the software ring to provide to the user */ + rte_ring_dequeue(qdma_vq->status_ring, (void **)&job); + if (job) + qdma_vq->num_dequeues++; + } + + return job; +} + void __rte_experimental rte_qdma_vq_stats(uint16_t vq_id, struct rte_qdma_vq_stats *vq_status) diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.h b/drivers/raw/dpaa2_qdma/dpaa2_qdma.h index fe1da41..c6a0578 100644 --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.h +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.h @@ -18,10 +18,31 @@ /** FLE pool cache size */ #define QDMA_FLE_CACHE_SIZE(_num) (_num/(RTE_MAX_LCORE * 2)) +/** Notification by FQD_CTX[fqid] */ +#define QDMA_SER_CTX (1 << 8) + +/** + * Source descriptor command read transaction type for RBP=0: + * coherent copy of cacheable memory + */ +#define DPAA2_SET_SDD_RD_COHERENT(sdd) ((sdd)->cmd = (0xb << 28)) +/** + * Destination descriptor command write transaction type for RBP=0: + * coherent copy of cacheable memory + */ +#define DPAA2_SET_SDD_WR_COHERENT(sdd) ((sdd)->cmd = (0x6 << 28)) + /** Maximum possible H/W Queues on each core */ #define MAX_HW_QUEUE_PER_CORE 64 /** + * In case of Virtual Queue mode, this specifies the number of + * dequeue the 'qdma_vq_dequeue/multi' API does from the H/W Queue + * in case there is no job present on the Virtual Queue ring. + */ +#define QDMA_DEQUEUE_BUDGET 64 + +/** * Represents a QDMA device. * A single QDMA device exists which is combination of multiple DPDMAI rawdev's. */ diff --git a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h index 29a1e4b..17fffcb 100644 --- a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h +++ b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h @@ -175,6 +175,76 @@ struct rte_qdma_job { rte_qdma_vq_create(uint32_t lcore_id, uint32_t flags); /** + * Enqueue multiple jobs to a Virtual Queue. + * If the enqueue is successful, the H/W will perform DMA operations + * on the basis of the QDMA jobs provided. + * + * @param vq_id + * Virtual Queue ID. + * @param job + * List of QDMA Jobs containing relevant information related to DMA. + * @param nb_jobs + * Number of QDMA jobs provided by the user. + * + * @returns + * - >=0: Number of jobs successfully submitted + * - <0: Error code. + */ +int __rte_experimental +rte_qdma_vq_enqueue_multi(uint16_t vq_id, + struct rte_qdma_job **job, + uint16_t nb_jobs); + +/** + * Enqueue a single job to a Virtual Queue. + * If the enqueue is successful, the H/W will perform DMA operations + * on the basis of the QDMA job provided. + * + * @param vq_id + * Virtual Queue ID. + * @param job + * A QDMA Job containing relevant information related to DMA. + * + * @returns + * - >=0: Number of jobs successfully submitted + * - <0: Error code. + */ +int __rte_experimental +rte_qdma_vq_enqueue(uint16_t vq_id, + struct rte_qdma_job *job); + +/** + * Dequeue multiple completed jobs from a Virtual Queue. + * Provides the list of completed jobs capped by nb_jobs. + * + * @param vq_id + * Virtual Queue ID. + * @param job + * List of QDMA Jobs returned from the API. + * @param nb_jobs + * Number of QDMA jobs requested for dequeue by the user. + * + * @returns + * Number of jobs actually dequeued. + */ +int __rte_experimental +rte_qdma_vq_dequeue_multi(uint16_t vq_id, + struct rte_qdma_job **job, + uint16_t nb_jobs); + +/** + * Dequeue a single completed jobs from a Virtual Queue. + * + * @param vq_id + * Virtual Queue ID. + * + * @returns + * - A completed job or NULL if no job is there. + */ +struct rte_qdma_job * __rte_experimental +rte_qdma_vq_dequeue(uint16_t vq_id); + +/** * Get a Virtual Queue statistics. * * @param vq_id 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 7335c35..fe42a22 100644 --- a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map +++ b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map @@ -10,6 +10,10 @@ EXPERIMENTAL { rte_qdma_stop; rte_qdma_vq_create; rte_qdma_vq_destroy; + rte_qdma_vq_dequeue; + rte_qdma_vq_dequeue_multi; + rte_qdma_vq_enqueue; + rte_qdma_vq_enqueue_multi; rte_qdma_vq_stats; local: *; -- 1.9.1