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 1C90742800 for ; Wed, 22 Mar 2023 01:42:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1829242C4D; Wed, 22 Mar 2023 01:42:33 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id EF00B42C24 for ; Wed, 22 Mar 2023 01:42:31 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id t17-20020a05600c451100b003edc906aeeaso44705wmo.1 for ; Tue, 21 Mar 2023 17:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679445751; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mXvUW84+40cV6Vr1rJtqA8qxStfSLX2sIQlOzJPBrdY=; b=aiItRpqtn/pzDVCgVWu36J1kdI2jsc2BUYrtX0eW1g7gLJcah+PqmuVqEEbX9Ydsea 31cJJcY0J2itUqa8aKrH3fCQzlvzmBTO6G75Y2KhvlCgOfB2ZN+V2/SGGizU9kDgy9O2 LIW55lnjOXcrdJjEyjlP0rhBcyZrFGkGH+kfnMj53Hk3xLstg/OiY3qLPyIO94+F8tVJ /1jiTyRQXMxI22MTjpZMH5djFNzzpIjjWNCrLjT/pkLYgHXy/gAlGV7dHoVLiXDj2ebt 4O8KBl1+mgPMNTCHqaglq6stF81CJT4wW43yb8MYJ+3EKlHxO9m3CmzlSYKmSQ5UCpuC 3TRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679445751; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mXvUW84+40cV6Vr1rJtqA8qxStfSLX2sIQlOzJPBrdY=; b=ca2nkQmGUw4rz3jUuUU5HffvHwEtBRCWuplZyWAWpu6St3QISt3Fhgq/auUYg/jOdW j8NYVbA4+BhqB2WbnnvC/jbekpHcnii6En00eF7j1pm7WEzhx8GSaEOgfqRxUdIoz7gL IkPWHDaiGbhueCxjYlzqfT+eMz6LU2ki1KAidAi9jkR3eug/mlSMQ8mEJzj7ybAAcCWj 1us4EJjlQDvoFaJ+d2CppHe/Xc5o+HZKmH12pHW/qY3GrgfKwBFmILmURi5ZaAXhHHLR w5OcKB979mmpxsfAP6kmjiLgj4iBPyvXa0j35/7c+3XMsOM1dx/QjikpYMfOBleJbc05 MVCg== X-Gm-Message-State: AO0yUKU9QDDv+oLF+vnP2CUk1HeH/Oz9uogyNiu8iMfMrn6qLRiEnZqA 77FF0hxb+TuxjDc+ScMlow/nuoqyxc4= X-Google-Smtp-Source: AK7set+X/H9QcdIaAg8hSnBoCfyvjNyrzcGQQ4p5mAV6VPW9OD8v+7ohQ0sQixXJTgU1SFNuUZKs5A== X-Received: by 2002:a1c:4c1a:0:b0:3ed:95a5:3257 with SMTP id z26-20020a1c4c1a000000b003ed95a53257mr3911186wmf.2.1679445751722; Tue, 21 Mar 2023 17:42:31 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id m20-20020a05600c3b1400b003dc434b39c7sm298103wms.0.2023.03.21.17.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 17:42:31 -0700 (PDT) From: luca.boccassi@gmail.com To: Wenjing Qiao Cc: Dukai Yuan , dpdk stable Subject: patch 'net/i40e: fix MAC loopback on X722' has been queued to stable release 20.11.8 Date: Wed, 22 Mar 2023 00:41:49 +0000 Message-Id: <20230322004155.2333903-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322004155.2333903-1-luca.boccassi@gmail.com> References: <20230315224631.1025649-39-luca.boccassi@gmail.com> <20230322004155.2333903-1-luca.boccassi@gmail.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 Hi, FYI, your patch has been queued to stable release 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/23/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3c83b921e6ad7818ccb2caf894274ed474a30d16 Thanks. Luca Boccassi --- >From 3c83b921e6ad7818ccb2caf894274ed474a30d16 Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Mon, 13 Mar 2023 23:16:19 -0400 Subject: [PATCH] net/i40e: fix MAC loopback on X722 [ upstream commit 6355ff768b0b5871cc82a69194b376db39ee6e9c ] If enabling MAC loopback mode on X722 NIC, transmitted packets are not seen in the receive queue. The root cause is using wrong loopback mode bits. Correct it according to the X722 datasheet. Fixes: 3a838ab649df ("net/i40e: support MAC loopback") Fixes: 5712e6407089 ("net/i40e: revert enhancing loopback AQ command") Signed-off-by: Wenjing Qiao Tested-by: Dukai Yuan --- drivers/net/i40e/i40e_ethdev.c | 17 ++++++++++++++--- drivers/net/i40e/i40e_ethdev.h | 3 +++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 8eb90909b8..a0569dab25 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2520,10 +2520,21 @@ i40e_dev_start(struct rte_eth_dev *dev) } } + /* Disable mac loopback mode */ + if (dev->data->dev_conf.lpbk_mode == I40E_AQ_LB_MODE_NONE) { + ret = i40e_aq_set_lb_modes(hw, I40E_AQ_LB_MODE_NONE, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "fail to set loopback link"); + goto tx_err; + } + } + /* Enable mac loopback mode */ - if (dev->data->dev_conf.lpbk_mode == I40E_AQ_LB_MODE_NONE || - dev->data->dev_conf.lpbk_mode == I40E_AQ_LB_PHY_LOCAL) { - ret = i40e_aq_set_lb_modes(hw, dev->data->dev_conf.lpbk_mode, NULL); + if (dev->data->dev_conf.lpbk_mode == I40E_AQ_LB_MODE_EN) { + if (hw->mac.type == I40E_MAC_X722) + ret = i40e_aq_set_lb_modes(hw, I40E_AQ_LB_MAC_LOCAL_X722, NULL); + else + ret = i40e_aq_set_lb_modes(hw, I40E_AQ_LB_MAC, NULL); if (ret != I40E_SUCCESS) { PMD_DRV_LOG(ERR, "fail to set loopback link"); goto tx_err; diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index 81763b957c..68baa3c7b0 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -47,6 +47,9 @@ #define I40E_MAX_VF 128 /*flag of no loopback*/ #define I40E_AQ_LB_MODE_NONE 0x0 +#define I40E_AQ_LB_MODE_EN 0x01 +#define I40E_AQ_LB_MAC 0x01 +#define I40E_AQ_LB_MAC_LOCAL_X722 0x04 /* * vlan_id is a 12 bit number. * The VFTA array is actually a 4096 bit array, 128 of 32bit elements. -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-21 21:56:37.568500538 +0000 +++ 0013-net-i40e-fix-MAC-loopback-on-X722.patch 2023-03-21 21:56:37.080807217 +0000 @@ -1 +1 @@ -From 6355ff768b0b5871cc82a69194b376db39ee6e9c Mon Sep 17 00:00:00 2001 +From 3c83b921e6ad7818ccb2caf894274ed474a30d16 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6355ff768b0b5871cc82a69194b376db39ee6e9c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 371f42233e..cb0070f94b 100644 +index 8eb90909b8..a0569dab25 100644 @@ -25 +26 @@ -@@ -2411,10 +2411,21 @@ i40e_dev_start(struct rte_eth_dev *dev) +@@ -2520,10 +2520,21 @@ i40e_dev_start(struct rte_eth_dev *dev) @@ -51 +52 @@ -index 7c4cc44a27..9b806d130e 100644 +index 81763b957c..68baa3c7b0 100644 @@ -54 +55 @@ -@@ -48,6 +48,9 @@ +@@ -47,6 +47,9 @@