patch 'net/dpaa2: fix checksum good flags' has been queued to stable release 20.11.9

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.9

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/076bdbf8164f628e3ecf6315e8c0c46abe3347f7

Thanks.

Luca Boccassi

---
From 076bdbf8164f628e3ecf6315e8c0c46abe3347f7 Mon Sep 17 00:00:00 2001
From: Tianli Lai <laitianli@tom.com>
Date: Mon, 8 May 2023 18:57:25 +0800
Subject: [PATCH] net/dpaa2: fix checksum good flags

[ upstream commit 7d83632b28db9f0b9bd36d974798aa14627f822b ]

Set check sum good flags when dpaa2 hardware set check result.

Fixes: d2ef05d5c13e ("net/dpaa2: optimize Rx/Tx path")
Fixes: 94d31549c380 ("net/dpaa2: support Rx checksum offload in slow parsing")

Signed-off-by: Tianli Lai <laitianli@tom.com>
Acked-by: Sachin Saxena <sachin.saxena@nxp.com>
---
 drivers/net/dpaa2/dpaa2_rxtx.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 23e193f86c..1ad42747c4 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -187,8 +187,12 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
 
 	if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L3CE))
 		mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
-	else if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE))
+	else
+		mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+	if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE))
 		mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+	else
+		mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
 
 	if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_FIRST_FRAGMENT |
 	    L3_IP_1_MORE_FRAGMENT |
@@ -230,8 +234,12 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
 
 	if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L3CE))
 		mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
-	else if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE))
+	else
+		mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+	if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE))
 		mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+	else
+		mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
 
 	if (dpaa2_enable_ts[mbuf->port]) {
 		*dpaa2_timestamp_dynfield(mbuf) = annotation->word2;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-06-15 01:56:35.935701704 +0100
+++ 0022-net-dpaa2-fix-checksum-good-flags.patch	2023-06-15 01:56:34.555541041 +0100
@@ -1 +1 @@
-From 7d83632b28db9f0b9bd36d974798aa14627f822b Mon Sep 17 00:00:00 2001
+From 076bdbf8164f628e3ecf6315e8c0c46abe3347f7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7d83632b28db9f0b9bd36d974798aa14627f822b ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index f60e78e1fd..85910bbd8f 100644
+index 23e193f86c..1ad42747c4 100644
@@ -22 +23 @@
-@@ -198,8 +198,12 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
+@@ -187,8 +187,12 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
@@ -25 +26 @@
- 		mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
+ 		mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
@@ -28 +29 @@
-+		mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
++		mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
@@ -30 +31 @@
- 		mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
+ 		mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
@@ -32 +33 @@
-+		mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
++		mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
@@ -36 +37 @@
-@@ -241,8 +245,12 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
+@@ -230,8 +234,12 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
@@ -39 +40 @@
- 		mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
+ 		mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
@@ -42 +43 @@
-+		mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
++		mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
@@ -44 +45 @@
- 		mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
+ 		mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
@@ -46 +47 @@
-+		mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
++		mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;