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 D469BA00C2 for ; Tue, 8 Mar 2022 15:15:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D0B6D410DD; Tue, 8 Mar 2022 15:15:48 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id CBF714068F for ; Tue, 8 Mar 2022 15:15:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748947; 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=ZM2Cx0+3Aq2mdOHQJxZfn/tRZklCgw0KzgiCHsUvHms=; b=hIXCzL9pDBln3AQ4hPtkh+5Hdm2SrVQzyk8/xI8RECuu7SkQAk+yiJjt7eE1r+H7NNcuoR rA67mO/WQ6YpTVBQg665U0mYxL9zSa+xtFQZftz9pq4pR9bjafPr3DNKvRKEY4odspCf6J V/CK0npKrrVQaJ2BD+0Q1C6Wqwx8BJo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-mgX7mW5dP4WjJ64RTc5TqQ-1; Tue, 08 Mar 2022 09:15:45 -0500 X-MC-Unique: mgX7mW5dP4WjJ64RTc5TqQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D0F01091DA2; Tue, 8 Mar 2022 14:15:43 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5334184034; Tue, 8 Mar 2022 14:15:42 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: increase time waiting for PF reset completion' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:28 +0000 Message-Id: <20220308141500.286915-13-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 21.11.1 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/14/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/8502a8f135fbfac228b12ced50d2acb38b1eb33d Thanks. Kevin --- >From 8502a8f135fbfac228b12ced50d2acb38b1eb33d Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 2 Mar 2022 08:35:01 +0800 Subject: [PATCH] net/hns3: increase time waiting for PF reset completion [ upstream commit d6a9f8fb26b8d6adaac20d6a303faa5c5ba4d5bc ] On the case that PF and VF need to be reset, after the hardware reset is complete, VF needs wait for 1 second to restore the configuration so that VF does not fail to recover because PF reset isn't complete. But the estimated time is not sufficient. This patch fixes it to 5 seconds. Fixes: 2790c6464725 ("net/hns3: support device reset") Signed-off-by: Huisong Li Acked-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev_vf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 62675ed7d7..3be46c8f0a 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1926,4 +1926,5 @@ static int hns3vf_wait_hardware_ready(struct hns3_adapter *hns) { +#define HNS3_WAIT_PF_RESET_READY_TIME 5 struct hns3_hw *hw = &hns->hw; struct hns3_wait_data *wait_data = hw->reset.wait_data; @@ -1946,10 +1947,12 @@ hns3vf_wait_hardware_ready(struct hns3_adapter *hns) wait_data->check_completion = NULL; - wait_data->interval = 1 * MSEC_PER_SEC * USEC_PER_MSEC; + wait_data->interval = HNS3_WAIT_PF_RESET_READY_TIME * + MSEC_PER_SEC * USEC_PER_MSEC; wait_data->count = 1; wait_data->result = HNS3_WAIT_REQUEST; rte_eal_alarm_set(wait_data->interval, hns3_wait_callback, wait_data); - hns3_warn(hw, "hardware is ready, delay 1 sec for PF reset complete"); + hns3_warn(hw, "hardware is ready, delay %d sec for PF reset complete", + HNS3_WAIT_PF_RESET_READY_TIME); return -EAGAIN; } else if (wait_data->result == HNS3_WAIT_TIMEOUT) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:28.769884650 +0000 +++ 0013-net-hns3-increase-time-waiting-for-PF-reset-completi.patch 2022-03-08 13:55:28.400314898 +0000 @@ -1 +1 @@ -From d6a9f8fb26b8d6adaac20d6a303faa5c5ba4d5bc Mon Sep 17 00:00:00 2001 +From 8502a8f135fbfac228b12ced50d2acb38b1eb33d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d6a9f8fb26b8d6adaac20d6a303faa5c5ba4d5bc ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 06ddf64184..9091706fe5 100644 +index 62675ed7d7..3be46c8f0a 100644 @@ -24 +25 @@ -@@ -1878,4 +1878,5 @@ static int +@@ -1926,4 +1926,5 @@ static int @@ -30 +31 @@ -@@ -1898,10 +1899,12 @@ hns3vf_wait_hardware_ready(struct hns3_adapter *hns) +@@ -1946,10 +1947,12 @@ hns3vf_wait_hardware_ready(struct hns3_adapter *hns)