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 F3E34A0540 for ; Tue, 13 Dec 2022 19:48:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EBB1340395; Tue, 13 Dec 2022 19:48:13 +0100 (CET) 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 025024021D for ; Tue, 13 Dec 2022 19:48:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670957291; 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=6PaLXDSaZ/kWa+6aM0oeP2XjHmxCsCqUptC6lUIWVnc=; b=LjV78hRnnMhyrEKIVDrxmunl7lXj2RkLl1WwVGdWygzqgliw93G3zuLFTuZT+cT0nG3hhC q1FSbIKUxtbawA6aXPjwDYhYhEDFH1naVDRppWD1VhvQX7zWB2KUVyN5ZsyjSMIbD1uik2 zrN7cWBG0nRzc7oF/3ZqArdxOryF/7E= 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-146-a6NylD7bNoetg8aP0TAdTQ-1; Tue, 13 Dec 2022 13:48:08 -0500 X-MC-Unique: a6NylD7bNoetg8aP0TAdTQ-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 0D12481B538; Tue, 13 Dec 2022 18:48:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id E456A51FF; Tue, 13 Dec 2022 18:48:05 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org Cc: bluca@debian.org, david.marchand@redhat.com, john.mcnamara@intel.com, qi.z.zhang@intel.com, yux.jiang@intel.com, beilei.xing@intel.com, Yuying.Zhang@intel.com, wenxuanx.wu@intel.com, jie1x.wang@intel.com, dapengx.yu@intel.com, Kevin Traynor Subject: [PATCH 21.11 2/3] Revert "net/i40e: fix max frame size config at port level" Date: Tue, 13 Dec 2022 18:47:32 +0000 Message-Id: <20221213184733.411996-2-ktraynor@redhat.com> In-Reply-To: <20221213184733.411996-1-ktraynor@redhat.com> References: <20221213184733.411996-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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 This reverts commit 67309512051829f552bc105ac63f48029629e238. This chain of commits has been found to cause issues with setting max frame size when the link is not negotiated in 1s or the link is down. The frame size is not set and no error is returned to the user. Revert the chain until a fix is found. Link to original upstream commit and discussion: 2184f7cdeeaa ("net/i40e: fix max frame size config at port level") https://mails.dpdk.org/archives/dev/2022-December/257566.html Reported-by: David Marchand Signed-off-by: Kevin Traynor --- drivers/net/i40e/i40e_ethdev.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index bad27355fc..4ac31c2fec 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -12113,18 +12113,14 @@ 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; - /* 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; - } + do { + update_link_reg(hw, &link); + if (link.link_status) + break; - if (can_be_set) { + rte_delay_ms(CHECK_INTERVAL); + } while (--rep_cnt); + + if (link.link_status) { status = i40e_aq_set_mac_config(hw, size, TRUE, 0, false, NULL); if (status != I40E_SUCCESS) -- 2.38.1