From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0044.outbound.protection.outlook.com [104.47.0.44]) by dpdk.org (Postfix) with ESMTP id D93BA1CA6A for ; Sat, 7 Apr 2018 17:17:46 +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=xxf8lP70u4lu+bOCSOqu55d01+g0YzRR379jnQz2Nkc=; b=Ha3w3R7IL4JL+2xjRi4xIml0o56AvpfXMtSPT2VtC8YRxA2kketlxHChBz49upTc86fCZ3I+mvyTVa3pHHB2FnmnmIqOi2dbBXr1+jqbSKArChDt+UledZiTIkPM5JHe+BNSemC+OYyz0uKWEBCfmY3exZSxrB4yehXhh9FVltQ= 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:43 +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:02 +0530 Message-Id: <1523114224-9852-7-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: 72c9adcf-effc-4915-ca43-08d59c9ab687 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:+U+98FjuUaH3AtAdgman3Cm7w8wCQb9d50+bEzGUqLpYgftIPIb9BdPWcBQ2QJvj+inzkg87hoZVHieQCkcl5XnFmLj2biMyWmqFpqo2Hqz0Xv0wmGgOUEcw2RylMbvhHI+WE73ulpYeKwVYqtMKtkmuSgMf97jlW2KwBCC1AyV6dLLZCN/lnL8khwPQcgYoIN7JmlzeM/w99KTKLhXCqYfinvr2E1T6utzh0u9WP6cUddbGekYaZe4mGi0vhtlz; 25:sIhcAmXJW5TtpflMtrh7MLmWH5/au88+enB9qydYPRlpZ+OhTZPjcHlsbhS4LAUBW7maJuciSrlJQIGJF1Zq/5Wrpk4RkG4BVescoSJ8f06+hYuvt5EH8gr9Fa5SCbqyqTh7zXeqI/XXZvMMURrGpVB88tjjoGjBLPJnOWnBepzxwC1ZXtXjuyCb5Lu1+KoGebw42NvnwlA9XICiuksc3NTF/7GH4qjER6HSEfbwuGjvT6hGcJLIP86j3vR1SPCu6cO1RUSC2tspg8G8eXhDnl7syA1ke2kXPZFW+asqbJr1WMenrC4LVyeeu+OtPBGWOhWkvWERpnBxGQxYfe41Tg==; 31:AB6X9KGXnwX65UZpxLIjKYMOpEy9dQMA59g+bC3J+xHp/Dfh7fcRFo7/eLTaTxZ1vBXX++8Cp3qSHMWMaK0LIFNT67j4LAWM/TROypUpMH25nLUkk17Gu8mWJK9GGqOX3FnDo5I8BW4O891Wjot1AYqgdx0CKMDZ3lq+pu77cU7ak4nnkOvE7HPxidsLrFzPiUAFKqsNaIhu0aDuQB6xb7z8DNQhMVpgPJGgusEFC+k= X-MS-TrafficTypeDiagnostic: HE1PR0401MB2425: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2425; 20:rvVtG+s7V37L60bl+f4gfW3MaC3mrkStLLM8RY4naMV/8kGmNNDoMmzYczLPQVMGfNUtsV80/56AuMoQ0l9ixvrNJaugEBxLAmT+Kgahe6weqfK5wSwMbiCfjZDpORZ12rxiPt9HrzzIkR7kCC2A39QIIJrUlt8plcmvwYpSqNgi9DAdELnkQAs2w67wFp3Sfam5tiw5Oj4fVncue4EDWHxmVCDTcAC1RJoYqYQu59asj+NKp1UxXN2p9IZZZS35zDQkAyPSSF8YAI8PC4ryakrCTg0cezGuXofqvzs1sJTtpPsHcBryO+uaVSobjqp98ZIK0aOJFf6+ZNzsyl99XKXafL8Ya6XeYMCv5/jO0jLPMs1//RpsogB34HkYLw9kTeD3k+hpTEI3l0zr4wBxMlTo1HX1sCnjIY1wDVn3zzhhsxj0P2vW+oCqvzRsG+gufiycAsCymH/yazaFAzxxr6kYb//KYJUL37kFRsG3k59EERGXjLCvRQ1LJPB/Z6mt; 4:c3efp12TmioVBhCwYE/YHlo94KPYso4TzG019sOom2f0MiBGkqUotgc5N/bXm6oJ3A7vDebGASDF1mVYzPTf/Y89WLsQXV/NSqhqALsWoV/EftELAKSniMMMBFKWdgAIQHdbvZltTZTCXzn7YzYDIUWJ+AJ1JoRG9ySnV7zvp/bWs6YkRhXoZRLqvVtMAMJfjvC2WHeDoAbX0hu114GYuAUtK/lk+HKKgMo3UgJ1rBGf09xRriXv75Kq/tI00S8rwJiKmhaO7zMNIR/4VpadO1C79bVsQCKwcSMeOwKpd15tKHA6L8ebU8ubxHUXqb+w3lQvRRRJn7q35MU+WGyWd/OKJpYVLRIJEty3uYalunE= 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)(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)(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); 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:Q93GRjJV6eP8WK4qh+7GScjyoNF8NP57iP/UOUo?= =?us-ascii?Q?W+FxvxMtjgBivIpQENpAdXxJWT4969z3ZZI9X7WBcN2laQ3Ng774u0UK5f9w?= =?us-ascii?Q?qNCo/VPRUtZweV9uwpEG5I0kXXTwnJ+RvMAc4d1S9jgLzgkdVAm2QdKNYLUg?= =?us-ascii?Q?g7Yvu57xzIOnv62nsCumK1E24edHKc0UTYg/xCPFMQmtwbW6VNOWcM3lTcKz?= =?us-ascii?Q?j61iEzwXMt0yDHRHguRXDCjZcpmdD5GyYKOdOqnWcRO1ZRu8D8BYBOCnUI5m?= =?us-ascii?Q?yFVb3L52grFDA6/tTFpcxlUuBDTOjXk3ErxfX0f/Az2H1ipvawtem2wHf+QJ?= =?us-ascii?Q?pyt9SbXHDNZGk4mTnmBiNSligRu5oC3v+AvuPVzU3rzgtUdw95dPIv6EHzGN?= =?us-ascii?Q?H++P/ieBozmgu7IwJP04a0yhgWDvT9BXOP65f3VhtgQVGFg5+dAHcEo5DuV+?= =?us-ascii?Q?toAkMjVrjR1oIR1mLBz2RiYYKHLnoC5uKOeS8PQx20m6i/P2ls3OajLs1v65?= =?us-ascii?Q?W72KtjppwklZOEvdFdrkTGCU1TTGqur4Dq75qTISQzwiH9U9Jb/FasjeR5y7?= =?us-ascii?Q?xSeSkjog1Xhn6yEIvA98YP991rmGUfezXR8/Ri0xsxBdlBY42V42NBVIRQdk?= =?us-ascii?Q?eJQfDb2J8Z/23x9LxyKOdZWGr1051r7tBYoaM/99/k84qDi3Of4/0ia9UsUj?= =?us-ascii?Q?YPPbAe1ltCFVU/i2XhTiZPW0ZamOU7r4I3tb4YjkIASZYYGVExyPq7aqlB3C?= =?us-ascii?Q?mwLNsdOyMWHMdHtFq2xl06ierVGGpROgQBzW+v8JTPVJcJYyb/WB90tahgE0?= =?us-ascii?Q?jRsGwwAQaTsjjnocGr65DWuiaodfKN/ygAswALumTHCpGAnM34VSSgEB0rBd?= =?us-ascii?Q?s7C0vAj9HDIFJ+KkXFt9ibB0ehomEwnCF/80ICK1rxVVBgNDiRKfx4gqH61E?= =?us-ascii?Q?ygJNxBlkZ8swHJwUL02ESmyN71wOl+lmyfOSbxFdtoKU3PR2tbdqWUFon3fQ?= =?us-ascii?Q?8OEN6rYZC2pEVhbvNnQD0POP5r3Uj0gCzbwN4V5IRKYjJSxv+pNR00br2/wu?= =?us-ascii?Q?hZAlgLSRbaEYwXqWN4AwFOOHswMBk7zWqQbJ8z2hM4TV0eWgRaN9YLs+ly/6?= =?us-ascii?Q?OoGmvYE1H98tBqCot4bylzdOSG7Vm9G/W8YpgGlabtjHRLu1JbKlo9/NPlna?= =?us-ascii?Q?O7pjH72RpjninGTZsEHNcEIW07744VDNbc5aFoujYhJ9K8QYYyeCxDbmxkmu?= =?us-ascii?Q?fKG61edq/0kePJwo7/fa1CqERw4c4efzkl6wULJUEgB1dSaWuuGJaV6g1rYF?= =?us-ascii?Q?mKdpu6Z/tBByhGX3k3RcG3ombvslTZh8qCgnADyGbIZJ6?= X-Microsoft-Antispam-Message-Info: PeGuSL53Ub+iT4u2XRYobiNLl0Iq3awEPodD7CLcMoKZUbHvOArPDvdX4W4+ggftiFckYOa4mWN9gERcgD17stDwVf9cAH64NndztnqjA/68oAtKNyKZZ5LlthiQ/vxyxQzj7lnhpV/4nzU8pIpWHVepwe9PtUd3JPqsD/NDywFqHYkHC31cROVOofRtAHu9 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2425; 6:h8xMoX7zOX6wv0ZXcZ92x8RdytJLkO9hHYfEPRlJHNSkocGGot56Wnbs35GcjIhc5sQy4PE8Vn9glmdqUbWLNa2gQ+bkwMaOVtakcDkR3R79X/zVlT34+KlIKJoW6vyvOWH8FwjIXWpfo1b4fRzZBHD7e+2jeUWhcUN+Zp8mCrB1XRCuyIx79bIOGcFMvHNfZD2A0CoMo61twRw4FS3+Vvm8pnEzP7Ys/fHJrNBrV9ae+9g+Vf/cPuDnMsLyem8Q+xqS1EfjMN3gvecZkSmuxrqpsC2teE/4HwtDF3SZuMi2Ro04egpTvSbIu6jHvUJ/J/pYMX+rVu0tmmT3DzjoH0R8k52wHAWUakk+TQSxnTty4DyhUp3uIsJtKqAWUMIU88cDd6bwTHJ8vyAlLH9BOLRuvwl4SmDEb+Ht2qT3Iza/1PIVj+WQKS14n81io7dif1xg1aAnpg2JWCzXEAONZw==; 5:NjK8pn35Sd++JPXJ7/3kaZj3xh9zenh7GxjbJMKsgwlzPs3WhMw62+awqzKHoRNMiegTZAyr9Ob4eyZ1KU6oXjdwH1DWh/BxEfc3wxPwjbfqSK2Rrxuxhxaw10ssL5X/pOzF0WsV46/RDehy8XW3mQ7Oc3Ul00YHrBT3fKWVpN0=; 24:PJqsaflSxBwqyIEXbGUHB2IBrQZ/9+gE8uLP43VjyBZtlXxbWjdEKbmB+wIU7320b0cjZM6uCjRoHB66vaK40Y0EXA/CfKEH4GZisvdS6v8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB2425; 7:FSH8lH7iMc+CNTSr8nYuoNHsb/AAXNJJUOL325juh+MPFt1G2RZIw9qIy8wI32vji4MrbcUzYuj8SVxZI5oaxcvkuJnS0ptGOUH4ovyAhTQ24HasDFE1j6UFCZ4+FJz7Hyr2mKtKLMDJk2q3Cv7QStwSihknDOgIzf8+eSn9BoPVwZ9IRPGa6RPxpLG7K2cfJuRoMp28Kku6uC7Hj6oAn+jek389GvIp5FA6Mopef4OgOXDR0vnFyTP20sYzZGFX X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2018 15:17:43.0761 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72c9adcf-effc-4915-ca43-08d59c9ab687 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 6/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: Sat, 07 Apr 2018 15:17:47 -0000 Signed-off-by: Nipun Gupta --- drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 332 +++++++++++++++++++++ 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, 427 insertions(+) diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c index b5f6bd9..5cd18ec 100644 --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c @@ -344,6 +344,338 @@ 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\n"); + 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_ERR("Memory alloc failed for FLE\n"); + 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 */ + 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\n", ret); + } while (ret == -EBUSY); + + DPAA2_QDMA_DEBUG("Successfully transmitted a packet\n"); + + return ret; +} + +int +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_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_WARN("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\n", 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\n"); + 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, + (dma_addr_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_WARN("VDQ command not issued. QBMAN busy\n"); + 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_DEBUG("No frame is delivered\n"); + 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 = 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_DEBUG("packet received\n"); + + return 1; +} + +int +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_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_WARN("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 exclusine 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\n", 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_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 d27fd49..5a0ee4e 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_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_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_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_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 0a0d3c5..59dd27c 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 @@ DPDK_18.05 { 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