From patchwork Mon May 15 12:37:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 24303 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id AD1A0374F; Mon, 15 May 2017 14:38:25 +0200 (CEST) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0042.outbound.protection.outlook.com [104.47.34.42]) by dpdk.org (Postfix) with ESMTP id C47AF324D for ; Mon, 15 May 2017 14:38:16 +0200 (CEST) Received: from MWHPR03CA0017.namprd03.prod.outlook.com (10.175.133.155) by BN3PR0301MB0899.namprd03.prod.outlook.com (10.160.156.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Mon, 15 May 2017 12:38:14 +0000 Received: from BL2FFO11FD012.protection.gbl (2a01:111:f400:7c09::186) by MWHPR03CA0017.outlook.office365.com (2603:10b6:300:117::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16 via Frontend Transport; Mon, 15 May 2017 12:38:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD012.mail.protection.outlook.com (10.173.161.18) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Mon, 15 May 2017 12:38:13 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v4FCbxNt003970; Mon, 15 May 2017 05:38:12 -0700 From: Hemant Agrawal To: CC: , Date: Mon, 15 May 2017 18:07:30 +0530 Message-ID: <1494851864-26029-8-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1494851864-26029-1-git-send-email-hemant.agrawal@nxp.com> References: <1492607395-5922-1-git-send-email-hemant.agrawal@nxp.com> <1494851864-26029-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131393254938023640; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39400400002)(39450400003)(39410400002)(39840400002)(39380400002)(39860400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(85426001)(5660300001)(8676002)(4326008)(2906002)(110136004)(2351001)(38730400002)(105606002)(68736007)(189998001)(305945005)(498600001)(81166006)(5003940100001)(47776003)(8656002)(53936002)(33646002)(48376002)(104016004)(8936002)(356003)(50466002)(86362001)(54906002)(5890100001)(50986999)(106466001)(50226002)(76176999)(77096006)(6916009)(2950100002)(6666003)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0301MB0899; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD012; 1:ZuKWoG9PcRcRlsPXs36n662GoZ/uGrJcAzkSp3uuQrehJUDlWoFF82iVpOzwjCaZltImCuquerZ5/05iqck/FsGj9zfnN15nCmMQ81kYJO6OhlWdcHjJzzuMS5TSYFGhtiT13fg5Fe0VFZb6wf7M9HY0cPlqYAR3PNBt/wOWsh1NTlSSwuz4IUCeHqUCUMc7O+NBWazjuJ+tD2oeXRnxWNwSVe8VKyDU0RIZBxBAXEpReHkilFoGVTSh3mFHNTAHOL4xpp3+B0vVrzy1qwF6hguBKZHs9yV6qoFhsoDMze/fGB/X3ZtOjtyeYhc+YLBdiBKl8ToTtsetaHsEWtG4pmKgnVuIZHCs0t44gI0OeBgKWM6ddxkbkhUpGf5TXCpzyx4SE2QG8eM6Le0wr3Tl/9gR59+klK4XN5gWa8pODLN0UDKtqpuZAydZQIoF/pyLynTpVnqcO1ljVFpA/Cdj4W0bunqS3+j9wjLEeRIqo+BfDUZ41c0+16BkxUCJVPLZXGZStxNefoy41306fh2SzH9N0n1FSsYi9cEaD79Jf0cwdIhEA7fpsFT4MxZ1lBwayo6IBPajwfsCpMQtbq/jch2fAmS9TXgodBLtNt7ximK4R/OB7aTDh2eCRMYx7qlPOQevco6G7ej/qiEXSnlFy29MVEoONqefA6uc3cVbbPevdDyCKw8Afyg3xi2S2OUMb9EZBdkn3nQtZV/27GfBleXp9JbZbN99dBAV9Mn6f7J2hypqt1R6ymfM9Zqd/19rhMkg1u9aBlG+11jRxW8VaA== MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a486712-93ff-4df2-96d8-08d49b8f40ed X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BN3PR0301MB0899; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0899; 3:MrrnAkbvwNd1vGfmGaTGli54wHVlo/O9i7QhjfOaZHXeg26wMyhhVtPvuGzT82EesJU2d8PTSZX7WZ6Pp7kNSf9FtCWbI/KkE4PS59y6p3VJYpwpNT8zlltXTAiYLuHcbWWAQiBVGtM+II1wt9jee1HIkoOXeVUL2/nC6z0owu8VX+GHsFpUQP1ZLWJ1YWk6vBd/Zuh6Zhj94ApMOPGdsC6V2nQfcUvYOlunxBSoUYkaeqp7OZu4ZlV0oJGyB7uHdaKQsvAtoY6/m0yRPc0eYax0w30S/8cTJh6y6tNn1b3TI93nL0HI38XH7fj0lB76eqbeQl6KxLuUvf7uA+0d3SOacf8DF+B4zcYTZkOh8Rrq0rdux5QvIt10Dn3sgQ5tz1m0d448tKaIhsEQo8lJFU5NI1eL5OhhFkVtsv0x5sgd4RQ84qNhUbJNh7KaHstt; 25:ArVW094enwLA4ezbdNKg/lWdyNhkxbNHBI5t1Fbn2lTo1hUqZW19Bcfo6rLEDlESNfJVEfrxDy7Yt+maXi7pug4GCZJgnViOUyjpFfI2XQtZsMXLQ00RxsFmjvo9sqgq6DaM58LZq7wRlZ/p6FVc+JT5fPPZUY4R07Ft92Hnt6AiXZ7XY82Om8d+y8f59UPKfH5p6qKZ/uYRgEspfkFADOx3tI23jfzSkbvVSbNGR8fxsprjj+/g2uCS8zAPLcdjpeeuw+0+sl7NFC3fPtVISjPWRb559+uOFIYMUi24egRSCxKrSDs3E+1D8CLJGb28ewPXTtjy5dcXpQcJ3z0OnIPPG9UQAXLl4XOkrAUm9gezphywdZLroXjohcmt9hDT73zbH+kTcMFScNy2ZhNWLaqocjblV/eBKBSWmL3PVHMOA2ZZ9ZWwe2wN6wVBZZ5S1cMlKeifTeiPXvjWnAw7vA== X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0899; 31:10hgZAJh8hYHA0lfliQEgfVE4abEyhzohbOSDFy181lDElVspUmosGy8G9lbzDwMaD6+4WZstDbmA+2+jGBwZn7TOO0vJyYXcFoMQx7LCYYREuGgWfyNOcHAbq7F39qEfqrYvKjo8zgC5IOG1Qa3VElQ0WusgPekd03jxX5frEYagLS1c/E11wAPLQX+aEMDhs8eucnWtg6yP8E/fuRyPmqWMHdj/5/0KpFtcoGzRKqxFnv7nSoshU32rikmi5EC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13023025)(13018025)(13024025)(5005006)(8121501046)(13015025)(13017025)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123561025)(20161123565025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123556025)(20161123559100)(20161123563025); SRVR:BN3PR0301MB0899; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR0301MB0899; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB0899; 4:qwbf3gcAhr/uJV3Rc3t5g4Yv9Tz3bI7wkGqkwvig?= dcTT/lqjENcFNocfQ5D9MiMn3ci6dRSr9WetOKmOqho2S2HBOfVSl3fPwNakS3Mc8Wa9TjiI/SNEa1QI+8b2oM567qF1CnrOLzwMiy9ZC2WiNnYovsIOBqPtXBLfaZFmoMEzpMbHQ2HAw8ywhYlLRzs2QSvB8olwxvQGbNWO0F7kChZNJTKbtFAl+/pV/LApr9+tlV8CKa9rs1pzdjrywD95fn9VhxOFMd0+gv3a44TenWrwnapA7k4ApNOJXNcjA2YDvhUk9yZSI07W5ClY8HMyNbWW/EoP2/+rA2QdCMqMVZpYUQ2W+E5V2k2v2zustUjisicG97cYgJFM+skvqgqv0w/O9OXjyOh0qkXeRYyxCp6+jSkbFY7zzZnFOebQxoSpniut3iHFTjXYl02cZKtBk0lqjFgJtlrvnrk5d1qdUv+rrWgD7xGEbwB2Z5pzJFuPGgZDn3tfA0NXt8bN6guV4dn+BajlvO4Uq8whhVGHDd/mUSDc7+Path6fiCz3PtjX/VAg0bawRzgsZgSOqazHDtUswWFUqXri3YzRdrZypmrhkMe7Jvf83Y9enhRR8+u4EPmzUA322Q2JHF6np2xYjqg7gcPa4Ot3p1UvdqF85IMC7xFrQlPwF3IXLaA2P8AbshKF34MJs4N2y0vtVfiidvn1yH/fJJmqhI3OFueKarZ1uPxhHQFkOe5k3cxkeeXUgo2Zb9hJqIj0bwmkBSNzDj1XQOe3N4edoonwFytuF11nO3FDe0AO/DG4xe6uCfuiWaYCQvL9KTOwr+oUGph00ZMa+W7Z8Bgi2kfrOjU2K0Y76Na/w1DKbZsM3i0xB2jYgH+GkhkYaTkQchqu94+en4SXwCYDzolh/GcIphT8yEgNcYboQhh3PWd93ql+yD2tN3INh3ia6AX+5hZntnN6GBoaUZAwoGuRgRHNhufYcI/tmmJaECJo/o/FeM8OjhU= X-Forefront-PRVS: 0308EE423E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB0899; 23:6odWmKAajlEQS/EjEu9zbzWVlwew1M9dZN2v9dD?= htG/IuuLlNjOxl1lDW/hK3tkUAUCzj7/Asho1+DH+6CNpGLN9HoVNQo6zqcQEAdPlipXTs0q3VXiSxSgRV52OGDxBh35Hw3eFMhVvtkTTDUgDpjyJM7v4TWJ88FRHotiRBafXehBlsciR1GBVT7rlxnQKCgybpBojn5h8BiBDi4eAmi7MPvS368SnnMFDZy4Of2D18p/Dl8bU1D7vyjz8LfryHqZ6N5rzKrA3EnLRrb2KBcFni2DtYONXeekvcTlByY4I10zqLoBZoZy1LtSP/YU54qWkCSTA1BBhhPCxxnavlrNwv8mzrn46jiz3gDqDJgdrSJyRkVA0t6CEPCKgnHxfuIKw5E0ayZRuvYVYZ4d2pvBlP9vjM1jdtgoiHo6Ujv2lUIIm4DPJc8sfbzf+BuXQY9MfWwm3U91++tEZxksEuYjHIp1u345vCuqvfOr6l9/EzSQ5a5YeHxknjozyeYNzxZaeC7Wfow9plNwOOTKNNi7kLoOPuUntt3g3fGNtNAfZh0rGVoLgROOz2vcHz6injdVFIX/S5SRT3fgpLcuYzklP34T6vUIJEBcc7px3Qlr2TsRNYNbeiSE3i3fWmPXRWGunm1RPS9sJ9UWtEKYRxI9yz3fHa05EycgIXqvaKUBiD/stucGFV1W+qFBeVQBBYe5TVUNyJJBIqIytBpokHkE77Nwomb+AcX5ZJefjdQdhJzI0Sx/UVIxtFx6+TMLTClReCgDn3bm02TxB+V6LyGvU23+QZZ8KzCeSHCMYfj5SbI/lNg5jo1Aty3sNUWi5gDhEdWi8XlcTGP2rT+3v36bleM0C4+4qGVpe/tiDwUQyI4pcbkvgHX9enj9xWv5yv2bzRGCWpmWaYbrJ6R2S3C1YMowzgo0bPv+XBHeU49UhYhoLmIFakme/SZlKL+h+AzokEccSE9GRvs5h0hqK0OEOw90cprk+LuImERZ0CWW8wZwVqhWJnRJDUvW+qrYzMEqj181q/QQgdwL6r3C+HOMX4X7rsxn4drB1zQMmHunE9FWLV0I5njaVomD7C+0J1bC55eMjtbBNnXRw88a1e6qvXTSmENHpJqyiU16g3u6ZNocWEQI2sd0woAVe5qJvonycSHHSAkbH6O7ZfwDrXA2Kc5pZ34ThXxdibVs5NX6lSlsfXj4cBu0SdGPvFLiiv2PDnUH2zC7A9xPkxYHLToc4SZNFnUba80/UCJZ0xoYsxTMq2+yv8r/v4YNwVf92Lu2O/TM7ZWeizYemlXwwFQ== X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0899; 6:W3DQBQ7Zn9eSbsLJjjcS052yzKvR+YMbWR/axvaCOmW7qVkkiCSb0z3vULEUCmyOpp86ofhRqRijZdhF9jmqb58y7ypMJBjgud84U8UldzyfN6xFN1vaJNp0oJNC0OzCsC7PIr4L5kH/r21y2/bJfSMYyXVvJXp7QkaIXp+stYKgTkEaBqdpNGeLguk7jMG6qpDM/hXZSkznWiIVAODRe2nlvMneUoLbb4szOAnD0yabuIDJm128jGD3viGiwTzjMz/qRoAUkQm1azkNt72C8WYIRqGIh+xLyb+gx3mOaYCKQWri9q/tg56Z8YjE5jLIv7YuclX5A99VEjziggNy2m/NwAVUZ+OTwWLxvkysP4kKGD4qnK9ztvVCXteBEV5JA6dfNhwRf5fEMOfiTe1HSdKqOY4sEvyiEFWLJTtrEHlXWJJBK4xIMI7XiHivjGmsLMp6bmJ0RKhgw3BW/GFSWXc9mGhXcCc10VYPSHwDd6Aalsd/psq6k1dtYfVmJvEk; 5:LOkasj+5YBiBWUdxYJYe7qtsI6/Vgii0vESBwuVHQ5Hrq/zt98x60MgjaaZa9EKrVOsMGlCUrzZKVkUNLv9MFvIL4XVZka3v8pIVfVID71yLT6no317eYUUGMCaDOS3wGAxGkhGqG5jYm91SXjIo/n3Y87YqKyjMzsk1/GI2uqT7/ccoT8VZTKw1yo3yg2R1; 24:0JmR6aF8M5+Wr2P8aBTq0EeBQHBtaS/2ymPgp1mDK4yMSId41O16h5Ck8o3pu07zabsXQxDu8DDzcLjXfabqa04FJ6dZPQLaIF9EZhwnDhE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0899; 7:B59ztOIwMIJyzQtQY6L4hH7cr5t2efC9tlayK4FyYTGQcx0siE5e5s6szEpZ4ZbYRxTwyP0L83B24y/8Q4Fl/9pxo3h8VC+ovY0wC+VuhIYcJBNpFn37kCgLmICndS4yVtKJnYJ6r46CfqWXZFWbvScgHt18/KQv/Nana0e4fLe2MouZgNc7S7ubbeinS0AQ9iibG5h6LlGjigGGuNOPb2oqdMD8x3UpyQ2Y5qOQ5W1ia2gp/YigBEmdi5VSXFZ8Epgyhk2ia7PHqmqic3GEKNnPmbicG/A9z4wlo1TMp0A3d2W+Gp7nzO6WQ1P998UFxSQbNSmI38C926zswJ8LQQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2017 12:38:13.6463 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB0899 Subject: [dpdk-dev] [PATCH v2 06/20] net/dpaa2: support parallel Rx mode 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Typically when the PMD issues a RX command to DPAA2 hardware, the hw writes the available descriptors into the given memory. The RX function then processes the frames and prepare them as mbufs. This patch adds support to issue another pull request to hardware in another memory location, before we start processing the output of the first request. This help in controlling the cpu cycles wasted during the wait for the hardware to write the descriptors. Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 4 +- drivers/net/dpaa2/dpaa2_ethdev.h | 3 +- drivers/net/dpaa2/dpaa2_rxtx.c | 119 ++++++++++++++++++++++++--------------- 3 files changed, 79 insertions(+), 47 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 698fb84..797e71d 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -391,7 +391,7 @@ RTE_PTYPE_UNKNOWN }; - if (dev->rx_pkt_burst == dpaa2_dev_rx) + if (dev->rx_pkt_burst == dpaa2_dev_prefetch_rx) return ptypes; return NULL; } @@ -886,7 +886,7 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev) eth_dev->dev_ops = &dpaa2_ethdev_ops; eth_dev->data->drv_name = rte_dpaa2_pmd.driver.name; - eth_dev->rx_pkt_burst = dpaa2_dev_rx; + eth_dev->rx_pkt_burst = dpaa2_dev_prefetch_rx; eth_dev->tx_pkt_burst = dpaa2_dev_tx; rte_fslmc_vfio_dmamap(); diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 7196398..7fa7e7d 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -77,7 +77,8 @@ int dpaa2_remove_flow_dist(struct rte_eth_dev *eth_dev, int dpaa2_attach_bp_list(struct dpaa2_dev_priv *priv, void *blist); -uint16_t dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts); +uint16_t dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, + uint16_t nb_pkts); uint16_t dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts); #endif /* _DPAA2_ETHDEV_H */ diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index c5d49cb..9b7539a 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -242,17 +242,18 @@ static inline int __attribute__((hot)) } uint16_t -dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { - /* Function is responsible to receive frames for a given device and VQ*/ + /* Function receive frames for a given device and VQ*/ struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)queue; struct qbman_result *dq_storage; uint32_t fqid = dpaa2_q->fqid; int ret, num_rx = 0; uint8_t is_last = 0, status; struct qbman_swp *swp; - const struct qbman_fd *fd; + const struct qbman_fd *fd[DPAA2_DQRR_RING_SIZE]; struct qbman_pull_desc pulldesc; + struct queue_storage_info_t *q_storage = dpaa2_q->q_storage; struct rte_eth_dev *dev = dpaa2_q->dev; if (unlikely(!DPAA2_PER_LCORE_DPIO)) { @@ -263,44 +264,51 @@ static inline int __attribute__((hot)) } } swp = DPAA2_PER_LCORE_PORTAL; - dq_storage = dpaa2_q->q_storage->dq_storage[0]; - - qbman_pull_desc_clear(&pulldesc); - qbman_pull_desc_set_numframes(&pulldesc, - (nb_pkts > DPAA2_DQRR_RING_SIZE) ? - DPAA2_DQRR_RING_SIZE : nb_pkts); - qbman_pull_desc_set_fq(&pulldesc, fqid); - /* todo optimization - we can have dq_storage_phys available*/ - qbman_pull_desc_set_storage(&pulldesc, dq_storage, + if (!q_storage->active_dqs) { + q_storage->toggle = 0; + dq_storage = q_storage->dq_storage[q_storage->toggle]; + qbman_pull_desc_clear(&pulldesc); + qbman_pull_desc_set_numframes(&pulldesc, + (nb_pkts > DPAA2_DQRR_RING_SIZE) ? + DPAA2_DQRR_RING_SIZE : nb_pkts); + 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); - - /*Issue a volatile dequeue command. */ - while (1) { - if (qbman_swp_pull(swp, &pulldesc)) { - PMD_RX_LOG(ERR, "VDQ command is not issued." - "QBMAN is busy\n"); - /* Portal was busy, try again */ - continue; + if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) { + while (!qbman_check_command_complete(swp, + get_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index))) + ; + clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index); } - break; - }; - - /* Receive the packets till Last Dequeue entry is found with - * respect to the above issues PULL command. + while (1) { + if (qbman_swp_pull(swp, &pulldesc)) { + PMD_RX_LOG(WARNING, "VDQ command is not issued." + "QBMAN is busy\n"); + /* Portal was busy, try again */ + continue; + } + break; + } + q_storage->active_dqs = dq_storage; + q_storage->active_dpio_id = DPAA2_PER_LCORE_DPIO->index; + set_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index, dq_storage); + } + dq_storage = q_storage->active_dqs; + /* Check if the previous issued command is completed. + * Also seems like the SWP is shared between the Ethernet Driver + * and the SEC driver. */ + while (!qbman_check_command_complete(swp, dq_storage)) + ; + if (dq_storage == get_swp_active_dqs(q_storage->active_dpio_id)) + clear_swp_active_dqs(q_storage->active_dpio_id); while (!is_last) { - struct rte_mbuf *mbuf; - /*Check if the previous issued command is completed. - * Also seems like the SWP is shared between the - * Ethernet Driver and the SEC driver. - */ - while (!qbman_check_command_complete(swp, dq_storage)) - ; /* Loop until the dq_storage is updated with * new token by QBMAN */ while (!qbman_result_has_new_result(swp, dq_storage)) ; + rte_prefetch0((void *)((uint64_t)(dq_storage + 1))); /* Check whether Last Pull command is Expired and * setting Condition for Loop termination */ @@ -311,27 +319,50 @@ static inline int __attribute__((hot)) if (unlikely((status & QBMAN_DQ_STAT_VALIDFRAME) == 0)) continue; } + fd[num_rx] = qbman_result_DQ_fd(dq_storage); - fd = qbman_result_DQ_fd(dq_storage); - mbuf = (struct rte_mbuf *)DPAA2_IOVA_TO_VADDR( - DPAA2_GET_FD_ADDR(fd) - - rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); - /* Prefeth mbuf */ - rte_prefetch0(mbuf); /* Prefetch Annotation address for the parse results */ - rte_prefetch0((void *)((uint64_t)DPAA2_GET_FD_ADDR(fd) - + DPAA2_FD_PTA_SIZE + 16)); + rte_prefetch0((void *)((uint64_t)DPAA2_GET_FD_ADDR(fd[num_rx]) + + DPAA2_FD_PTA_SIZE + 16)); - bufs[num_rx] = eth_fd_to_mbuf(fd); + bufs[num_rx] = eth_fd_to_mbuf(fd[num_rx]); bufs[num_rx]->port = dev->data->port_id; + if (dev->data->dev_conf.rxmode.hw_vlan_strip) + rte_vlan_strip(bufs[num_rx]); - num_rx++; dq_storage++; - } /* End of Packet Rx loop */ + num_rx++; + } + + if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) { + while (!qbman_check_command_complete(swp, + get_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index))) + ; + clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index); + } + q_storage->toggle ^= 1; + dq_storage = q_storage->dq_storage[q_storage->toggle]; + qbman_pull_desc_clear(&pulldesc); + qbman_pull_desc_set_numframes(&pulldesc, DPAA2_DQRR_RING_SIZE); + 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); + /* Issue a volatile dequeue command. */ + while (1) { + if (qbman_swp_pull(swp, &pulldesc)) { + PMD_RX_LOG(WARNING, "VDQ command is not issued." + "QBMAN is busy\n"); + continue; + } + break; + } + q_storage->active_dqs = dq_storage; + q_storage->active_dpio_id = DPAA2_PER_LCORE_DPIO->index; + set_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index, dq_storage); dpaa2_q->rx_pkts += num_rx; - /*Return the total number of packets received to DPAA2 app*/ + /* Return the total number of packets received to DPAA2 app */ return num_rx; }