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 4F31542ECF for ; Thu, 20 Jul 2023 17:22:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B9BE40685; Thu, 20 Jul 2023 17:22:40 +0200 (CEST) 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 A91B140685 for ; Thu, 20 Jul 2023 17:22:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866558; 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=4YiqJIGtAT87sFpvPNWyn+XLDyAg4YeO7Ga8jAIYN1o=; b=YIyv44zUmHHondyYODGUAasG/ny0vFCt9ygQG4g8765RsG4k0doGUJlohuxD0KIqZq1mrV 9Yzr5dvxFugT9Ed3vDJvgKWMhfvrQqtQYVMoQ+x36fDha6SuoerZj9xbnUMpxObKZAykIU 10GUt+KJbxF+zCIcKezDGPW7x18aL9Q= Received: from mimecast-mx02.redhat.com (66.187.233.88 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-453-agIoy2R_Nqu0luRye2spzw-1; Thu, 20 Jul 2023 11:21:20 -0400 X-MC-Unique: agIoy2R_Nqu0luRye2spzw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3542C89E746; Thu, 20 Jul 2023 15:20:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19AEE492C13; Thu, 20 Jul 2023 15:20:53 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix RTC time after reset' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:50 +0100 Message-ID: <20230720151942.262154-39-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d2ec3c302c63f80638445748a0b37d6b79e626b6 Thanks. Kevin --- >From d2ec3c302c63f80638445748a0b37d6b79e626b6 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 2 Jun 2023 19:41:56 +0800 Subject: [PATCH] net/hns3: fix RTC time after reset [ upstream commit 14d9281d9c65afd743354737b8c70555161d4a69 ] The enabled status of RTC time will be cleared after global or IMP reset, which cause the local RTC time doesn't work. So this patch fix it. Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index c70cf12b01..936426c117 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4427,4 +4427,10 @@ hns3_init_hardware(struct hns3_adapter *hns) } + ret = hns3_ptp_init(hw); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to init PTP, ret = %d", ret); + goto err_mac_init; + } + return 0; @@ -4606,8 +4612,4 @@ hns3_init_pf(struct rte_eth_dev *eth_dev) } - ret = hns3_ptp_init(hw); - if (ret) - goto err_get_config; - /* Enable interrupt */ rte_intr_enable(pci_dev->intr_handle); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:59.857189268 +0100 +++ 0039-net-hns3-fix-RTC-time-after-reset.patch 2023-07-20 16:17:54.627750369 +0100 @@ -1 +1 @@ -From 14d9281d9c65afd743354737b8c70555161d4a69 Mon Sep 17 00:00:00 2001 +From d2ec3c302c63f80638445748a0b37d6b79e626b6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 14d9281d9c65afd743354737b8c70555161d4a69 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 600accea93..9ed54ae384 100644 +index c70cf12b01..936426c117 100644 @@ -23 +24 @@ -@@ -4417,4 +4417,10 @@ hns3_init_hardware(struct hns3_adapter *hns) +@@ -4427,4 +4427,10 @@ hns3_init_hardware(struct hns3_adapter *hns) @@ -34 +35 @@ -@@ -4578,8 +4584,4 @@ hns3_init_pf(struct rte_eth_dev *eth_dev) +@@ -4606,8 +4612,4 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)