From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0045.outbound.protection.outlook.com [104.47.33.45]) by dpdk.org (Postfix) with ESMTP id A092E58CD for ; Wed, 19 Apr 2017 15:10:14 +0200 (CEST) Received: from CY1PR03CA0041.namprd03.prod.outlook.com (10.174.128.51) by BLUPR03MB248.namprd03.prod.outlook.com (10.255.213.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Wed, 19 Apr 2017 13:10:13 +0000 Received: from BN1BFFO11FD021.protection.gbl (2a01:111:f400:7c10::1:176) by CY1PR03CA0041.outlook.office365.com (2603:10b6:600::51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10 via Frontend Transport; Wed, 19 Apr 2017 13:10:12 +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 BN1BFFO11FD021.mail.protection.outlook.com (10.58.144.84) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Wed, 19 Apr 2017 13:10:12 +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 v3JDA43w011315; Wed, 19 Apr 2017 06:10:10 -0700 From: Hemant Agrawal To: CC: , Date: Wed, 19 Apr 2017 18:39:55 +0530 Message-ID: <1492607395-5922-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1492607395-5922-1-git-send-email-hemant.agrawal@nxp.com> References: <1492607395-5922-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131370810127554218; (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)(39410400002)(39850400002)(39380400002)(39400400002)(39860400002)(39840400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(5660300001)(76176999)(50466002)(5003940100001)(86362001)(48376002)(50986999)(33646002)(5890100001)(105606002)(6916009)(38730400002)(2906002)(110136004)(106466001)(77096006)(4326008)(54906002)(356003)(47776003)(53936002)(189998001)(6666003)(8656002)(85426001)(8676002)(305945005)(50226002)(104016004)(2950100002)(8936002)(81166006)(36756003)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB248; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD021; 1:5CWjDnQ8B/MlLGyV9I722Bcp4fe/xbLhPt6fHYH7EVw0f6LnGCybdywXN85UxQ+EAAGkBB19TWHxXpwWhORWJGCrUXDrF0fM2WyRWURDrRmwuCC+9qj7etXe8ZNBCaFzbmN+TCfj8HBJa5DWeez6QuxQklyYfvAN2kiUya1H7Ak3x+8YNwGZut5kgM9krHZ2IROV/gsMmNz9SIuRbV0TjaqDCrYQwoWoFTibKPiPrBcsT6dXrPwV8hvVLoKtIYMWdab30ZbxsB8ZangN0bVj+o8SNsyWetHK0aw9ioapI9sg97pzC8eNNRC9iBEYDREZdnsJgv16gH2QXtDSC3f1vO6rUVW/0DfYWkhBqDnHsCnJFEpAjkYaiBw566L7HeQGOFFjUGUwFVhdGTqa1AoL120gLR5sR9JKUJ4d8kXPaP6s3wqQdTFtn0kSFxHBM9Ja5bCpHtoakBZHsPbzlffNd69t+dl/IeG0Y7jN4Y4mUE4tK9PhBEIz7eQEv77eXGoM81zSLWB4x/EBaKTC9a/5jp1M5Up71ip/klOScOmbAMVGq6VASBvq/WTOzikbbcLIvSC8NqHyf4hXlJM+IjY5jjVuJMfPVlsO9f8/dJU5+cqk1X29Bia4G/cbR3dGkMM6AqZPyS/3vSbwzEBBVRVNqQNYuh7DJHkMFyfHdxE7t57RSchFuebySsjObXObb8+Eih7bEz+IkB/fGNtNsWjEM3B1SSDLmMxI4Py2hWqsIJNlBgHcwgS6ciqX1KCrb9QcHHh4iPaCaeFMJ4z9VXeqdw== MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a0660db-4a72-4df4-b549-08d4872569f6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BLUPR03MB248; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB248; 3:DirHlR1HLFOnV9dM+uf+UdeAZeKoGOsBaspRQTdpuUBlJyPP9wPNKQibXAtfCLWsfrAn1dl8w3G9bKwACN9wq7Ciq3nlymsEdU1mszYHmZ6QbIn/cD0/xcyYnxPXdlQDizszMjBKGkCd3on3LUFoAIYrsq0tDmU32Dncg3Zy0I053IfHSOBDWp7nXftzBcWJTF2AMePBjtJkQgI/LFcb2yy3yZgmx0tSPQ4wlkFxjMzPi4JSNhF0rIfxusuD1+xGNAENNV1KO7Zl3bLm2415oGnw+AEoqk224Tkk2coQkCa0IqdWStO92sRksnowdVBDhscMnKBQc/70atceVnjvx1ZtIMF0eChOz8Y4Dm3j3fEgH2pB9slsDlhdofjdZMGc4qI/0ZpiSt51t0Og+PoH9U5I2PcVSERj3zgFnnNrdiJPnNS2JpuXd9104fOuEJ2n; 25:zWQsidKmFWTrDNlXkbYK7VIHp437+s9hqccc+6Aq3qMtqfapDhI2Gmoa6qlIEXOWfpxAoLIbGCiT+plhzujyzorPUIlyVLf96OFEfRKTM3Wij+ReV3Qk2ucuiV46yjOeVN/KZvVk5CG5VoN1QWa4YJ2xCBMLBugi4lhc0mXUZxjqaxo7bWfhABoWYkwUJINB0gAgbyo6Z9XoZZGt8pHno7taAcgj0nrgcybjMnarCzXuTOAhZLmowYQEydwsGKnp33jcUPZl9G/O7BOg1zug9RiMe5p4XaIQQnMdxp6tIHfWRO3POK2m/Okq0uhFOAYWHrMYtoXtwvtwVydCwrsecsLHyVjMTu95vxktJ5JG58AdkWuUfFScnVQ5OdimAwHovOG0XqyPxRlmTJHSnh8h5avr/XC7VZH12hvRgIOjgx5tx4Ebf3T72w/0M3+vy2a8nJ15Nip+wbJIYR5Hzl086A== X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB248; 31:mGjtrCQgrXyP5NgLLlEv7DOmh6IxdS57Hg2wRL48Kn61fhVzoi5Mz1wC9M3a1KODTNNvMrct82XzVtmk6R6yImh/3T1iBJYKPkxFv9uLPussz1Pn5CIT9nr4Ff5Mz4qTvEiOVr8xMtlJvCfVsqSRX0TqGK0j+dqEkw6RMf+hJZXErjtiDVMneFt80/HTv73I+8DSxHkee/s1vSCPAjmh9WUZvfHhCxQrbYeR1eugc5xgnRvMvagNBHbTZ+mr05p2 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)(13024025)(13023025)(13018025)(13015025)(13017025)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(6055026)(6096035)(20161123563025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(20161123556025)(20161123565025)(20161123561025); SRVR:BLUPR03MB248; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB248; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB248; 4:wI6Uvxsd/zUfXAA0ffDpnd7TjRoOgsJpEUz8jEKJgEM4eI5Oebe/GM2MUEpzBCQollGFkMmMhM0qAECr2gsg66/nal2pL92ZO3vE1VeR/w37PgJ5UevEVUft1wCiPVUnF+4DbJsWGIsvBGNNGZRe6YuI+QBDs+el8SC6jJ7+1MB7WigzdilB8p+/nCKzfEf9uzo02xRxT/cIrzaPPKT+J6bmzzwIHEdHUC1z2igDiIoncIJjjn1+KtOafv14LbBO9DP8KrSRFFzpQFCxvmUqJ8WnVVAOu00p8l5R3BhOmIDW3LwnUjVJa3APXdGDFc+XoqNXSeScg+fIlYtoleh0RWP5EWGNvbrKBI9HQT4yFa8LxOgv4sY5tdGo/DeL2HqdQ6TT18ytcnU0bKVa9Axk9A6MF6kuw34jRUqjy4jT/cT/kC1FV9SUFhpcMdBn4xYbS7G+ZTpVmIRqiZF8WRyBO5I6wy/RAH5KNZPuesH+y92J1rdz7f8y3LOsDs19XPa1pwbMLWbS3P+Z6Iw4w5OwT5nbBXWywkVUJQjcynDlZwBdpzZErohDjJ5Cxh97ceZM/YSydFNb1mRC3DHlbqYOnmUAT46fcEGivvhyuk4Wflf2dNIvdv6/JVvgOxg7qgm3snXnt5sxqUGH18nkTDssl7b+EhiigWwmtsSqykuzzIUnKsfSg1XUJAnpZ260pgwQDHkDFCXPBpGS09zeW9e0bUmC9280eDhLnhSuC7J82np8pFU//jppbtKz5cuCpA4yO4CxWuvUw/0h2i1QVP4whDeQsR0pkn1K9T4Lz7pIxkSY/4P7sBWBjIp+YRjSdAZ7F8If7Ol4ZkMkPnWai4VClQEFh2qDPmUnuDfZidEu+K1SRCV/OseJ5gzqi7FjOivQcdPw8EDPmnJT6G7t1d9sIwIBFlHqItORzsTqalRMudA= X-Forefront-PRVS: 028256169F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB248; 23:20tf3bYiLnTKycvuQjJ/GIMITeYM43QVRYhCx7PC5K?= =?us-ascii?Q?DjnEO16zJJEfvbOlaMBs9LZqsGTI/3zTWfP0FynvBOaHyvkpKHdEAAuVu+MV?= =?us-ascii?Q?WDbmBFxNU416kOTdNgYkkWiCRQjOHbXlrDeHK4Vz2BhgU+E50lFZxF2fj0Qg?= =?us-ascii?Q?h4VcGPCz08dRlvlQfsSr86PCJ7kyenqG09fmUzeSvZIux6/hqd6ZzdKHNCBr?= =?us-ascii?Q?4uud9K2QikKAa7FqMrfutF83+8h78DpYojLnyROmTvctCZSvpHgXC6pMLKJu?= =?us-ascii?Q?8H9QcNwcm9W/8g7wc66FdSuKU9ax4VBhxw9IUi3LA5peLsO0H3pCkhC6NfEs?= =?us-ascii?Q?wfIqItdOYjQf7w3oUH6oG5JeX7Km6hGkp+BUOaSTKcd+miHuhRXO9dMOj7OE?= =?us-ascii?Q?bMPzyYvjgZE8BOS9EXbMtZ99NlT0d5T5FZ0ereQAs9QGFXiWhfb6cf3Fad5p?= =?us-ascii?Q?hKDwXOXG4P9katMdthdmRGl5g6qc5FKvwwVtzJAi/1h/AJp4ZbbBGdrgflKc?= =?us-ascii?Q?78dUcfLC+IcpSzgGDtc6mE8QRwM2AKKqmaSAoGXTOiNnxZk7uVMwiKiFpc7J?= =?us-ascii?Q?QmbdcC2Gbe9O8FkfL37SaSdul3zPlu5iRn/I4+wKOl9lW8MPevCfxXACwbR5?= =?us-ascii?Q?Vz6bYzonV1G3wrLJv4VyyeQO4m5fd2i4iW2JLuKN9xBQoM9ZUeDytZGwNwgX?= =?us-ascii?Q?Nu0BeIHkEWGUaWS9L6lDzXwCS0reAzSK3L4EJhQU4BXJd6/ODLLuoV3OSKuG?= =?us-ascii?Q?YnXUH+ohkoaykhzZmXbHutYDyUxyX7KOH+sgcdofFqrZef3+BXb0JSrC5nne?= =?us-ascii?Q?Qa3fxkp1ywOdsak9b7HnCk+3KgQVfHW2PtZs/2mcOO6XuDyuR3yzJ3AfZSNR?= =?us-ascii?Q?a1UcTKOmoUaqB+kQfm/aauh4nYbkD9EcQlOQs1e2JYptjb5VpiHEoDMn+vKf?= =?us-ascii?Q?LWxs3CZQMCuSkmHbbndyNsHxdNat58TDvOWJ0LxGSfGPwOppfnrA2umgL60+?= =?us-ascii?Q?Karp0v47Nt1c4F7/ubf7v/OZ9cHSw9yrsLA7anlncVR4YNKXtvCmQQUE2bUh?= =?us-ascii?Q?Rlyttz7t9LTkFIurqPZ/eraeAVZcpwbx1sjynXjw6TUN/4vcBXnwuaS2JLgX?= =?us-ascii?Q?qNO6Kqtmbii3xXHgSbofGDCoDGJlsXhmZBW+2twhZ7IJyijPtOu1lYWhNdC8?= =?us-ascii?Q?mSZAFO1VraZiJ/tNGkHMKoY3UeB/wqRY+4SSCoOmIXcCG7Qo13wSl/k6tzo8?= =?us-ascii?Q?rwaikiqpZhUlY6h8U=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB248; 6:aRRo0xUWskEh+3zK/8SY1S+EMhxCwifH2oYjmebfQKe0RtvMH0mvz/Z1P/VofEB83D8/I7432yTpxsHSmmKEenPz3Om4LMxfhC71+/UL0gO0a0cqf42uqfir+f60ImFM2uKiNA6sfoDg083cIp6CV0vu7d6XtzgzhlrTrRpxlnKR1ZxSh569GDr60yGNhqsGaFhvwJfAGFwe+MvBJaFLW5z7cwSSZHF14KwmY2tn1joLDlv2/cKu01rIEYiSnPaTgEGwGDYmTT5AHMlvagAjMeqxQsuAZHKV1KoZzJco0+bsQFrlMD54aT2dSV0ov0Z5ts3yO546hY6b/9Nl6m4twsmgvscp5GoHW+kdGO8NcpfHjIwqr7O61ZJhhO4OcvnAPmeN/k1mc05WIvox8YKOFLRVbMj1MNWjuVJinJFH9uO8PqbFiMH1cDY5Ec5UZXq6bZ3an7RWqwxWrDDbu1XfUStgW4JLnBGf5UG43loBqFX8Tf8By4jVlldxzSrVSRLt+Xk9+SA7TAqqIk5ziYVFwg==; 5:DGuz//PtYWMRsUiyNblLjjbfzZB51QTpUXZfzJdFrR69hjDLfQVaBGqpnqBGawiUOggdbQ29LnYkX2aRzadO8lXWBCndnmlGopKAaDGof7/MbH8F2/W3Cylr9GmXLDlV1bf7fE07U6aBU9VU4q18SoWqLRy8DpWpJ9Jk2IrJ5yllf9MJFVkcIT2nju2nAcQ+; 24:gbTOq0ZBcOL+z/A+JBT9X41oCy2qLnz3z0mqIGZeMwE+p10/rjiAOA/vZn7X5lDqtflidWhlc8Z2u4KH41p944T4YjeWJU3HLHGw5J/MVHo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB248; 7:TvWOl7YIUthkPagPno7CT7LhNGW32i2z2UluDFEx2X1y1jQUBFkeFBXd1jOyJyxgHc2D0Na3j9v8EqJBYSc9CjhsuReA805OxKEOYTkLhC3Q34fns5e+7fBy9qLHhHfdbCogzu3erMkMYncsO/EMddqyIHOpZfG/yki9YvSifZyd5VDUfPci5X0IuS87pEVl+MbnuK1ViVxsumHRDpcdVHtoVIdE1eY05LfcJIUCj2LZmlBuAL8qWV/JQR3wpIA4depU/PKfjlPVYkk1YPzI0aeYyoI1cIPzPPJY8aZc1c4yvo7OXGfJe8+BSd0NtNhvy7cxGyvwVLxBHV4dThgByg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2017 13:10:12.5682 (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: BLUPR03MB248 Subject: [dpdk-dev] [PATCH 4/4] net/dpaa2: support parallel recv 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: , X-List-Received-Date: Wed, 19 Apr 2017 13:10:15 -0000 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. During hw debugging, it may be desired to keep the original mode, so the original mode is also preserved and can be controlled with an env flag. Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 11 +++- drivers/net/dpaa2/dpaa2_ethdev.h | 2 + drivers/net/dpaa2/dpaa2_rxtx.c | 133 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 2 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index e9800f4..5569400 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -391,7 +391,8 @@ RTE_PTYPE_UNKNOWN }; - if (dev->rx_pkt_burst == dpaa2_dev_rx) + if (dev->rx_pkt_burst == dpaa2_dev_rx || + dev->rx_pkt_burst == dpaa2_dev_prefetch_rx) return ptypes; return NULL; } @@ -883,10 +884,16 @@ 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(); + /*If no prefetch is configured. */ + if (getenv("DPAA2_RX_NO_PREFETCH")) { + eth_dev->rx_pkt_burst = dpaa2_dev_rx; + PMD_INIT_LOG(INFO, "No Prefetch enabled"); + } + return 0; init_err: dpaa2_dev_uninit(eth_dev); diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 7196398..ec27b84 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -78,6 +78,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..8365703 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -51,6 +51,7 @@ #include "dpaa2_ethdev.h" #include "base/dpaa2_hw_dpni_annot.h" +struct swp_active_dqs global_active_dqs_list[NUM_MAX_SWP]; static inline uint32_t __attribute__((hot)) dpaa2_dev_rx_parse(uint64_t hw_annot_addr) { @@ -335,6 +336,138 @@ static inline int __attribute__((hot)) return num_rx; } +uint16_t +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*/ + 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[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)) { + ret = dpaa2_affine_qbman_swp(); + if (ret) { + RTE_LOG(ERR, PMD, "Failure in affining portal\n"); + return 0; + } + } + swp = DPAA2_PER_LCORE_PORTAL; + 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); + 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); + } + 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) { + /* Loop until the dq_storage is updated with + * new token by QBMAN + */ + struct rte_mbuf *mbuf; + + 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 + */ + if (qbman_result_DQ_is_pull_complete(dq_storage)) { + is_last = 1; + /* Check for valid frame. */ + status = (uint8_t)qbman_result_DQ_flags(dq_storage); + if (unlikely((status & QBMAN_DQ_STAT_VALIDFRAME) == 0)) + continue; + } + fd[num_rx] = qbman_result_DQ_fd(dq_storage); + mbuf = (struct rte_mbuf *)DPAA2_IOVA_TO_VADDR( + DPAA2_GET_FD_ADDR(fd[num_rx]) + - rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd[num_rx])].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[num_rx]) + + DPAA2_FD_PTA_SIZE + 16)); + + 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]); + + dq_storage++; + num_rx++; + + } /* End of Packet Rx loop */ + + 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 num_rx; +} + /* * Callback to handle sending packets through WRIOP based interface */ -- 1.9.1