From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7D359A054A for ; Tue, 25 Oct 2022 17:08:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 78E7A42C48; Tue, 25 Oct 2022 17:08:36 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 4E59D42C34 for ; Tue, 25 Oct 2022 17:08:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a3aOF3on0aVXfZaxa2mHeXiG6q3O1ei3gC7VYGzdQ1k=; b=QaYF218xkvPw6iWHWF5b2GAMrPv26W6u0dLX7JlP2C86UhomvkwUVrO9e9S2MAoDtMg7pz jThcXV3OZQtry0jEpfcPEK05RGlIaGvgq9w24T1s138AjKP2ZfPtuNebhb1JRpTUJugfkE IEGkw17tMWNna57D4rFCB0ikj9m4NZ0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-126-1d1a9eRBPdWOrL1l6XbQCg-1; Tue, 25 Oct 2022 11:08:29 -0400 X-MC-Unique: 1d1a9eRBPdWOrL1l6XbQCg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D03613815D2C; Tue, 25 Oct 2022 15:08:27 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8972649BB60; Tue, 25 Oct 2022 15:08:26 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: fix maximum frame size' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:16 +0100 Message-Id: <20221025150734.142189-21-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 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/01/22. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/82fa3908c0bd55dbe0cd948faf7987b087a5daa7 Thanks. Kevin --- >From 82fa3908c0bd55dbe0cd948faf7987b087a5daa7 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 2 Sep 2022 11:00:09 +0800 Subject: [PATCH] net/ngbe: fix maximum frame size [ upstream commit d5774f0c82bec587c1183435a9d8e8c2456b5f15 ] Remain the same max frame size after the device restarts. Fixes: 07baabb6a51a ("net/ngbe: support MTU set") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_regs.h | 2 +- drivers/net/ngbe/base/ngbe_type.h | 2 +- drivers/net/ngbe/ngbe_ethdev.c | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/ngbe/base/ngbe_regs.h b/drivers/net/ngbe/base/ngbe_regs.h index 640e385990..c0e79a2ba7 100644 --- a/drivers/net/ngbe/base/ngbe_regs.h +++ b/drivers/net/ngbe/base/ngbe_regs.h @@ -526,5 +526,5 @@ enum ngbe_5tuple_protocol { #define NGBE_FRMSZ 0x015020 #define NGBE_FRMSZ_MAX_MASK MS(0, 0xFFFF) -#define NGBE_FRMSZ_MAX(v) LS(v, 0, 0xFFFF) +#define NGBE_FRMSZ_MAX(v) LS((v) + 4, 0, 0xFFFF) #define NGBE_VLANCTL 0x015088 #define NGBE_VLANCTL_TPID_MASK MS(0, 0xFFFF) diff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h index 043da3cd25..015f484e8f 100644 --- a/drivers/net/ngbe/base/ngbe_type.h +++ b/drivers/net/ngbe/base/ngbe_type.h @@ -10,5 +10,5 @@ #define NGBE_FRAME_SIZE_MAX (9728) /* Maximum frame size, +FCS */ -#define NGBE_FRAME_SIZE_DFT (1522) /* Default frame size, +FCS */ +#define NGBE_FRAME_SIZE_DFT (1518) /* Default frame size, +FCS */ #define NGBE_NUM_POOL (32) #define NGBE_PBRXSIZE_MAX 0x00080000 /* 512KB Packet Buffer */ diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 92eb36f5d4..07b3d15455 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -2458,5 +2458,5 @@ ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) { struct ngbe_hw *hw = ngbe_dev_hw(dev); - uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 4; + uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN; struct rte_eth_dev_data *dev_data = dev->data; @@ -2471,10 +2471,6 @@ ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) } - if (hw->mode) - wr32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK, - NGBE_FRAME_SIZE_MAX); - else - wr32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK, - NGBE_FRMSZ_MAX(frame_size)); + wr32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK, + NGBE_FRMSZ_MAX(frame_size)); return 0; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.037281573 +0100 +++ 0021-net-ngbe-fix-maximum-frame-size.patch 2022-10-25 14:18:58.377797969 +0100 @@ -1 +1 @@ -From d5774f0c82bec587c1183435a9d8e8c2456b5f15 Mon Sep 17 00:00:00 2001 +From 82fa3908c0bd55dbe0cd948faf7987b087a5daa7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d5774f0c82bec587c1183435a9d8e8c2456b5f15 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 73111f7950..aa5c41146c 100644 +index 043da3cd25..015f484e8f 100644 @@ -41 +42 @@ -index df32bf64ff..1090ba9a11 100644 +index 92eb36f5d4..07b3d15455 100644 @@ -44 +45 @@ -@@ -2474,5 +2474,5 @@ ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +@@ -2458,5 +2458,5 @@ ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) @@ -51 +52 @@ -@@ -2487,10 +2487,6 @@ ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +@@ -2471,10 +2471,6 @@ ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)