[dpdk-stable] patch 'net/bnxt: fix check for PTP support in FW' has been queued to stable release 19.11.10

[christian.ehrhardt@canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/12/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/831b94f05dbe2fafb96e999ba8119ab76150b5a7

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 831b94f05dbe2fafb96e999ba8119ab76150b5a7 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Date: Mon, 31 May 2021 12:56:42 +0530
Subject: [PATCH] net/bnxt: fix check for PTP support in FW

[ upstream commit a642112c91246b035dfa6d6f5bc52b0603c44952 ]

On Thor, driver must use HWRM to access the timestamp information.
Driver should not advertise PTP support to application
if PTP information is not available via HWRM commands.

Fixes: 6cbd89f9f3d8 ("net/bnxt: support PTP for Thor")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index d1f6d2317e..0701347003 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -551,9 +551,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
 
 	HWRM_CHECK_RESULT();
 
-	if (!BNXT_CHIP_THOR(bp) &&
-	    !(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_DIRECT_ACCESS))
-		return 0;
+	if (BNXT_CHIP_THOR(bp)) {
+		if (!(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_HWRM_ACCESS))
+			return 0;
+	} else {
+		if (!(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_DIRECT_ACCESS))
+			return 0;
+	}
 
 	if (resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_ONE_STEP_TX_TS)
 		bp->flags |= BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS;
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:13.430176297 +0200
+++ 0009-net-bnxt-fix-check-for-PTP-support-in-FW.patch	2021-08-10 15:11:12.906637292 +0200
@@ -1 +1 @@
-From a642112c91246b035dfa6d6f5bc52b0603c44952 Mon Sep 17 00:00:00 2001
+From 831b94f05dbe2fafb96e999ba8119ab76150b5a7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a642112c91246b035dfa6d6f5bc52b0603c44952 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index c6c0af28cb..a65ac6c0ec 100644
+index d1f6d2317e..0701347003 100644
@@ -24 +25 @@
-@@ -750,9 +750,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
+@@ -551,9 +551,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
@@ -28 +29 @@
--	if (!BNXT_CHIP_P5(bp) &&
+-	if (!BNXT_CHIP_THOR(bp) &&
@@ -31 +32 @@
-+	if (BNXT_CHIP_P5(bp)) {
++	if (BNXT_CHIP_THOR(bp)) {