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

_apply patch failure_

Submitter: Simei Su <simei.su@intel.com>
Date: Wednesday, February 01 2023 07:30:14 
Applied on: CommitID:99cc0a9ab6730d4df70dba4b19e78e87ad7ba110
Apply patch set 122796-122797 failed:

Checking patch doc/guides/rel_notes/release_23_03.rst...
error: while searching for:
* **Updated Intel igc driver.**

  * Added timesync API support.


Removed Items
-------------

error: patch failed: doc/guides/rel_notes/release_23_03.rst:79
Checking patch drivers/net/igc/igc_ethdev.c...
error: while searching for:
#define IGC_I225_RX_LATENCY_1000	300
#define IGC_I225_RX_LATENCY_2500	1485

static const struct rte_eth_desc_lim rx_desc_lim = {
	.nb_max = IGC_MAX_RXD,
	.nb_min = IGC_MIN_RXD,

error: patch failed: drivers/net/igc/igc_ethdev.c:88
error: while searching for:
				  struct timespec *timestamp);
static int eth_igc_timesync_write_time(struct rte_eth_dev *dev,
				   const struct timespec *timestamp);

static const struct eth_dev_ops eth_igc_ops = {
	.dev_configure		= eth_igc_configure,

error: patch failed: drivers/net/igc/igc_ethdev.c:267
error: while searching for:
	.timesync_adjust_time	= eth_igc_timesync_adjust_time,
	.timesync_read_time	= eth_igc_timesync_read_time,
	.timesync_write_time	= eth_igc_timesync_write_time,
};

/*

error: patch failed: drivers/net/igc/igc_ethdev.c:327
Hunk #4 succeeded at 920 (offset -34 lines).
Hunk #5 succeeded at 985 (offset -34 lines).
Hunk #6 succeeded at 2636 (offset -227 lines).
Checking patch drivers/net/igc/igc_ethdev.h...
Hunk #1 succeeded at 85 (offset -2 lines).
Hunk #2 succeeded at 239 (offset -2 lines).
Checking patch drivers/net/igc/igc_txrx.c...
Hunk #1 succeeded at 1487 (offset 76 lines).
Hunk #2 succeeded at 1507 (offset 76 lines).
Hunk #3 succeeded at 1582 (offset 76 lines).
Hunk #4 succeeded at 1648 (offset 76 lines).
Hunk #5 succeeded at 1796 (offset 76 lines).
Hunk #6 succeeded at 2187 (offset 76 lines).
Hunk #7 succeeded at 2221 (offset 76 lines).
Checking patch drivers/net/igc/igc_txrx.h...
error: while searching for:
extern "C" {
#endif

struct igc_rx_entry {
	struct rte_mbuf *mbuf; /**< mbuf associated with RX descriptor. */
};

error: patch failed: drivers/net/igc/igc_txrx.h:11
Applying patch doc/guides/rel_notes/release_23_03.rst with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/igc/igc_ethdev.c with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Applied patch drivers/net/igc/igc_ethdev.h cleanly.
Applied patch drivers/net/igc/igc_txrx.c cleanly.
Applying patch drivers/net/igc/igc_txrx.h with 1 reject...
Rejected hunk #1.
diff a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst	(rejected hunks)
@@ -79,7 +79,7 @@ New Features
 * **Updated Intel igc driver.**
 
   * Added timesync API support.
-
+  * Added packet pacing(launch time offloading) support.
 
 Removed Items
 -------------
diff a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c	(rejected hunks)
@@ -88,6 +88,9 @@
 #define IGC_I225_RX_LATENCY_1000	300
 #define IGC_I225_RX_LATENCY_2500	1485
 
+uint64_t igc_tx_timestamp_dynflag;
+int igc_tx_timestamp_dynfield_offset = -1;
+
 static const struct rte_eth_desc_lim rx_desc_lim = {
 	.nb_max = IGC_MAX_RXD,
 	.nb_min = IGC_MIN_RXD,
@@ -267,6 +270,7 @@ static int eth_igc_timesync_read_time(struct rte_eth_dev *dev,
 				  struct timespec *timestamp);
 static int eth_igc_timesync_write_time(struct rte_eth_dev *dev,
 				   const struct timespec *timestamp);
+static int eth_igc_read_clock(struct rte_eth_dev *dev, uint64_t *clock);
 
 static const struct eth_dev_ops eth_igc_ops = {
 	.dev_configure		= eth_igc_configure,
@@ -327,6 +331,7 @@ static const struct eth_dev_ops eth_igc_ops = {
 	.timesync_adjust_time	= eth_igc_timesync_adjust_time,
 	.timesync_read_time	= eth_igc_timesync_read_time,
 	.timesync_write_time	= eth_igc_timesync_write_time,
+	.read_clock             = eth_igc_read_clock,
 };
 
 /*
diff a/drivers/net/igc/igc_txrx.h b/drivers/net/igc/igc_txrx.h	(rejected hunks)
@@ -11,6 +11,9 @@
 extern "C" {
 #endif
 
+extern uint64_t igc_tx_timestamp_dynflag;
+extern int igc_tx_timestamp_dynfield_offset;
+
 struct igc_rx_entry {
 	struct rte_mbuf *mbuf; /**< mbuf associated with RX descriptor. */
 };

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

UNH-IOL DPDK Community Lab