From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id 76D4A23D for ; Mon, 30 Jul 2018 18:16:47 +0200 (CEST) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=lap.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fkAq0-00009D-Of; Mon, 30 Jul 2018 16:16:00 +0000 From: Christian Ehrhardt To: Shahed Shaikh Cc: dpdk stable Date: Mon, 30 Jul 2018 18:11:45 +0200 Message-Id: <20180730161342.16566-60-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730161342.16566-1-christian.ehrhardt@canonical.com> References: <20180730161342.16566-1-christian.ehrhardt@canonical.com> Subject: [dpdk-stable] patch 'net/qede: fix Rx/Tx offload flags' has been queued to stable release 18.05.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: Mon, 30 Jul 2018 16:16:47 -0000 Hi, FYI, your patch has been queued to stable release 18.05.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 08/01/18. So please shout if anyone has objections. Thanks. Christian Ehrhardt --- >>From 1755009b24a1d6881717c874adc7ad44909d60ef Mon Sep 17 00:00:00 2001 From: Shahed Shaikh Date: Wed, 27 Jun 2018 23:01:58 -0700 Subject: [PATCH] net/qede: fix Rx/Tx offload flags [ upstream commit 048a68edc0c01c9bf3daf3f90334861559436fe9 ] - We don't support QinQ offload, so removing it now. - Fix incorrect offload flags in default rxconf Since qede PMD does not support per queue rx offload, it should not set default_rxconf.offload flags in .dev_infos_get(). Although these offloads are enabled by default, they are per port and not per queue. Fixes: 946dfd18a4ec ("net/qede: convert to new Rx/Tx offloads API") Signed-off-by: Shahed Shaikh --- drivers/net/qede/qede_ethdev.c | 7 +------ drivers/net/qede/qede_rxtx.c | 2 +- drivers/net/qede/qede_rxtx.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index 68c8c899b..876052772 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -1568,7 +1568,6 @@ qede_dev_info_get(struct rte_eth_dev *eth_dev, DEV_TX_OFFLOAD_UDP_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM | DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | - DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_MULTI_SEGS | DEV_TX_OFFLOAD_TCP_TSO | DEV_TX_OFFLOAD_VXLAN_TNL_TSO | @@ -1582,11 +1581,7 @@ qede_dev_info_get(struct rte_eth_dev *eth_dev, dev_info->default_rxconf = (struct rte_eth_rxconf) { /* Packets are always dropped if no descriptors are available */ .rx_drop_en = 1, - /* The below RX offloads are always enabled */ - .offloads = (DEV_RX_OFFLOAD_CRC_STRIP | - DEV_RX_OFFLOAD_IPV4_CKSUM | - DEV_RX_OFFLOAD_TCP_CKSUM | - DEV_RX_OFFLOAD_UDP_CKSUM), + .offloads = 0, }; memset(&link, 0, sizeof(struct qed_link_output)); diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 4fa1c615b..174e3776e 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -1971,7 +1971,7 @@ qede_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) } /* Descriptor based VLAN insertion */ - if (tx_ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_QINQ_PKT)) { + if (tx_ol_flags & PKT_TX_VLAN_PKT) { vlan = rte_cpu_to_le_16(mbuf->vlan_tci); bd1_bd_flags_bf |= 1 << ETH_TX_1ST_BD_FLAGS_VLAN_INSERTION_SHIFT; diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h index 84a834d2c..37cab7e35 100644 --- a/drivers/net/qede/qede_rxtx.h +++ b/drivers/net/qede/qede_rxtx.h @@ -147,7 +147,6 @@ PKT_TX_TCP_SEG) #define QEDE_TX_OFFLOAD_MASK (QEDE_TX_CSUM_OFFLOAD_MASK | \ - PKT_TX_QINQ_PKT | \ PKT_TX_VLAN_PKT | \ PKT_TX_TUNNEL_VXLAN | \ PKT_TX_TUNNEL_GENEVE | \ -- 2.17.1