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 1AE89A0555 for ; Thu, 9 Jun 2022 13:38:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA38240220; Thu, 9 Jun 2022 13:38:38 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B3F0B427E9 for ; Thu, 9 Jun 2022 13:38:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774716; 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=v+y2sveXmfyXMVZXEIr9MvFlle5YoRZOcQD92Yo7Osk=; b=KNZUyJTBzxeuVONY4uBg0TrBdKSy58eZ3S5CFzJrPdOlcbH9dtETJp0aLHDmJ5JXyuRQpI i4NqzNTr1Eae3hH73By8Usw6Ucb3ufwOpgh/T9k61VjfqyOUMzHPfg6dM28zvcbD2JitnP soqQd2FQahLtrTkPXP19GnKQt5v7oSA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-mC5Ous1kNq-YmSXhyGG19g-1; Thu, 09 Jun 2022 07:38:35 -0400 X-MC-Unique: mC5Ous1kNq-YmSXhyGG19g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D52AD811E7A; Thu, 9 Jun 2022 11:38:32 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id E85FF18EA3; Thu, 9 Jun 2022 11:38:31 +0000 (UTC) From: Kevin Traynor To: Wenxuan Wu Cc: Yuying Zhang , dpdk stable Subject: patch 'net/i40e: fix max frame size config at port level' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:47 +0100 Message-Id: <20220609113701.386938-60-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/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/dbae86def3ac04bec69e8123bef672356ad33f24 Thanks. Kevin --- >From dbae86def3ac04bec69e8123bef672356ad33f24 Mon Sep 17 00:00:00 2001 From: Wenxuan Wu Date: Wed, 18 May 2022 04:59:14 +0000 Subject: [PATCH] net/i40e: fix max frame size config at port level [ upstream commit 2184f7cdeeaa7eb814e102fd01773db204ccd3bf ] Previously, max frame size can only be set when link is up, and the wait time is 1 sec. Startup time of 10G_BASET longer than 1s would result in failure. Actually, max frame size of media type I40E_MEDIA_TYPE_BASET can be set regardless of link status. This patch omitted the link status check of 10G_MEDIA_TYPE_BASET. Fixes: a4ba77367923 ("net/i40e: enable maximum frame size at port level") Signed-off-by: Wenxuan Wu Acked-by: Yuying Zhang --- drivers/net/i40e/i40e_ethdev.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 4ac31c2fec..bad27355fc 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -12113,14 +12113,18 @@ i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size) struct rte_eth_link link; enum i40e_status_code status; + bool can_be_set = true; - do { - update_link_reg(hw, &link); - if (link.link_status) - break; + /* I40E_MEDIA_TYPE_BASET link up can be ignored */ + if (hw->phy.media_type != I40E_MEDIA_TYPE_BASET) { + do { + update_link_reg(hw, &link); + if (link.link_status) + break; + rte_delay_ms(CHECK_INTERVAL); + } while (--rep_cnt); + can_be_set = !!link.link_status; + } - rte_delay_ms(CHECK_INTERVAL); - } while (--rep_cnt); - - if (link.link_status) { + if (can_be_set) { status = i40e_aq_set_mac_config(hw, size, TRUE, 0, false, NULL); if (status != I40E_SUCCESS) -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:31.143086158 +0100 +++ 0060-net-i40e-fix-max-frame-size-config-at-port-level.patch 2022-06-09 12:34:29.795980726 +0100 @@ -1 +1 @@ -From 2184f7cdeeaa7eb814e102fd01773db204ccd3bf Mon Sep 17 00:00:00 2001 +From dbae86def3ac04bec69e8123bef672356ad33f24 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2184f7cdeeaa7eb814e102fd01773db204ccd3bf ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 755786dc10..7ffd7e7384 100644 +index 4ac31c2fec..bad27355fc 100644 @@ -28 +29 @@ -@@ -12104,14 +12104,18 @@ i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size) +@@ -12113,14 +12113,18 @@ i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size)