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 D0B86A0093 for ; Wed, 11 May 2022 06:27:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA2514281D; Wed, 11 May 2022 06:27:38 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 2D6EB40DDD; Wed, 11 May 2022 06:27:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652243256; x=1683779256; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QMAGQwmRHz5yw0p9Gy+jptFa/5V7n0GlrR7hY8fNEPI=; b=R0sgGVBdNyFmaa49P5rvvj0DYb/964yuzWMcLoWEQwN/4SMBWTQP3k2x B6bfAIaO//AMHc8ZS3uENPzvkRba1sTG+4c4LaUcp4QFtAEA1E7cm3/Tf QSEZmw4IyNVvWNtgGyJ2KwQSvuOxLkvxWLQxFNN0pWLHgMvCCPFgi0+nf Ba+nclkdC+KBoKmwQkePlxekcvg8cx2wQaQnm4k5KWKh3jIFipnK3ekjk u8nUKXnUjWlMCachUXcizSwH8nSHFemnzBAoMBpjjR7Xvn6WggzNV4SUD Ub7xR+HX7eAN6uxKjavkVs+cjBIe88dKxuMsO9VnBnXCFlsoa+brCbebJ g==; X-IronPort-AV: E=McAfee;i="6400,9594,10343"; a="249479443" X-IronPort-AV: E=Sophos;i="5.91,216,1647327600"; d="scan'208";a="249479443" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2022 21:27:35 -0700 X-IronPort-AV: E=Sophos;i="5.91,216,1647327600"; d="scan'208";a="542122516" Received: from unknown (HELO localhost.localdomain) ([10.239.251.3]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2022 21:27:32 -0700 From: wenxuanx.wu@intel.com To: beilei.xing@intel.com, yuying.zhang@intel.com, dev@dpdk.org Cc: wenxuanx.wu@intel.com, yidingx.zhou@intel.com, stable@dpdk.org Subject: [PATCH v2] net/i40e: fix max frame size config at port level Date: Wed, 11 May 2022 04:04:47 +0000 Message-Id: <20220511040447.64272-1-wenxuanx.wu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220428111224.57705-1-wenxuanx.wu@intel.com> References: <20220428111224.57705-1-wenxuanx.wu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Wenxuan Wu Previously, max frame size can only be set when link is up, and the wait time is 1 sec. For media type of I40E_10G_BASET would consume longer time which is too short to up would result in error. Acctually, max frame size of media type I40E_MEDIA_TYPE_BASET can be set regardless of link status. This patch omitted the status check of 10G_MEDIA_TYPE_BASET. Fixes: a4ba77367923 ("net/i40e: enable maximum frame size at port level") Cc: stable@dpdk.org Signed-off-by: Wenxuan Wu --- drivers/net/i40e/i40e_ethdev.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 755786dc10..383e9a542e 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -12102,23 +12102,25 @@ i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size) struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); uint32_t rep_cnt = MAX_REPEAT_TIME; struct rte_eth_link link; - enum i40e_status_code status; - - do { - update_link_reg(hw, &link); - if (link.link_status) - break; - - rte_delay_ms(CHECK_INTERVAL); - } while (--rep_cnt); + enum i40e_status_code status = I40E_ERR_DEVICE_NOT_SUPPORTED; + 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 != 0; + } - if (link.link_status) { + if (can_be_set) status = i40e_aq_set_mac_config(hw, size, TRUE, 0, false, NULL); - if (status != I40E_SUCCESS) - PMD_DRV_LOG(ERR, "Failed to set max frame size at port level"); - } else { - PMD_DRV_LOG(ERR, "Set max frame size at port level not applicable on link down"); - } + + if (status != I40E_SUCCESS) + PMD_DRV_LOG(ERR, "Failed to set max frame size at port level"); } RTE_LOG_REGISTER_SUFFIX(i40e_logtype_init, init, NOTICE); -- 2.25.1