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 184A5A04B1 for ; Thu, 5 Nov 2020 13:41:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1086AC806; Thu, 5 Nov 2020 13:41:22 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 58DBCC806 for ; Thu, 5 Nov 2020 13:41:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580078; 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=+HEAyKNWLNd4N5oKILsE6jteLAmp0vlFULLGDmYARwI=; b=R/7Dh9PCczSHstqx3OjfZdaU3/VkTxyu672HE59CSJlrH1n6EUS5EOFsygw9CercK9VYYz AUMWXMPJiafZeMHwIrkJHwUg/AAAYVDmfW8nVlZ70e+RsSCBsO7T18GsullbLUzwE/E/x7 J/9KGdQ+6NtbvHUUA2IRp4MZ/R2hG2A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-209-Awpt4fpHPGOrCVbjs1EFdw-1; Thu, 05 Nov 2020 07:41:15 -0500 X-MC-Unique: Awpt4fpHPGOrCVbjs1EFdw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 775BD805EF7; Thu, 5 Nov 2020 12:41:14 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C47F57; Thu, 5 Nov 2020 12:41:13 +0000 (UTC) From: Kevin Traynor To: Steve Yang Cc: Jeff Guo , dpdk stable Date: Thu, 5 Nov 2020 12:39:32 +0000 Message-Id: <20201105124015.306404-25-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' has been queued to LTS release 18.11.11 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 LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/74e62043df46239c96d67a7624ae6c58915374dd Thanks. Kevin. --- >From 74e62043df46239c96d67a7624ae6c58915374dd 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 0ef3e01165..ac6f5f7def 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5233,8 +5233,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) 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; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.727536381 +0000 +++ 0025-net-ixgbe-fix-VF-reset-HW-error-handling.patch 2020-11-05 12:38:54.202895990 +0000 @@ -1 +1 @@ -From 7c6e6aef870848cf887b2115d7c13bfcde6f4627 Mon Sep 17 00:00:00 2001 +From 74e62043df46239c96d67a7624ae6c58915374dd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7c6e6aef870848cf887b2115d7c13bfcde6f4627 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index c74467e068..8da963a916 100644 +index 0ef3e01165..ac6f5f7def 100644 @@ -23 +24 @@ -@@ -5321,8 +5321,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) +@@ -5233,8 +5233,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)