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 0C035A055A for ; Thu, 27 Feb 2020 10:34:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EF8911F1C; Thu, 27 Feb 2020 10:34:25 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 44F821BFD1 for ; Thu, 27 Feb 2020 10:34:24 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id t23so2683967wmi.1 for ; Thu, 27 Feb 2020 01:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xALJxD1DlWnvvVaQbDzH00x5nvpU5DgbKf/fQv81QVM=; b=VuXaiHmYpOUaxpoEJquszhtLj0PeNyc5zekOMNgGyQvSqQlUXlYA5cyWKjTEw2CRER dO8BrMnLrhnXDg1j3lAn9LjHqRX1ajHFhAGyvZXN4J/uFDY1ngox324r4rm0iT4KVzyD kGYGA8ilR9neya44K89mnyWcjScHTra8DoOQZvH0u+1wh/YyOj8dwzT6xrEVoI+ebOrG JetVKpvCqCBNtjsiGPy4IIqE4ZOCEcPSa+MdlAimFOKxYsY9YDXSDOWpXjdbDTt1I8nA vAxMiUWJekpZv7u5750sptD7dth/k5dOFNvTtFB/an3gWFyYBLbyrPle1p7NPvxJ9isB geHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xALJxD1DlWnvvVaQbDzH00x5nvpU5DgbKf/fQv81QVM=; b=TzoxTTJFXX9oTd6M9Akh4/fP54lgWtI7Vat+MXaHNqCK3zWykDquAv9oaKNSoAkQd1 lLoK9O3vijhufFugvwFGo2cm9UBnYu8GTMsBEX3XCN7+hHd+Obmg0f+maFFCaAivlilm z2VXsfIKGfIYdy1AxZTDojUneREdTUggOZHlVEaOs+ZK4uEAkX2dv+uWLZqetGRHVgp+ iBt/g+mPjHezXuZxRpL17GZBiTBV8kO2Wnd17/eJYv6q8dI+I4kOfw6SolPl7Je/O4zw WfKQOExMT/EbiGWeVhlM0ke9YNOddWEHnnipYSLEOWN2Uxdt5QXONCtCaVu7+Zr4trcP SzLg== X-Gm-Message-State: APjAAAWbzMdz3i/Cpp/1MLAcOd9AdQjN8bUOvo0h/vQOGOMfp3DNfl16 A3sASo8YT97O0GowOOTMmtY= X-Google-Smtp-Source: APXvYqzSqabE0bsZCi2c2jFZRmuhmazVrQ3TyyVZvaSECtXgEK7CjeNnw3IoI8oN6jD2+3xW73/d4A== X-Received: by 2002:a1c:ddc3:: with SMTP id u186mr4140152wmg.103.1582796064025; Thu, 27 Feb 2020 01:34:24 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l6sm7537737wrn.26.2020.02.27.01.34.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:34:23 -0800 (PST) From: luca.boccassi@gmail.com To: Harman Kalra Cc: Jerin Jacob , dpdk stable Date: Thu, 27 Feb 2020 09:33:27 +0000 Message-Id: <20200227093402.17690-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com> References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx2: fix PTP' has been queued to stable release 19.11.1 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 stable release 19.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 02/29/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. Thanks. Luca Boccassi --- >From efd0744fc65671224158f87afd1a36b16dcfc25b Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Sat, 15 Feb 2020 14:05:03 +0530 Subject: [PATCH] net/octeontx2: fix PTP [ upstream commit 93a9afdb4b10f02aa06b8e58ffa403e10bc32bba ] PTP functionality has been broken after a change in kernel where enum npc_kpu_lc_ltype is change to allow adjustment of LTYPE_MASK to detect all types of IP headers. Syncing the required changes in DPDK to fix the issue. The kernel side changes available in marvell SDK version SDK-10.3.2.x. Fixes: b5dc3140448e ("net/octeontx2: support base PTP") Signed-off-by: Harman Kalra Acked-by: Jerin Jacob --- drivers/common/octeontx2/hw/otx2_npc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/octeontx2/hw/otx2_npc.h b/drivers/common/octeontx2/hw/otx2_npc.h index a0536e0aed..3dfc137a30 100644 --- a/drivers/common/octeontx2/hw/otx2_npc.h +++ b/drivers/common/octeontx2/hw/otx2_npc.h @@ -201,7 +201,8 @@ enum npc_kpu_lb_ltype { }; enum npc_kpu_lc_ltype { - NPC_LT_LC_IP = 1, + NPC_LT_LC_PTP = 1, + NPC_LT_LC_IP, NPC_LT_LC_IP_OPT, NPC_LT_LC_IP6, NPC_LT_LC_IP6_EXT, @@ -209,7 +210,6 @@ enum npc_kpu_lc_ltype { NPC_LT_LC_RARP, NPC_LT_LC_MPLS, NPC_LT_LC_NSH, - NPC_LT_LC_PTP, NPC_LT_LC_FCOE, }; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:56.081246361 +0000 +++ 0007-net-octeontx2-fix-PTP.patch 2020-02-27 09:31:55.663945346 +0000 @@ -1,8 +1,10 @@ -From 93a9afdb4b10f02aa06b8e58ffa403e10bc32bba Mon Sep 17 00:00:00 2001 +From efd0744fc65671224158f87afd1a36b16dcfc25b Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Sat, 15 Feb 2020 14:05:03 +0530 Subject: [PATCH] net/octeontx2: fix PTP +[ upstream commit 93a9afdb4b10f02aa06b8e58ffa403e10bc32bba ] + PTP functionality has been broken after a change in kernel where enum npc_kpu_lc_ltype is change to allow adjustment of LTYPE_MASK to detect all types of IP headers. @@ -11,7 +13,6 @@ The kernel side changes available in marvell SDK version SDK-10.3.2.x. Fixes: b5dc3140448e ("net/octeontx2: support base PTP") -Cc: stable@dpdk.org Signed-off-by: Harman Kalra Acked-by: Jerin Jacob