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 B1F9142ECF for ; Thu, 20 Jul 2023 17:28:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD13540685; Thu, 20 Jul 2023 17:28:34 +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 16CDC400D6 for ; Thu, 20 Jul 2023 17:28:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866894; 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=sM5Ouruld75wrl1qi8ipfn7NQk0GOyIWHuVTETZ2sjM=; b=dWDFqm71IHrc2JQWwRX6BbcfP06GBHvDen9eZN8dEtsxrICGvE+nT7j4HjDxHnIVil7BZT ogjlCGyfFsW96N5u3WY2ctRrMCIkZW1lV7l+Lv+8FxOnNtAx5ZEvRcvWuWfHVldduptYc/ B12X+A33Y5xRBos6f6goGV59Ze3iQM0= 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-96-TB1otdkbOwWhbbrTSD-fDA-1; Thu, 20 Jul 2023 11:21:13 -0400 X-MC-Unique: TB1otdkbOwWhbbrTSD-fDA-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 6F8B71044591; Thu, 20 Jul 2023 15:20:56 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 959234A9004; Thu, 20 Jul 2023 15:20:55 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: uninitialize PTP' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:51 +0100 Message-ID: <20230720151942.262154-40-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/80d032eed55ef8f2907ecd524a2514ddf3bc98cd Thanks. Kevin --- >From 80d032eed55ef8f2907ecd524a2514ddf3bc98cd Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 2 Jun 2023 19:41:57 +0800 Subject: [PATCH] net/hns3: uninitialize PTP [ upstream commit bfd20b33e752a2597e85283e9fbb134170cce3a0 ] This patch adds the uninitialization process of PTP in case of having an impact on PF driver in kernel. Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 2 ++ drivers/net/hns3/hns3_ethdev.h | 1 + drivers/net/hns3/hns3_ptp.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 936426c117..0ee6a4e948 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4668,4 +4668,5 @@ err_enable_intr: err_fdir: hns3_uninit_umv_space(hw); + hns3_ptp_uninit(hw); err_init_hw: hns3_stats_uninit(hw); @@ -4703,4 +4704,5 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev) hns3_fdir_filter_uninit(hns); hns3_uninit_umv_space(hw); + hns3_ptp_uninit(hw); hns3_stats_uninit(hw); hns3_config_mac_tnl_int(hw, false); diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 0881d26516..6c07075867 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -1045,4 +1045,5 @@ int hns3_mbuf_dyn_rx_timestamp_register(struct rte_eth_dev *dev, struct rte_eth_conf *conf); int hns3_ptp_init(struct hns3_hw *hw); +void hns3_ptp_uninit(struct hns3_hw *hw); int hns3_timesync_enable(struct rte_eth_dev *dev); int hns3_timesync_disable(struct rte_eth_dev *dev); diff --git a/drivers/net/hns3/hns3_ptp.c b/drivers/net/hns3/hns3_ptp.c index 1e27e4aeca..0e17a17034 100644 --- a/drivers/net/hns3/hns3_ptp.c +++ b/drivers/net/hns3/hns3_ptp.c @@ -307,2 +307,20 @@ hns3_restore_ptp(struct hns3_adapter *hns) return ret; } + +void +hns3_ptp_uninit(struct hns3_hw *hw) +{ + struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); + int ret; + + if (!hns3_dev_get_support(hw, PTP)) + return; + + ret = hns3_ptp_int_en(hw, false); + if (ret != 0) + hns3_err(hw, "disable PTP interrupt failed, ret = %d.", ret); + + ret = hns3_timesync_configure(hns, false); + if (ret != 0) + hns3_err(hw, "disable timesync failed, ret = %d.", ret); +} -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:59.966253822 +0100 +++ 0040-net-hns3-uninitialize-PTP.patch 2023-07-20 16:17:54.641750426 +0100 @@ -1 +1 @@ -From bfd20b33e752a2597e85283e9fbb134170cce3a0 Mon Sep 17 00:00:00 2001 +From 80d032eed55ef8f2907ecd524a2514ddf3bc98cd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bfd20b33e752a2597e85283e9fbb134170cce3a0 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 9ed54ae384..70463fe177 100644 +index 936426c117..0ee6a4e948 100644 @@ -24 +25 @@ -@@ -4638,4 +4638,5 @@ err_enable_intr: +@@ -4668,4 +4668,5 @@ err_enable_intr: @@ -30 +31 @@ -@@ -4673,4 +4674,5 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev) +@@ -4703,4 +4704,5 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev) @@ -37 +38 @@ -index c04edf622f..9456204422 100644 +index 0881d26516..6c07075867 100644 @@ -40 +41 @@ -@@ -1046,4 +1046,5 @@ int hns3_mbuf_dyn_rx_timestamp_register(struct rte_eth_dev *dev, +@@ -1045,4 +1045,5 @@ int hns3_mbuf_dyn_rx_timestamp_register(struct rte_eth_dev *dev,