Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/103231

_apply patch failure_

Submitter: Simei Su <simei.su@intel.com>
Date: Friday, October 29 2021 10:15:57 
Applied on: CommitID:efb57dd5bbf0ffac645d09ed4d0dbad088b602f1
Apply patch set 103231 failed:

Checking patch drivers/net/ice/ice_ethdev.c...
Checking patch drivers/net/ice/ice_ethdev.h...
Checking patch drivers/net/ice/ice_rxtx.c...
Hunk #1 succeeded at 1577 (offset -4 lines).
error: while searching for:
			ice_rxd_to_vlan_tci(mb, &rxdp[j]);
			rxd_to_pkt_fields_ops[rxq->rxdid](rxq, mb, &rxdp[j]);
#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
			if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
				ts_ns = ice_tstamp_convert_32b_64b(hw,
					rte_le_to_cpu_32(rxdp[j].wb.flex_ts.ts_high));
				if (ice_timestamp_dynflag > 0) {
					*RTE_MBUF_DYNFIELD(mb,
						ice_timestamp_dynfield_offset,
						rte_mbuf_timestamp_t *) = ts_ns;
					mb->ol_flags |= ice_timestamp_dynflag;
				}
			}

			if (ad->ptp_ena && ((mb->packet_type &

error: patch failed: drivers/net/ice/ice_rxtx.c:1614
Hunk #3 succeeded at 1821 (offset -4 lines).
error: while searching for:
		rxd_to_pkt_fields_ops[rxq->rxdid](rxq, first_seg, &rxd);
		pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0);
#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
		if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
			ts_ns = ice_tstamp_convert_32b_64b(hw,
				rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high));
			if (ice_timestamp_dynflag > 0) {
				*RTE_MBUF_DYNFIELD(first_seg,
					ice_timestamp_dynfield_offset,
					rte_mbuf_timestamp_t *) = ts_ns;
				first_seg->ol_flags |= ice_timestamp_dynflag;
			}
		}

		if (ad->ptp_ena && ((first_seg->packet_type & RTE_PTYPE_L2_MASK)

error: patch failed: drivers/net/ice/ice_rxtx.c:1932
Hunk #5 succeeded at 2315 (offset -4 lines).
error: while searching for:
		rxd_to_pkt_fields_ops[rxq->rxdid](rxq, rxm, &rxd);
		pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0);
#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
		if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
			ts_ns = ice_tstamp_convert_32b_64b(hw,
				rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high));
			if (ice_timestamp_dynflag > 0) {
				*RTE_MBUF_DYNFIELD(rxm,
					ice_timestamp_dynfield_offset,
					rte_mbuf_timestamp_t *) = ts_ns;
				rxm->ol_flags |= ice_timestamp_dynflag;
			}
		}

		if (ad->ptp_ena && ((rxm->packet_type & RTE_PTYPE_L2_MASK) ==

error: patch failed: drivers/net/ice/ice_rxtx.c:2363
Checking patch drivers/net/ice/ice_rxtx.h...
Applied patch drivers/net/ice/ice_ethdev.c cleanly.
Applied patch drivers/net/ice/ice_ethdev.h cleanly.
Applying patch drivers/net/ice/ice_rxtx.c with 3 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Rejected hunk #6.
Applied patch drivers/net/ice/ice_rxtx.h cleanly.
diff a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c	(rejected hunks)
@@ -1614,15 +1617,15 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)
 			ice_rxd_to_vlan_tci(mb, &rxdp[j]);
 			rxd_to_pkt_fields_ops[rxq->rxdid](rxq, mb, &rxdp[j]);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
-			if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
-				ts_ns = ice_tstamp_convert_32b_64b(hw,
+			if (ice_timestamp_dynflag > 0) {
+				ts_ns = ice_tstamp_convert_32b_64b(hw, ad,
+					rxq->hw_register_set,
 					rte_le_to_cpu_32(rxdp[j].wb.flex_ts.ts_high));
-				if (ice_timestamp_dynflag > 0) {
-					*RTE_MBUF_DYNFIELD(mb,
-						ice_timestamp_dynfield_offset,
-						rte_mbuf_timestamp_t *) = ts_ns;
-					mb->ol_flags |= ice_timestamp_dynflag;
-				}
+				rxq->hw_register_set = 0;
+				*RTE_MBUF_DYNFIELD(mb,
+					ice_timestamp_dynfield_offset,
+					rte_mbuf_timestamp_t *) = ts_ns;
+				mb->ol_flags |= ice_timestamp_dynflag;
 			}
 
 			if (ad->ptp_ena && ((mb->packet_type &
@@ -1932,15 +1939,15 @@ ice_recv_scattered_pkts(void *rx_queue,
 		rxd_to_pkt_fields_ops[rxq->rxdid](rxq, first_seg, &rxd);
 		pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
-		if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
-			ts_ns = ice_tstamp_convert_32b_64b(hw,
+		if (ice_timestamp_dynflag > 0) {
+			ts_ns = ice_tstamp_convert_32b_64b(hw, ad,
+				rxq->hw_register_set,
 				rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high));
-			if (ice_timestamp_dynflag > 0) {
-				*RTE_MBUF_DYNFIELD(first_seg,
-					ice_timestamp_dynfield_offset,
-					rte_mbuf_timestamp_t *) = ts_ns;
-				first_seg->ol_flags |= ice_timestamp_dynflag;
-			}
+			rxq->hw_register_set = 0;
+			*RTE_MBUF_DYNFIELD(first_seg,
+				ice_timestamp_dynfield_offset,
+				rte_mbuf_timestamp_t *) = ts_ns;
+			first_seg->ol_flags |= ice_timestamp_dynflag;
 		}
 
 		if (ad->ptp_ena && ((first_seg->packet_type & RTE_PTYPE_L2_MASK)
@@ -2363,15 +2374,15 @@ ice_recv_pkts(void *rx_queue,
 		rxd_to_pkt_fields_ops[rxq->rxdid](rxq, rxm, &rxd);
 		pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
-		if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
-			ts_ns = ice_tstamp_convert_32b_64b(hw,
+		if (ice_timestamp_dynflag > 0) {
+			ts_ns = ice_tstamp_convert_32b_64b(hw, ad,
+				rxq->hw_register_set,
 				rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high));
-			if (ice_timestamp_dynflag > 0) {
-				*RTE_MBUF_DYNFIELD(rxm,
-					ice_timestamp_dynfield_offset,
-					rte_mbuf_timestamp_t *) = ts_ns;
-				rxm->ol_flags |= ice_timestamp_dynflag;
-			}
+			rxq->hw_register_set = 0;
+			*RTE_MBUF_DYNFIELD(rxm,
+				ice_timestamp_dynfield_offset,
+				rte_mbuf_timestamp_t *) = ts_ns;
+			rxm->ol_flags |= ice_timestamp_dynflag;
 		}
 
 		if (ad->ptp_ena && ((rxm->packet_type & RTE_PTYPE_L2_MASK) ==

https://lab.dpdk.org/results/dashboard/patchsets/19842/

UNH-IOL DPDK Community Lab