From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id EC60D1B11F for ; Wed, 21 Nov 2018 17:06:25 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 411B330832E5; Wed, 21 Nov 2018 16:06:25 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 819205F7D9; Wed, 21 Nov 2018 16:06:24 +0000 (UTC) From: Kevin Traynor To: Hemant Agrawal Cc: dpdk stable Date: Wed, 21 Nov 2018 16:04:17 +0000 Message-Id: <20181121160440.9014-27-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 21 Nov 2018 16:06:25 +0000 (UTC) Subject: [dpdk-stable] patch 'net/dpaa: fix jumbo buffer config' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 16:06:26 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 2a2d4ef95d07f89626a84a93510da3387d629f24 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Fri, 21 Sep 2018 16:35:51 +0530 Subject: [PATCH] net/dpaa: fix jumbo buffer config [ upstream commit deeec8ef57cb2f336b192cfcb6a4df5104c6a9a5 ] Set the missing dev data mtu for the correct size. Set the max supported size in hw, if user is asking for more. Fixes: 9658ac3a4ef6 ("net/dpaa: set the correct frame size in device MTU") Signed-off-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 7a950ac04..2a380f024 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -195,12 +195,22 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) { + uint32_t max_len; + + DPAA_PMD_DEBUG("enabling jumbo"); + if (dev->data->dev_conf.rxmode.max_rx_pkt_len <= - DPAA_MAX_RX_PKT_LEN) { - fman_if_set_maxfrm(dpaa_intf->fif, - dev->data->dev_conf.rxmode.max_rx_pkt_len); - return 0; - } else { - return -1; + DPAA_MAX_RX_PKT_LEN) + max_len = dev->data->dev_conf.rxmode.max_rx_pkt_len; + else { + DPAA_PMD_INFO("enabling jumbo override conf max len=%d " + "supported is %d", + dev->data->dev_conf.rxmode.max_rx_pkt_len, + DPAA_MAX_RX_PKT_LEN); + max_len = DPAA_MAX_RX_PKT_LEN; } + + fman_if_set_maxfrm(dpaa_intf->fif, max_len); + dev->data->mtu = max_len + - ETHER_HDR_LEN - ETHER_CRC_LEN - VLAN_TAG_SIZE; } return 0; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:14.318418015 +0000 +++ 0027-net-dpaa-fix-jumbo-buffer-config.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,13 +1,14 @@ -From deeec8ef57cb2f336b192cfcb6a4df5104c6a9a5 Mon Sep 17 00:00:00 2001 +From 2a2d4ef95d07f89626a84a93510da3387d629f24 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Fri, 21 Sep 2018 16:35:51 +0530 Subject: [PATCH] net/dpaa: fix jumbo buffer config +[ upstream commit deeec8ef57cb2f336b192cfcb6a4df5104c6a9a5 ] + Set the missing dev data mtu for the correct size. Set the max supported size in hw, if user is asking for more. Fixes: 9658ac3a4ef6 ("net/dpaa: set the correct frame size in device MTU") -Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- @@ -15,10 +16,10 @@ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c -index c1f1bf72e..8c585152c 100644 +index 7a950ac04..2a380f024 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c -@@ -194,12 +194,22 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) +@@ -195,12 +195,22 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) { + uint32_t max_len;