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

_apply patch failure_

Submitter: Min Hu (Connor) <humin29@huawei.com>
Date: Friday, March 04 2022 01:22:52 
Applied on: CommitID:305769000c40a4fdf1ed0cf24c157b447b91ea7d
Apply patch set 108522 failed:

Checking patch app/proc-info/main.c...
Checking patch drivers/net/hns3/hns3_ethdev.c...
error: while searching for:
	return hns3_get_autoneg_fc_mode(hw);
}

static int
hns3_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
{
	struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);

error: patch failed: drivers/net/hns3/hns3_ethdev.c:5350
error: while searching for:
	.timesync_adjust_time       = hns3_timesync_adjust_time,
	.timesync_read_time         = hns3_timesync_read_time,
	.timesync_write_time        = hns3_timesync_write_time,
};

static const struct hns3_reset_ops hns3_reset_ops = {

error: patch failed: drivers/net/hns3/hns3_ethdev.c:6568
Checking patch drivers/net/hns3/hns3_ethdev.h...
error: while searching for:
	return __atomic_fetch_and(addr, ~mask, __ATOMIC_RELAXED) & mask;
}

uint32_t hns3_get_speed_capa(struct hns3_hw *hw);

int hns3_buffer_alloc(struct hns3_hw *hw);

error: patch failed: drivers/net/hns3/hns3_ethdev.h:1030
error: while searching for:
int hns3_timesync_write_time(struct rte_eth_dev *dev,
			const struct timespec *ts);
int hns3_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta);

static inline bool
is_reset_pending(struct hns3_adapter *hns)

error: patch failed: drivers/net/hns3/hns3_ethdev.h:1055
Checking patch drivers/net/hns3/hns3_ethdev_dump.c...
error: drivers/net/hns3/hns3_ethdev_dump.c: already exists in index
Checking patch drivers/net/hns3/hns3_ethdev_vf.c...
error: while searching for:
	.get_reg            = hns3_get_regs,
	.dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,
	.tx_done_cleanup    = hns3_tx_done_cleanup,
};

static const struct hns3_reset_ops hns3vf_reset_ops = {

error: patch failed: drivers/net/hns3/hns3_ethdev_vf.c:2290
Checking patch drivers/net/hns3/meson.build...
error: while searching for:
        'hns3_tm.c',
        'hns3_ptp.c',
        'hns3_common.c',
)

deps += ['hash']

error: patch failed: drivers/net/hns3/meson.build:30
Applied patch app/proc-info/main.c cleanly.
Applying patch drivers/net/hns3/hns3_ethdev.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applying patch drivers/net/hns3/hns3_ethdev.h with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applying patch drivers/net/hns3/hns3_ethdev_vf.c with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/hns3/meson.build with 1 reject...
Rejected hunk #1.
diff a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c	(rejected hunks)
@@ -5350,7 +5350,7 @@ hns3_get_current_fc_mode(struct rte_eth_dev *dev)
 	return hns3_get_autoneg_fc_mode(hw);
 }
 
-static int
+int
 hns3_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 {
 	struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -6568,6 +6568,7 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
 	.timesync_adjust_time       = hns3_timesync_adjust_time,
 	.timesync_read_time         = hns3_timesync_read_time,
 	.timesync_write_time        = hns3_timesync_write_time,
+	.eth_dev_priv_dump          = hns3_eth_dev_priv_dump,
 };
 
 static const struct hns3_reset_ops hns3_reset_ops = {
diff a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h	(rejected hunks)
@@ -1030,6 +1030,8 @@ hns3_test_and_clear_bit(unsigned int nr, volatile uint64_t *addr)
 	return __atomic_fetch_and(addr, ~mask, __ATOMIC_RELAXED) & mask;
 }
 
+int
+hns3_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf);
 uint32_t hns3_get_speed_capa(struct hns3_hw *hw);
 
 int hns3_buffer_alloc(struct hns3_hw *hw);
@@ -1055,6 +1057,7 @@ int hns3_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts);
 int hns3_timesync_write_time(struct rte_eth_dev *dev,
 			const struct timespec *ts);
 int hns3_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta);
+int hns3_eth_dev_priv_dump(struct rte_eth_dev *dev, FILE *file);
 
 static inline bool
 is_reset_pending(struct hns3_adapter *hns)
diff a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c	(rejected hunks)
@@ -2290,6 +2290,7 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {
 	.get_reg            = hns3_get_regs,
 	.dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,
 	.tx_done_cleanup    = hns3_tx_done_cleanup,
+	.eth_dev_priv_dump  = hns3_eth_dev_priv_dump,
 };
 
 static const struct hns3_reset_ops hns3vf_reset_ops = {
diff a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build	(rejected hunks)
@@ -30,6 +30,7 @@ sources = files(
         'hns3_tm.c',
         'hns3_ptp.c',
         'hns3_common.c',
+	'hns3_ethdev_dump.c',
 )
 
 deps += ['hash']

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

UNH-IOL DPDK Community Lab