From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <shreyansh.jain@nxp.com>
Received: from NAM03-BY2-obe.outbound.protection.outlook.com
(mail-by2nam03on0075.outbound.protection.outlook.com [104.47.42.75])
by dpdk.org (Postfix) with ESMTP id 136CE2BA9
for <dev@dpdk.org>; Thu, 28 Sep 2017 14:20:21 +0200 (CEST)
Received: from CY1PR03CA0003.namprd03.prod.outlook.com (10.174.128.13) by
DM5PR03MB2697.namprd03.prod.outlook.com (10.168.197.135) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id
15.20.77.7; Thu, 28 Sep 2017 12:20:19 +0000
Received: from BN1BFFO11FD038.protection.gbl (2a01:111:f400:7c10::1:116) by
CY1PR03CA0003.outlook.office365.com (2603:10b6:600::13) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id
15.20.56.8 via Frontend Transport; Thu, 28 Sep 2017 12:20:19 +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
BN1BFFO11FD038.mail.protection.outlook.com (10.58.144.101) with Microsoft
SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id
15.20.56.11 via Frontend Transport; Thu, 28 Sep 2017 12:20:18 +0000
Received: from Tophie.ap.freescale.net ([10.232.14.39])
by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8SCJ72U008785;
Thu, 28 Sep 2017 05:20:17 -0700
From: Shreyansh Jain <shreyansh.jain@nxp.com>
To: <dev@dpdk.org>
CC: <ferruh.yigit@intel.com>, <hemant.agrawal@nxp.com>
Date: Thu, 28 Sep 2017 17:59:57 +0530
Message-ID: <20170928123000.1711-38-shreyansh.jain@nxp.com>
X-Mailer: git-send-email 2.9.3
In-Reply-To: <20170928123000.1711-1-shreyansh.jain@nxp.com>
References: <20170928113344.12248-1-shreyansh.jain@nxp.com>
<20170928123000.1711-1-shreyansh.jain@nxp.com>
X-EOPAttributedMessage: 0
X-Matching-Connectors: 131510748190930995;
(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)(39860400002)(39380400002)(376002)(346002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(6916009)(316002)(305945005)(33646002)(85426001)(104016004)(6666003)(77096006)(81166006)(2351001)(50226002)(356003)(8656003)(97736004)(16586007)(54906003)(2906002)(2950100002)(8936002)(8676002)(1076002)(81156014)(36756003)(5660300001)(498600001)(4326008)(53936002)(76176999)(86362001)(68736007)(50986999)(189998001)(106466001)(47776003)(5003940100001)(105606002)(48376002)(50466002)(83323001);
DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2697; H:tx30smr01.am.freescale.net;
FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en;
X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD038;
1:WGJA0cRsGaLRAHj9xBu4Q1kQ7Wk2CwvLUZ6T/MpfQWtTgCj6moUey6QliZACEOT8hJv93c8UdmMjQQ2poo3m17iFwsXJpjLWpAsXFSI7p90z92wt+GcBh98qZlga0QnY
MIME-Version: 1.0
Content-Type: text/plain
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 1e6ad20f-f91d-4c90-f833-08d5066b4887
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0;
RULEID:(22001)(2017052603199)(201703131430075)(201703131517081);
SRVR:DM5PR03MB2697;
X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2697;
3:n+GsyVmZhdZRYh61gpFfHfHCQ79dnBT9gASwUT4w8g7D6cf0J9+sEUTOkUQhwp9v6pDdKyyQGYVtsiG3IfoYc7jY+wGfSqjCdVk+dTVAyQ3rigY7tBAlE3MWg476IXMPUeTAGLme8R0w4SehnSMd9kwnKxnswWjZs4YwuM17gyG4iOur9TCxDF7NfdmAvBY+TshYrZAk1QW4pMaqDNN5NWtAOEOlWMTMCaF4VzO6349k2u9MfHn8SqUjGK9XTBBRyHAno1CZajerkGPsmkS702f0dEl8Ke6trtTFxLHZr2wsTOdglgOn+U5osg9c/sl+MjsOkvyeTaWeL3BmzzX3p2SrdDo4pDJuQBGsOAIo4Mg=;
25:C7OwahhGwkBPQ6FTruqEPXHUaDJ7a54VoCn3yUeagZRHZr6IrkBlKk+6QGnbg15Iyx6XvyvJ2hMnIIbJMp+7vZ+hXbvyMUOTcpMLRj5tJ0IYqSxys/0qiSiCt8/2pyZiswfYmE41uuq0sWnWytxpjzPHkVXkjM6lawe0Db5d3AEgLfFYXS+5OC33WNVktCH8A+T5S3Hst+TVi/gwZMoFSnox3JWqC5Rqpq5B9QNTfvyc5gCsRQjChUjO++4l4Ac47uif8AXTv/zIyjxTtrDXolaRhrgGlnqGQgveVt7FK+mXwWIAiMFYLfxO5qibsOkjKOhBGwnG+36b6TMDeBTljQ==
X-MS-TrafficTypeDiagnostic: DM5PR03MB2697:
X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2697;
31:qiHtKjs9ftPYuOOnAW084wvrq8iRLbdR8rzmV60f83J890m61zw1dXRtE/1TLeCILaQ1H74/lR3Z7OapHTO9f8XbBrJy68x9QLVOW50LrJJ4M1790dBJBphzbEZsvszMc4LQUozrUxv9TrrJKN6FndQHxYFQjtd1REuFjhgfHMQISVfTZaF0+sE2slbm2ZrSssW8sKDSXH+RY4PsvrJS33hZ14ld7XV3zYAKpKQuSMw=;
4:ylwFr9SH/CL7F87tvMbXIhzKB90hrZIXpXRcjx5Jh7nmWj8M7FsKQSTAXuZ3udYGAV5kutCd5tCdFHlaAQc1wBYxprPeM7z3ec6n5+5E/o4SmF/b/3D2JxqaWwKL/REFOJCEVCMmqdZiRXtam4Sir5gPsUbIqFvb48pgb8w8eJAYEMVKmH4v04OVr8EO7nj897j+CJlOCwbNlW8p55HyVt5EtXXCXtcYLKs9PZrJvPxYa+HL/JbkiA4/FvBhPRtDjuP2g2LYt0Iolj0Tb7PkMFMhRWLuV01ajwodZZjlZK0=
X-Exchange-Antispam-Report-Test: UriScan:(185117386973197);
X-Microsoft-Antispam-PRVS: <DM5PR03MB26979577C12C9B4C3F4BDFE690790@DM5PR03MB2697.namprd03.prod.outlook.com>
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(6055026)(6096035)(20161123563025)(20161123556025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123561025)(20161123559100)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);
SRVR:DM5PR03MB2697; BCL:0; PCL:0;
RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);
SRVR:DM5PR03MB2697;
X-Forefront-PRVS: 0444EB1997
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2697;
23:jTKWbMEZUB0WGbYPWwyzNL7z9+G8HZkzyx/J/rnzg?=
=?us-ascii?Q?JwTZ7w9kH6cYptPeytWpUerw2aTK+ZTiy4GoqBnZSKRNaumzJLvDEI5bSGBN?=
=?us-ascii?Q?w1iUI7pToU/tVs38SwChYkTHnCLXcowxLibvpFviPL7ebPBBrXXdiK8iVJ84?=
=?us-ascii?Q?n6jeAXu62g7+OuGjHBu4XAKGppHDAfsBL38ZnlOJ3jC0CRqrEvCrO888vrHF?=
=?us-ascii?Q?aFBqiFeLd0QJcWFsPcfZWNU1kaqOxwAH19PUI/jjV2yUoIcJReLAkJ5OXM+g?=
=?us-ascii?Q?OnTxgqlUQjmRp9Axa+lzuJwdBM/7/zUwXQjfKwd2pmpjEKEeunLeH87tDhOX?=
=?us-ascii?Q?nHZeGhugHbYgkEmPBAVhVasMmOR6RZwcUk2+PRCO7oe4HUNVjgJhJW0EPzcc?=
=?us-ascii?Q?HNpCzxySz2WynIEiIMtwh5wll/q0HwIBOZJqaVuaEYV/xxy8grFenppCiN3+?=
=?us-ascii?Q?D7C64fmkceXBME6aVr1SxTyllpOTP8o7TTcN0liL9G9iMtessNrnc5gD0rYG?=
=?us-ascii?Q?dxZ+4tW348IbfW9x7LZrOlQtnTprz2lG6nEnEb4pnGJmJZTQj08oP5uXfMre?=
=?us-ascii?Q?PSgqCRjG63wKLw8M9qoPNaaT8ZOsNoIi5eun9bD+TP7+1/CONJdX6D9VssNE?=
=?us-ascii?Q?8IC9mNPqzqAVTrFQN1BcQNQYwoBPt5OC8gA5NPBghhDUOi07yH9ieFiVNn4x?=
=?us-ascii?Q?Lxmt041wH13nw8m5+Aa9JNaxxk++vETEFLRLUE9kTOdVdYnGl9zoxTqn4dNW?=
=?us-ascii?Q?pcnp5QNX2YGepr9/vmfQ24qXEv1M3hyBEd6o/m2oKPukn7ZEk58wp7urxt4d?=
=?us-ascii?Q?j+Bq6EfJH3i55Gq63ffSu0bYblhjufdhhPHa1lSCyE0kd+vW1C0Np/gmstho?=
=?us-ascii?Q?TZUrBtaq08RaPNJxHdVweLQdfGxGGo9Gac6xGhFjXc6uzdlj+0liBm6XDLom?=
=?us-ascii?Q?mJn9cebdd9BwptHx+ZJJldte6u2SHI8uGLC8VapR2MOHjYmKpreipW0TrJrW?=
=?us-ascii?Q?2kVO2E/UMuQip9yE3PAHvKe/ZkO9nPlwLRAYTc46a6xY/5NxsxlV418HPK8M?=
=?us-ascii?Q?SiDcTnpqG2oxrdxNUEf7jooX6ZQyeMzWbqPjRKCxIyv5+nG9xa9Wt+DczZks?=
=?us-ascii?Q?1LaEBL/yvqlmWzzAEG+pPoMi3Gdem6vJjKyxHGIyPWhnD7cLGgBwFpb4DZmZ?=
=?us-ascii?Q?oq5bCRBV8tfz1//oJEtsqGUcEpqyfku8N04?=
X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2697;
6:pJ/jjWS+rWputnjVDAxm8Ho35qntEJiXV0Iv5kgVJ+4pJ4hmktmSCpq62Clacs9zpHYO2hWG7kttWnxj3jzg1yywez0xU+cPEn5I97ryxJ5arpSF0/DR5FW6rj6S8wwN5+EmjdLUdtxnv+9ac18KoacNGek6f4C+/AIGEeaAxb+4Fe2cuAWvkobNf63K2HbbE3aI0DOnnxE8yuRlsYAFp89c1Nop8XmKn8SKQ3kVHDZsxyCgCMGFyyyH5Op7K97+SdgihVypXV1zs9H7JaNjQ4Fsvp8bmWndMhattVQmcxIcru2eF/vdg69cQqo7ZM6V8FsU3qGaP4xPJqFpDg1Lig==;
5:w6H6PdK85r0b2QX4f1ovpHxhQFcDa6ylZkSOzxGZYokP8whIIbWh+6lGC/i2baPYxaZXm/4suXiGIp9tQcYsoB53h+fjVL5Ah2YOzWS7REKtvKtt8ce7MenSYvZzuBt8hKorZRPYiQ8p6Vpnkizg1A==;
24:sVKwo4xawbNByQI/qLOCto3/wH33goEfFY+bCeL75PQpRKFbNHAqxCIoOhUHnUgsLmjT9/N1DyojNPnFm6rBNfRT7GprxSwmFOUfV5bAr58=;
7:Kny5mc36yuTPQZRpVjTj7f9YD7pfDG/aXBDnNtJhzPWj4z56qUF+VzNQyk/talKHDTB8zXeogAT8VYMbXX7DQKAgp90pmWIFOGqSIKV8tGrBJE9+cFE38OpBrBupO8z8h3XEEhX8D9YvnX7PTMsOXGPGuMYF2wLXPqweXVuyOh3oJKek4VzmIKwSV4xhESUr+rlRZwiYFzYLMOSZYBY+BnjrGU+qTJzPyUSkviLIg78=
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2017 12:20:18.9058 (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: DM5PR03MB2697
Subject: [dpdk-dev] [PATCH v6 37/40] net/dpaa: support Scattered Rx
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Sep 2017 12:20:21 -0000
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
doc/guides/nics/features/dpaa.ini | 1 +
drivers/net/dpaa/dpaa_rxtx.c | 159 ++++++++++++++++++++++++++++++++++++++
drivers/net/dpaa/dpaa_rxtx.h | 9 +++
3 files changed, 169 insertions(+)
diff --git a/doc/guides/nics/features/dpaa.ini b/doc/guides/nics/features/dpaa.ini
index 23626c0..0e7956c 100644
--- a/doc/guides/nics/features/dpaa.ini
+++ b/doc/guides/nics/features/dpaa.ini
@@ -8,6 +8,7 @@ Speed capabilities = P
Link status = 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 976268b..9c25d8c 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -276,18 +276,82 @@ 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 dpaa_bp_info *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;
+
+ DPAA_DP_LOG(DEBUG, "Received an SG frame");
+
+ vaddr = rte_dpaa_mem_ptov(qm_fd_addr(fd));
+ if (!vaddr) {
+ DPAA_PMD_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)
{
struct dpaa_bp_info *bp_info = DPAA_BPID_TO_POOL_INFO(fd->bpid);
struct rte_mbuf *mbuf;
void *ptr;
+ uint8_t format =
+ (fd->opaque & DPAA_FD_FORMAT_MASK) >> DPAA_FD_FORMAT_SHIFT;
uint16_t offset =
(fd->opaque & DPAA_FD_OFFSET_MASK) >> DPAA_FD_OFFSET_SHIFT;
uint32_t length = fd->opaque & DPAA_FD_LENGTH_MASK;
DPAA_DP_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
@@ -390,6 +454,95 @@ 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 dpaa_bp_info *bp_info = DPAA_BPID_TO_POOL_INFO(bpid);
+ struct rte_mbuf *temp, *mi;
+ struct qm_sg_entry *sg_temp, *sgt;
+ int i = 0;
+
+ DPAA_DP_LOG(DEBUG, "Creating SG FD to transmit");
+
+ temp = rte_pktmbuf_alloc(bp_info->mp);
+ if (!temp) {
+ DPAA_PMD_ERR("Failure in allocation of mbuf");
+ return -1;
+ }
+ if (temp->buf_len < ((mbuf->nb_segs * sizeof(struct qm_sg_entry))
+ + temp->data_off)) {
+ DPAA_PMD_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;
+}
+
/* Handle mbufs which are not segmented (non SG) */
static inline void
tx_on_dpaa_pool_unsegmented(struct rte_mbuf *mbuf,
@@ -460,6 +613,12 @@ tx_on_dpaa_pool(struct rte_mbuf *mbuf,
if (mbuf->nb_segs == 1) {
/* Case for non-segmented buffers */
tx_on_dpaa_pool_unsegmented(mbuf, bp_info, fd_arr);
+ } else if (mbuf->nb_segs > 1 &&
+ mbuf->nb_segs <= DPAA_SGT_MAX_ENTRIES) {
+ if (dpaa_eth_mbuf_to_sg_fd(mbuf, fd_arr, bp_info->bpid)) {
+ DPAA_PMD_DEBUG("Unable to create Scatter Gather FD");
+ return 1;
+ }
} else {
DPAA_PMD_DEBUG("Number of Segments not supported");
return 1;
diff --git a/drivers/net/dpaa/dpaa_rxtx.h b/drivers/net/dpaa/dpaa_rxtx.h
index d10298e..2ffc4ff 100644
--- a/drivers/net/dpaa/dpaa_rxtx.h
+++ b/drivers/net/dpaa/dpaa_rxtx.h
@@ -58,6 +58,8 @@
/* L4 Type field: TCP */
#define DPAA_L4_PARSE_RESULT_TCP 0x20
+#define DPAA_SGT_MAX_ENTRIES 16 /* maximum number of entries in SG Table */
+
#define DPAA_MAX_DEQUEUE_NUM_FRAMES 63
/** <Maximum number of frames to be dequeued in a single rx call*/
@@ -285,4 +287,11 @@ uint16_t dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs);
uint16_t dpaa_eth_tx_drop_all(void *q __rte_unused,
struct rte_mbuf **bufs __rte_unused,
uint16_t nb_bufs __rte_unused);
+
+struct rte_mbuf *dpaa_eth_sg_to_mbuf(struct qm_fd *fd, uint32_t ifid);
+
+int dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
+ struct qm_fd *fd,
+ uint32_t bpid);
+
#endif
--
2.9.3