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 C8624A0540 for ; Wed, 6 Jul 2022 22:36:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C36FD40691; Wed, 6 Jul 2022 22:36:23 +0200 (CEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 3E45840A89 for ; Wed, 6 Jul 2022 22:36:20 +0200 (CEST) Received: by mail-wm1-f41.google.com with SMTP id h14-20020a1ccc0e000000b0039eff745c53so9591680wmb.5 for ; Wed, 06 Jul 2022 13:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sw5lL4ZDyaEyvG0FdgxsG5mDs/P4orp7ktv8FGrSidg=; b=OottP8ScZD+m6dJBqvY8mBvS81+S0OgSay30eUNbCCm05Fq3w4OoRkwYIQzp6fkJNX SpbHqMtKDfxyBFC0CoKc9tzdMy5x8WZxyMlh7ENilRn4rIFOZ/iEb6xB1djTkMt8wT2v AKvEK3cRjH4JUeAsXmlHMdaYx1XPAEG0Qb5fr+h44PrrV0Mb/i6cAASXvKgzEPHIIXza S538IyHRBzRwaoOSFIrUyFzVWkeRfEA9yka9+kXq3UnavsQ8zK5V5q4GKQyZnQ+DnlEg atwupCgxLlaqPMBH28AgDYiYWqb01KRYRgRxRHo/KawFXsFpbgoHCs3+BgutJVibA9xd rQzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sw5lL4ZDyaEyvG0FdgxsG5mDs/P4orp7ktv8FGrSidg=; b=8PmI9RTBejg/UJ9Ea8fDlwlVq2HNi6pbprnNpW0yTalm+lFGU6u4PIgbN9SUpklg6r 3YG4eS+sfAcqsvAJf0ieMpGTlFu4y9uIKSCujuhCSgLHYfUEyafJzMVklE8Ofa1wlDR3 hGwZvP75S1FLWuzIiTfyFfQXvXbuFffLRnbOkLzyOoI1WyOxTXjaWS6raSm+UbwW5FWP 0LX193AM8n/CvsUf9XfmqplutQKwUB+LPechTOB/vOWJwGHfhdXpXMpfUnTD23Bg1ICM Q2s4jVKD1m0CL/QFDdmI3gIIVwPLstq9AzoVqJHNW3cCL1e972xye6V7spGG7JcRXDGi ZANg== X-Gm-Message-State: AJIora9gRxjWHBOT/rEeQpuSAtZXEFQ9LLtoDi0kbjupL+QlBoqRQDN+ Olg1zJnVny2Nk1rWamAt7Xi7+dAQF9IYdA== X-Google-Smtp-Source: AGRyM1tC/Ik931FhIgzZdUzCEM/P5Kr8L7dW93MyfsLa9Z5mHVs35boo96wa0dmFxdAhsxLqKOCTjQ== X-Received: by 2002:a05:600c:3d8f:b0:3a1:8c7f:1908 with SMTP id bi15-20020a05600c3d8f00b003a18c7f1908mr420509wmb.201.1657139779930; Wed, 06 Jul 2022 13:36:19 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id q5-20020adff945000000b0021b9585276dsm35996874wrr.101.2022.07.06.13.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:36:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Tomasz Duszynski Cc: Jerin Jacob , dpdk stable Subject: patch 'common/cnxk: allow changing PTP mode on CN10K' has been queued to stable release 21.11.2 Date: Wed, 6 Jul 2022 21:34:58 +0100 Message-Id: <20220706203506.3422496-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.2 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/08/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/03a6a9f751fb3bc4e9df20415ac80ad5b383e884 Thanks. Luca Boccassi --- >From 03a6a9f751fb3bc4e9df20415ac80ad5b383e884 Mon Sep 17 00:00:00 2001 From: Tomasz Duszynski Date: Fri, 1 Jul 2022 13:54:48 +0200 Subject: [PATCH] common/cnxk: allow changing PTP mode on CN10K [ upstream commit 2ddf4b110cbcd7238f32780a7453aef2ecade83b ] Since firmware has added support for toggling PTP mode on 10k platforms userspace code should allow doing that as well. Signed-off-by: Tomasz Duszynski Reviewed-by: Jerin Jacob --- drivers/common/cnxk/roc_bphy_cgx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/common/cnxk/roc_bphy_cgx.c b/drivers/common/cnxk/roc_bphy_cgx.c index c3be3c9041..0cd7dff655 100644 --- a/drivers/common/cnxk/roc_bphy_cgx.c +++ b/drivers/common/cnxk/roc_bphy_cgx.c @@ -268,9 +268,6 @@ roc_bphy_cgx_ptp_rx_ena_dis(struct roc_bphy_cgx *roc_cgx, unsigned int lmac, { uint64_t scr1, scr0; - if (roc_model_is_cn10k()) - return -ENOTSUP; - if (!roc_cgx) return -EINVAL; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:54.346404241 +0100 +++ 0023-common-cnxk-allow-changing-PTP-mode-on-CN10K.patch 2022-07-06 21:07:53.559519014 +0100 @@ -1 +1 @@ -From 2ddf4b110cbcd7238f32780a7453aef2ecade83b Mon Sep 17 00:00:00 2001 +From 03a6a9f751fb3bc4e9df20415ac80ad5b383e884 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2ddf4b110cbcd7238f32780a7453aef2ecade83b ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -18 +18 @@ -index a5df104088..e966494e21 100644 +index c3be3c9041..0cd7dff655 100644 @@ -21 +21 @@ -@@ -285,9 +285,6 @@ roc_bphy_cgx_ptp_rx_ena_dis(struct roc_bphy_cgx *roc_cgx, unsigned int lmac, +@@ -268,9 +268,6 @@ roc_bphy_cgx_ptp_rx_ena_dis(struct roc_bphy_cgx *roc_cgx, unsigned int lmac,