From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1C7EFA04DD for ; Wed, 28 Oct 2020 11:50:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 146F32C2A; Wed, 28 Oct 2020 11:50:00 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by dpdk.org (Postfix) with ESMTP id 6EE3B2C2A for ; Wed, 28 Oct 2020 11:49:57 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id 13so4096947wmf.0 for ; Wed, 28 Oct 2020 03:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rx6i9k4u4Ho17mgGVlK3Yrkp17MAAIbOZV0dMksNbN8=; b=GoRArCdLz4ZxQw/gq2tW0MkXAXbfJpKWuoexLmGC0vpx9a7eqG49cNXkKMvTPo3Zmx N4Jbkrzzij8NMtgWk89gkZxdhBdle/Yx5z+S35Z3UiboRSMJDZ+7FYcShoiH38BS6BZZ vO9XvhfQTVvboWL6GAcAm3PrsEuaYxmvLwbczNtCtLFtyUIQYFm7rmoXh5b6TdMJOjqb eh4+Blm2ZgEwII5NHkfXD3ZJe9qARdD1vqY6Qkpvsowqa/4P9xkXh5Uy4y+7WV3Oqm2T 1vJXzugnatz+WlLCr9BxQdvp5YbWfKTR8YRCC2FTpUTkODWRYVq0MbDxBNdLRyU3HDAd 3gfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rx6i9k4u4Ho17mgGVlK3Yrkp17MAAIbOZV0dMksNbN8=; b=cTFolD8Zm2yQw5ld3oK38ryaoh5NxnQGnBoXj1UECz0QbXJFEjYVNsUEusIEAUGiYq 7L1Zo8S8hT8nKCshAkxQLJFoxnBo20smRyeWAL/BylpeebEJozEhW4yfoGyAMQSKo4Mz C//rrPgbIU/fz7c1/vAZJ3yyGMQMRgxwbkiH1EjfgnnPE+yAkSbEXoD3YlbvWnf7ay5A Ti25xCkf3O9jd2j65x/6erl8pl9n6wI6b5zZNQgkCuTQdEAEjBlGMGH/w0KZaCHHJFbb MHyTVB/KSw0G+avOC8G3P6+B/YxLzNU7uIG/pKQQSI/6bhguWt7K1xUY6I3eggFefQsR CDGQ== X-Gm-Message-State: AOAM531ORkpt/sIppe4QbrJcyXpk6+idmVTP6P3ZzKh2ASqGMWrK5fWh p/ZvqLh1QjARw6b3ndUQF6U= X-Google-Smtp-Source: ABdhPJyRZRiczyv6JTDdHmUCwSKNJ+qti3RmMg9ILWOOiDuoI3afdyaRyzsROlsPigSkxtyn5S0lCA== X-Received: by 2002:a1c:9647:: with SMTP id y68mr7454551wmd.101.1603882197232; Wed, 28 Oct 2020 03:49:57 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l5sm6164575wrq.14.2020.10.28.03.49.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:49:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Steve Yang Cc: Jeff Guo , dpdk stable Date: Wed, 28 Oct 2020 10:43:50 +0000 Message-Id: <20201028104606.3504127-71-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From accddf94303af82a223f9289e9ea3ee7751ff4c0 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Tue, 15 Sep 2020 06:46:22 +0000 Subject: [PATCH] net/ixgbe: fix VF reset HW error handling [ upstream commit 7c6e6aef870848cf887b2115d7c13bfcde6f4627 ] When start a VF with no initial MAC address assigned by the underlying Host PF driver, just reuse the MAC address assigned when VF is initializing. Fixes: f69166c9a3c9 ("net/ixgbe: fix reset error handling") Signed-off-by: Steve Yang Acked-by: Jeff Guo --- drivers/net/ixgbe/ixgbe_ethdev.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 875d4ee3db..768183e9cb 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5335,10 +5335,16 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) ixgbe_dev_wait_setup_link_complete(dev, 0); err = hw->mac.ops.reset_hw(hw); - if (err) { + + /** + * In this case, reuses the MAC address assigned by VF + * initialization. + */ + if (err != IXGBE_SUCCESS && err != IXGBE_ERR_INVALID_MAC_ADDR) { PMD_INIT_LOG(ERR, "Unable to reset vf hardware (%d)", err); return err; } + hw->mac.get_link_status = true; /* negotiate mailbox API version to use with the PF. */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.977207843 +0000 +++ 0071-net-ixgbe-fix-VF-reset-HW-error-handling.patch 2020-10-28 10:35:11.564830907 +0000 @@ -1,14 +1,15 @@ -From 7c6e6aef870848cf887b2115d7c13bfcde6f4627 Mon Sep 17 00:00:00 2001 +From accddf94303af82a223f9289e9ea3ee7751ff4c0 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Tue, 15 Sep 2020 06:46:22 +0000 Subject: [PATCH] net/ixgbe: fix VF reset HW error handling +[ upstream commit 7c6e6aef870848cf887b2115d7c13bfcde6f4627 ] + When start a VF with no initial MAC address assigned by the underlying Host PF driver, just reuse the MAC address assigned when VF is initializing. Fixes: f69166c9a3c9 ("net/ixgbe: fix reset error handling") -Cc: stable@dpdk.org Signed-off-by: Steve Yang Acked-by: Jeff Guo @@ -17,10 +18,10 @@ 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c -index c74467e068..8da963a916 100644 +index 875d4ee3db..768183e9cb 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c -@@ -5320,10 +5320,16 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) +@@ -5335,10 +5335,16 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) ixgbe_dev_wait_setup_link_complete(dev, 0); err = hw->mac.ops.reset_hw(hw);