From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0078.outbound.protection.outlook.com [104.47.40.78]) by dpdk.org (Postfix) with ESMTP id 8EE8D378E for ; Sat, 27 May 2017 12:19:20 +0200 (CEST) Received: from BN3PR03CA0062.namprd03.prod.outlook.com (10.167.1.150) by BY2PR03MB174.namprd03.prod.outlook.com (10.242.36.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Sat, 27 May 2017 10:19:18 +0000 Received: from BY2FFO11FD029.protection.gbl (2a01:111:f400:7c0c::192) by BN3PR03CA0062.outlook.office365.com (2a01:111:e400:7a4d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Sat, 27 May 2017 10:19:17 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD029.mail.protection.outlook.com (10.1.14.212) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Sat, 27 May 2017 10:19:17 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.39]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v4RAHYuN029968; Sat, 27 May 2017 03:19:15 -0700 From: Shreyansh Jain To: CC: , Date: Sat, 27 May 2017 15:55:33 +0530 Message-ID: <1495880735-1651-38-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495880735-1651-1-git-send-email-shreyansh.jain@nxp.com> References: <1495880735-1651-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131403539573860489; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39450400003)(39380400002)(39860400002)(39840400002)(39400400002)(39410400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(53936002)(2351001)(86362001)(50466002)(38730400002)(356003)(110136004)(33646002)(4326008)(36756003)(77096006)(8656002)(5003940100001)(54906002)(47776003)(6666003)(189998001)(6916009)(105606002)(2950100002)(2906002)(85426001)(81166006)(498600001)(8936002)(305945005)(50226002)(8676002)(5660300001)(104016004)(76176999)(50986999)(106466001)(68736007)(48376002)(83323001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB174; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD029; 1:RwTPtHS7i2WwRAdSsI/w/ZKq52ntzanELf4mqOBrSdLosLzeeqgqX5UUsePdI5wtPYA+jr40WTuWEDz4m2hqEjpSJzbtUyjxoJkobkekA7POczc1fjECLy7/hUmgtwJO7lrmLix42MLiVwEbgX2fFHYxxcCTvx+6smVFbWv0c7dflhIwmNmwVOWaqRTf0vcwtPXtaxQO3emBegjJ06YXB11W10aQAB1vj3sldTEDVQOrR+X+v8D8AeRMCL9mhI4rmF1GiyTH/b+/9JOWHZcWoMzgIm7ImD4Iuqu6feDrj4lShs2McFP98OP8BumxViHs1QDgTkXtg8xlZZtLyrhXEtBsgm2N7WIosF/5TBYL1BhYc7dadJOppzv71bEJNo6OKLgyrP9yV9MWbB/3fAErmmeW+m5hRMM0sDfvo8UjxR5+OIvZUp+EL4XSB5uxxQUJ50lLuk21eeIn5o5aeUDojXU7H1UTB7QSwEpQp7U2k+ddeTGmTHTBRVXQ20+bboLbe94uFlhr0DQDbM8VNvyGZl4tpybfq41TQHo0LTE4vKNqNO3UOCG7ZN8Zb1nsPYQpn14ADjmlijY++48gpL3ml8yiN2yGwTS8qXWKwBihCdj8d9Wu3vAnTXvp7egKpL0Qvf3hrD90fAEAu3awUxqD1DXFz+8b03ZRY5pLVAWD3YFXjpyhQgnZ6UoWTrJiw8h6e+LkfTx5kYyEK4Qd3VCWMQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY2PR03MB174: X-MS-Office365-Filtering-Correlation-Id: 8b7e1825-fd06-4bbe-6889-08d4a4e9d4fe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BY2PR03MB174; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB174; 3:ihd6Lw8cpGzxXx0ncTlm7B/dJPXPboUJUvX/ggoaBiTkdT0pY9CcasevsuvQhcFMvU/6bOW6BhAlQK2YinWrSuPe8RqByWgRxBZg3NDYw6NpkCgrfBJBIHUBoo5lKoBMAZiNMXhnVucXku0qAJBmU7sw3r7097vbQZG1Xz9QBux0iKhPPtwYwexkvEAxX7Yi4oXI3lnkCqNOG2kGvgIYQ31fetlQ4ej/MpVdVdA1ALZuzHydhobbssxV42Ec/nXFOB2FnB1KJee/aF5cajx8knM/H2z1ub9RApfzx1Nq4s0jkhAtzakmFmliZpF5elUV+ptHKsRQzpmgqBRjbG2OtZSQQwla74DnOsWpg/hX09jR0pMQaUFhNa8jja9m5zVCFcjJ0ter3dvglzmv1mk8j32AkrcnANUtSz7qZSRTvfnXXyH1+og8pKz3o/SMAIoP; 25:Wc/11SlmMkcW1K78QGhAVychw4O8YdqpCnGm704bOHCS55CqG2RKqqD1Sms8/u7h9b1Rh6PaUGR6xq4m4609DHmh/0ur0Od9TyTUHH+r5tkHummS23c18Ho+cGHYNRRA1vSYsfnE3HVCer6g1+AWItzhDjMpzhjfQ1OthHgNQlPo4mD7N7CVmMZ9dXLQGoIp2KLlouKPl3Mt5c5ba3CZBBwO9sgtNkogJKdPOFafHt7gKC2K0t9n7CVtDkeA1wc+C0c94XowgR6xRC85Gb9jQIktDuTgI/BGCDVOg26X2U4wiF5GBuNPte5aZ0j78nmf0I4G1OmiiRhfz0/vnGExIi9XCL2IjXXWTTSLZb3wIrdwgNMs/P2xQ0684TXocOS4Bme7nuoJNC9wAdpfAAawFP/oK45uqEvS0QQK8PN6pnfFAWsYYIicRPxiRzDRCh7muUoGWVgkzEQ1jb535I0AKRy+cIW7FJbJmqTzJ72TjkI= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB174; 31:Yc8MleknADAqsYWJiWcs0Wpd4o0TXBZ92h/QI1DeyonPpA2Pz9yt1GJWiFfvnxa98iIlQ3Lxo865h2zPeeZgK4XvweRAaZskiTGiE1uV2qLCYxRMn22a6Qz1w8z+tuh4PjRiC4Bil5Y7Mo2yg/5gmfPRXjSHr660fmWpWZ4vCn3zrDmPBR4Uq5Zp2w/FriNWP9DWkLBNEh4guruW5ODjvwRc9/ccOXkGbZ4fhJo0SJyyezT0SJn5q15YtCL7SjLLjabc2y2jGQTNete5ylUoBw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700073)(100105000095)(100000701073)(100105300095)(100000702073)(100105100095)(6095135)(601004)(2401047)(5005006)(13016025)(13018025)(8121501046)(10201501046)(93006095)(93001095)(3002001)(100000703073)(100105400095)(6055026)(6096035)(20161123563025)(20161123559100)(20161123565025)(20161123561025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123556025)(100000704073)(100105200095)(100000705073)(100105500095); SRVR:BY2PR03MB174; BCL:0; PCL:0; RULEID:(100000800073)(100110000095)(100000801073)(100110300095)(100000802073)(100110100095)(100000803073)(100110400095)(400006)(100000804073)(100110200095)(100000805073)(100110500095); SRVR:BY2PR03MB174; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB174; 4:XcEV0yDCGjkJM2ZX1mowfBFjCKivIpe2/sZeX4sk+22?= =?us-ascii?Q?Y5kBTrrwFz+5BIWyO202MQNIvz9UNH03fEA4NBZFkwa2Nco0dRuNYlA8qO9R?= =?us-ascii?Q?n4OQBEjhTYl0UmrEgD1YEQ7BpQVwWTYBXIMjFfs5lnVp5HMCuP3Tt3s8CuBj?= =?us-ascii?Q?qM+ZCe9MOfEB23KeklWgEG+FeWlM1VHihey5vCD1v4mJwDm3NRKqIdrnGfZI?= =?us-ascii?Q?6I/JRQsSwsZiGAHHuccFFErL3e70MxEvUWNCwlC5sQKHC6VHn/EFVbl4oI+J?= =?us-ascii?Q?oSfzVuOhU/yOtOeEKlo6xFLo9sm6Ds0Y5tqb8RwbNF5t+R+VifIBvySlgHAe?= =?us-ascii?Q?4/u7Fi8V6JrvP2hk+F7qNvv1gyhjs96YE2JW+upiph+XWr89IwXs3/S9nnRP?= =?us-ascii?Q?Cal5q64l6HdhqkSCFa2+iohPwVPXzgJxF/jY80Nqw0UNrleGo1/6ZZPTlhxD?= =?us-ascii?Q?ARKTP+sDttYBfOj7Sun2uP8G6YPag76zBUh0jUXHifmvzrkE8n8lpSWuVO/7?= =?us-ascii?Q?u9NPenXOaPw/+fcqq+qEAVVRwEydMG0Nw1aVfuTmqs3kUouxwdRmo1hHu1Z9?= =?us-ascii?Q?y3pdnMwxQEb2oEH/1HxwVy+oPGtOHje0mS3C8dcI1JyZiSm+6mswxC8EE+CQ?= =?us-ascii?Q?eq4Zc7BmjsaVBJ0noUZGFAQqg0/tqV5w/pXfxj74ws+CTT5bomIN/cmCfKXL?= =?us-ascii?Q?NDnAvdY5Y157HmyQgMRVSBRPW53giw27gTSoQ2VaS5HJcrI9jADiJKQixwOS?= =?us-ascii?Q?70drw3SO3JjYVIbY9qz+JndOefK5ittVu2llCylhHCqiC89xgb42jzaOoMP8?= =?us-ascii?Q?inyOpE8cIz6j08FBEV4oWS/dunfHmvKGLEmyXcNuH71HBmP8On+coS3MKP75?= =?us-ascii?Q?ASzCNZ/S5qNUlUVnbhyOtnfps5bzphnlYQsxuI/2ZlD3KXlL0P/FYqogwvkJ?= =?us-ascii?Q?NO73BPnv/yMBwuR1c3IaSGXdQRUVLYMjS5+5Z/ua48UgjSaefh7GiO3AzkJo?= =?us-ascii?Q?k34HcFX3bsuGCS5pgj+MF0UzM/JQOn0AiRpxt9AuGNUZ26kFUKkYl7MBdpZZ?= =?us-ascii?Q?DSC/b40lPDVLJxgmrgvMx47iI3a+1TirNc68qkx4PZSo9P5AUOu7Y1Giofok?= =?us-ascii?Q?8vQl+bHfvq0FheVYUqD+xDpd69v2XPkxeHgZvqiB60tc25+Vp2575TjL9nRd?= =?us-ascii?Q?d7P2rFcoveD4pdWGzuWzq4NhE20dRB5qhg5EHIipQo0Z+AH5Fnc4e1OftLKu?= =?us-ascii?Q?Jy+ob3Jk7jChXGfRsDRXYdF+y/+CjbccKBBSh?= X-Forefront-PRVS: 0320B28BE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB174; 23:AXfx68k+reSBNEzSHFHnf1W6l7kLOxWeEO4Rg3z7PK?= =?us-ascii?Q?1EzR6Zr+kQ6sHMMb+cEkeBa/PYqwLiVbuhR3tQTAUsJacrxtSaJ5z2dGF2pB?= =?us-ascii?Q?PEDIrl4oFaIO/B5IQWoNkOo7vmNGoRWVyEzVXSnilzpatr8zEXGCXIJFuX5B?= =?us-ascii?Q?QVvAYdz7aFEv8q6SaZgat2QJjhqXhXWkaDjZa8TGiYDUPaqgjwai2/3DCLNk?= =?us-ascii?Q?oVn5JOVluRBMA0DdhQd8NNi8Il8c6vC2Bp9UHcSvkBT/V9N9jnFJa/wCTSI4?= =?us-ascii?Q?XrmfBtkimveG7+z1xsCoJfIV6Lib/5bmzGki6NsGm4FHgjxCgncWEh2Ldw/6?= =?us-ascii?Q?DWM6DV880NP36Y/LpAHCjIWU5oAQj4SvJe4oELKXoD8uZzM1C16IJbip0AQ8?= =?us-ascii?Q?e1jIK+f4ttw48Tjh3H+Jp/HRN7h8j0wXN2JWRkZTRO6ckrqMgERoEjih1Mo2?= =?us-ascii?Q?CkpUQRoYCt7yKoi4zS/fuYO62kwvX4Vqm7OKYMtq7nCjMiI5iTRXyqttGxHE?= =?us-ascii?Q?LxBmrRdD9R1yRJAH7DoNQrKf9edOm5hNoQxrJCQCtQKu3FEOTjWHkRjaasvD?= =?us-ascii?Q?4Yeb/DIIRsJ2HIh8nzvmcvuTZBDsRDCehIQQs0pipG2/B223TduBH/D9Fx/S?= =?us-ascii?Q?XoaTRtQ/GzRMQOORb8cJUpsFB9E5VIOYSZCza4xcegnnN8wlJcHjNuJbyIvs?= =?us-ascii?Q?yCmWMQnnrnf7kCKkxIJJS4gluvDiBvuNRBCFOeNI2YnY3HB9OPXCQNQA8v52?= =?us-ascii?Q?ZZyy7LEn0kpGiFiRH0NqBOlxXdziP9j40pY3vcr9Z8Xnoe7fzcHqlft0hBDT?= =?us-ascii?Q?K6hNKcskE1Bg618+YUt0H4EUf5eP/c5si2UZiIjO2sm/muXM/NwBCsRSqdWc?= =?us-ascii?Q?6nD73Ms9nsL0EQC5ZmP7ndmyQ22PJ6oO4pW9uRd0EIPGrxT6iczInobvTczg?= =?us-ascii?Q?GldQCP9QmkgTvDlnErRsAMG1nWOnNkIOPU64NRukYa7G41YYfVKqMkenyXnn?= =?us-ascii?Q?A/yVN5+P+mKzx+M/Jl6ikiBJwRbwlP+xiHjOTx+IltGNpkjf7+nf+uh7n+C8?= =?us-ascii?Q?D8kd+4nXH5QbSnyW4D2zb50JjPB3jKbrC5NVkk6i/dygYzeYEKuBcXbyBMSX?= =?us-ascii?Q?EwGRWsSpUit5ZLHW0sFBpDAwWuLt/N4bvkthOsYm1KJap3fjes14XP5X06wQ?= =?us-ascii?Q?XFHfBC07oQ9r3u5nZEBJMTnYOj8yWcUCqBXbEb5ca3U9w8+ZtZ1fQBGtpIn6?= =?us-ascii?Q?KvSy1tJcmii5zoss8Trc+ft7JfS8PxvhdJDS+ORv4ZsUqrldp0sri6cbPzlg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB174; 6:XN/YdfYLCFF7RxOl4EGF0mBfSeL4EiNij1iO6ST+mPla0Lxa44jy+2jbQDKZBt0ZOoyf6hSiHen0ovRT+r/FRgKX2mI4njPLTfqBPnEn63EVM7dhP9Sq6Erp8ioBwHB9D4Q5sLBQhZMcbZH+oQb29HSeaIW/vMo/4X8ygF2vivHTuWRyAEEZqD+StPV2y/t63T4TfBVShVGddWdlwLJSxDYczAO6gtsIlsYfWCPNFG/ioBQf0nx3ZwVA4MP1v6IqbIW1ltM8vl/z1WCtYPj0pr7Jh/G9kHJqe+CI79pwBOs6dVaSmqk7UpdXqMjmDlDpd+ycdz9Hi1mW92KoG9JX8nC1/X46128B7747G3jv6xxgFzWttUsqEiJsY7zYyonHC+XCT+Cf7SPx6N09Rn/H6ickA1OvD+PaEUg35SfJK1DKlx8PJ1npLQOlhtjbhaAd4WCUsn238/uZBbR8NAZoSDWVZYSpHctv/GR4jk9k+jJD1kpf515W0Jk5laDO7pp8 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB174; 5:k/MVeS8CwayDRwJlmPjqrcaO8MwmEwDkxYbUnyIbX5enl3ZXqFWSoUQkw5rbDtBjvK88Eymk7gJd7TmiQrwzES1PJpedtTKhwbgy11VdpEWc+tFuaFSc0cLTDFhGBvp7gQ/D0BnUtWep9RkQov/BGPLuEJSVSk4YVycMCKXr/l4muqtar4MuKVRiOgYh3izoLnro/eY5kGqSZgoXINyKmj+DlK0bTmFUECC4dbTYuFl7ZuPwJdqBRkjedrMvuFouZpTbRh3w+dEKBtnhCww9+v6O3TMzixo+zQgV4TyaOwyJEHxhoT9LcYyhdU1AI0Qs0hXT5iGuZXttxWUxmr/548ZSreABz5naF1tOSb3DDxIY3bQzyogNDtfR3mCNN9VoZWaTCuj0zkWJ31CknWEvMDko8eTk0n8p7oF2UDm5RunRbVHE9gBOUF8HXNtjsaOSGCKknL0GPS3QAzucNpozdODCUTIWcxMTMxdtz0BPyMWxxjDMKjS0k9Y13xhYK723fCmmp5zn+dmUYa2jEwUuEQ==; 24:/LchWM1Rq+aYpwxYKQxkTLOucJQv98AD1t2/O5RrMRxeKHfS4+W7APWEAZ0JZuwVu/L0cNofsoogoMKGng8ZJk3ry4DFDUsIypxmQ4mWJzg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB174; 7:kjWhFbKfrr9FvvmviDG4HhP7fGb30eJ5XfEQRojW4in7QcskxH0gOKeBOeD5rWZ+tH16dK+Iu+VDNH2Iygv/wjdkqhnfYAqxHGWZGLm0ua4jlq1ZPfhfuOjIqeM/QXbhoyy0DpQjxkJz6Buy1V7yD6zQC7wjL/DO+0ysSn23fLZPtWXZqvQVi/12G4cSgudEC3l39oc6DKglY4vZcWu0GoffGpdP/n0cjwpcwoy5HHzCVcQdBQGpG3y9oDsVOiInMy2Enbj2zK6Nrf+Mtantyv/PW3iFqCNkM8+Zbq57AgyKpzAzJQOLpnbIgVDiyE0EhiGRcMiCXHbe1Fpayn8ZYg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2017 10:19:17.2768 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB174 Subject: [dpdk-dev] [RFC Patch 37/39] net/dpaa: add support for Scattered Rx 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, 27 May 2017 10:19:21 -0000 Signed-off-by: Hemant Agrawal Signed-off-by: Shreyansh Jain --- doc/guides/nics/features/dpaa.ini | 1 + drivers/net/dpaa/dpaa_rxtx.c | 157 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/doc/guides/nics/features/dpaa.ini b/doc/guides/nics/features/dpaa.ini index 4c81294..c2f787d 100644 --- a/doc/guides/nics/features/dpaa.ini +++ b/doc/guides/nics/features/dpaa.ini @@ -8,6 +8,7 @@ Link status = Y Queue start/stop = Y Jumbo frame = Y MTU update = Y +Scattered Rx = Y Promiscuous mode = Y Allmulticast mode = Y Unicast MAC filter = Y diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 7bb1077..9dc059e 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -235,6 +235,64 @@ static inline void dpaa_checksum_offload(struct rte_mbuf *mbuf, fd->cmd = DPAA_FD_CMD_RPD | DPAA_FD_CMD_DTC; } +struct rte_mbuf *dpaa_eth_sg_to_mbuf(struct qm_fd *fd, uint32_t ifid) +{ + struct pool_info_entry *bp_info = DPAA_BPID_TO_POOL_INFO(fd->bpid); + struct rte_mbuf *first_seg, *prev_seg, *cur_seg, *temp; + struct qm_sg_entry *sgt, *sg_temp; + void *vaddr, *sg_vaddr; + int i = 0; + uint8_t fd_offset = fd->offset; + + PMD_RX_LOG(DEBUG, "Received an SG frame"); + + vaddr = rte_dpaa_mem_ptov(qm_fd_addr(fd)); + if (!vaddr) { + PMD_DRV_LOG(ERR, "unable to convert physical address"); + return NULL; + } + sgt = vaddr + fd_offset; + sg_temp = &sgt[i++]; + hw_sg_to_cpu(sg_temp); + temp = (struct rte_mbuf *)((char *)vaddr - bp_info->meta_data_size); + sg_vaddr = rte_dpaa_mem_ptov(qm_sg_entry_get64(sg_temp)); + + first_seg = (struct rte_mbuf *)((char *)sg_vaddr - + bp_info->meta_data_size); + first_seg->data_off = sg_temp->offset; + first_seg->data_len = sg_temp->length; + first_seg->pkt_len = sg_temp->length; + rte_mbuf_refcnt_set(first_seg, 1); + + first_seg->port = ifid; + first_seg->nb_segs = 1; + first_seg->ol_flags = 0; + prev_seg = first_seg; + while (i < DPAA_SGT_MAX_ENTRIES) { + sg_temp = &sgt[i++]; + hw_sg_to_cpu(sg_temp); + sg_vaddr = rte_dpaa_mem_ptov(qm_sg_entry_get64(sg_temp)); + cur_seg = (struct rte_mbuf *)((char *)sg_vaddr - + bp_info->meta_data_size); + cur_seg->data_off = sg_temp->offset; + cur_seg->data_len = sg_temp->length; + first_seg->pkt_len += sg_temp->length; + first_seg->nb_segs += 1; + rte_mbuf_refcnt_set(cur_seg, 1); + prev_seg->next = cur_seg; + if (sg_temp->final) { + cur_seg->next = NULL; + break; + } + prev_seg = cur_seg; + } + + dpaa_eth_packet_info(first_seg, (uint64_t)vaddr); + rte_pktmbuf_free_seg(temp); + + return first_seg; +} + static inline struct rte_mbuf *dpaa_eth_fd_to_mbuf(struct qm_fd *fd, uint32_t ifid) { @@ -247,6 +305,9 @@ static inline struct rte_mbuf *dpaa_eth_fd_to_mbuf(struct qm_fd *fd, PMD_RX_LOG(DEBUG, " FD--->MBUF"); + if (unlikely(format == qm_fd_sg)) + return dpaa_eth_sg_to_mbuf(fd, ifid); + /* Ignoring case when format != qm_fd_contig */ ptr = rte_dpaa_mem_ptov(fd->addr); /* Ignoring case when ptr would be NULL. That is only possible incase @@ -348,6 +409,94 @@ static struct rte_mbuf *dpaa_get_dmable_mbuf(struct rte_mbuf *mbuf, return dpaa_mbuf; } +int dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, + struct qm_fd *fd, + uint32_t bpid) +{ + struct rte_mbuf *cur_seg = mbuf, *prev_seg = NULL; + struct pool_info_entry *bp_info = DPAA_BPID_TO_POOL_INFO(bpid); + struct rte_mbuf *temp, *mi; + struct qm_sg_entry *sg_temp, *sgt; + int i = 0; + + PMD_TX_LOG(DEBUG, "Creating SG FD to transmit"); + + temp = rte_pktmbuf_alloc(bp_info->mp); + if (!temp) { + PMD_DRV_LOG(ERR, "Failure in allocation mbuf"); + return -1; + } + if (temp->buf_len < ((mbuf->nb_segs * sizeof(struct qm_sg_entry)) + + temp->data_off)) { + PMD_DRV_LOG(ERR, "Insufficient space in mbuf for SG entries"); + return -1; + } + + fd->cmd = 0; + fd->opaque_addr = 0; + + if (mbuf->ol_flags & DPAA_TX_CKSUM_OFFLOAD_MASK) { + if (temp->data_off < DEFAULT_TX_ICEOF + + sizeof(struct dpaa_eth_parse_results_t)) + temp->data_off = DEFAULT_TX_ICEOF + + sizeof(struct dpaa_eth_parse_results_t); + dcbz_64(temp->buf_addr); + dpaa_checksum_offload(mbuf, fd, temp->buf_addr); + } + + sgt = temp->buf_addr + temp->data_off; + fd->format = QM_FD_SG; + fd->addr = temp->buf_physaddr; + fd->offset = temp->data_off; + fd->bpid = bpid; + fd->length20 = mbuf->pkt_len; + + + while (i < DPAA_SGT_MAX_ENTRIES) { + sg_temp = &sgt[i++]; + sg_temp->opaque = 0; + sg_temp->val = 0; + sg_temp->addr = cur_seg->buf_physaddr; + sg_temp->offset = cur_seg->data_off; + sg_temp->length = cur_seg->data_len; + if (RTE_MBUF_DIRECT(cur_seg)) { + if (rte_mbuf_refcnt_read(cur_seg) > 1) { + /*If refcnt > 1, invalid bpid is set to ensure + * buffer is not freed by HW. + */ + sg_temp->bpid = 0xff; + rte_mbuf_refcnt_update(cur_seg, -1); + } else + sg_temp->bpid = + DPAA_MEMPOOL_TO_BPID(cur_seg->pool); + cur_seg = cur_seg->next; + } else { + /* Get owner MBUF from indirect buffer */ + mi = rte_mbuf_from_indirect(cur_seg); + if (rte_mbuf_refcnt_read(mi) > 1) { + /*If refcnt > 1, invalid bpid is set to ensure + * owner buffer is not freed by HW. + */ + sg_temp->bpid = 0xff; + } else { + sg_temp->bpid = DPAA_MEMPOOL_TO_BPID(mi->pool); + rte_mbuf_refcnt_update(mi, 1); + } + prev_seg = cur_seg; + cur_seg = cur_seg->next; + prev_seg->next = NULL; + rte_pktmbuf_free(prev_seg); + } + if (cur_seg == NULL) { + sg_temp->final = 1; + cpu_to_hw_sg(sg_temp); + break; + } + cpu_to_hw_sg(sg_temp); + } + return 0; +} + uint16_t dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { @@ -414,6 +563,14 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) dpaa_checksum_offload(mbuf, &fd_arr[loop], mbuf->buf_addr); } + } else if (mbuf->nb_segs > 1 && mbuf->nb_segs <= DPAA_SGT_MAX_ENTRIES) { + if (dpaa_eth_mbuf_to_sg_fd(mbuf, + &fd_arr[loop], bp_info->bpid)) { + PMD_DRV_LOG(DEBUG, "Unable to create Scatter Gather FD"); + frames_to_send = loop; + nb_bufs = loop; + goto send_pkts; + } } else { PMD_DRV_LOG(DEBUG, "Number of Segments not supported"); /* Set frames_to_send & nb_bufs so that -- 2.7.4