|WARNING| pw133667 [PATCH] [v2] net/mlx5: add global API prefix to public constants

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Thomas Monjalon <thomas at monjalon.net>
Date: Tuesday, October 31 2023 13:38:10 
Applied on: CommitID:441197cc1ab413c379a88abbcf8e98b195c8eb76
Apply patch set 133667 failed:

Checking patch doc/guides/nics/mlx5.rst...
Hunk #2 succeeded at 2216 (offset 31 lines).
Checking patch drivers/net/mlx5/mlx5.h...
Hunk #1 succeeded at 1697 (offset 13 lines).
Hunk #2 succeeded at 1848 (offset 12 lines).
Checking patch drivers/net/mlx5/mlx5_defs.h...
Checking patch drivers/net/mlx5/mlx5_ethdev.c...
Checking patch drivers/net/mlx5/mlx5_flow.c...
Hunk #1 succeeded at 192 (offset -5 lines).
Hunk #2 succeeded at 7724 (offset 11 lines).
Hunk #3 succeeded at 7798 (offset 11 lines).
Hunk #4 succeeded at 7861 (offset 11 lines).
Hunk #5 succeeded at 7869 (offset 11 lines).
Hunk #6 succeeded at 7905 (offset 11 lines).
Hunk #7 succeeded at 7916 (offset 11 lines).
Hunk #8 succeeded at 7930 (offset 11 lines).
Hunk #9 succeeded at 8004 (offset 11 lines).
Hunk #10 succeeded at 8074 (offset 11 lines).
Hunk #11 succeeded at 8544 (offset -12 lines).
Checking patch drivers/net/mlx5/mlx5_flow.h...
error: while searching for:
	case RTE_FLOW_ITEM_TYPE_METER_COLOR:
		return mlx5_flow_hw_aso_tag;
	case RTE_FLOW_ITEM_TYPE_TAG:
		if (id == MLX5_LINEAR_HASH_TAG_INDEX)
			return REG_C_3;
		MLX5_ASSERT(id < MLX5_FLOW_HW_TAGS_MAX);
		return mlx5_flow_hw_avl_tags[id];

error: patch failed: drivers/net/mlx5/mlx5_flow.h:1702
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
error: while searching for:
			uint8_t tag_index = flow_tag_index_get(data);
			int reg;

			off_be = (tag_index == MLX5_LINEAR_HASH_TAG_INDEX) ?
				 16 - (data->offset + width) + 16 : data->offset;
			if (priv->sh->config.dv_flow_en == 2)
				reg = flow_hw_get_reg_id(RTE_FLOW_ITEM_TYPE_TAG,

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:1916
Hunk #2 succeeded at 19708 (offset 58 lines).
Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
Hunk #1 succeeded at 1189 (offset 113 lines).
Hunk #2 succeeded at 2633 (offset 244 lines).
Checking patch drivers/net/mlx5/mlx5_rx.c...
Checking patch drivers/net/mlx5/mlx5_rx.h...
Checking patch drivers/net/mlx5/mlx5_rxq.c...
Checking patch drivers/net/mlx5/mlx5_testpmd.c...
Checking patch drivers/net/mlx5/rte_pmd_mlx5.h...
Applied patch doc/guides/nics/mlx5.rst cleanly.
Applied patch drivers/net/mlx5/mlx5.h cleanly.
Applied patch drivers/net/mlx5/mlx5_defs.h cleanly.
Applied patch drivers/net/mlx5/mlx5_ethdev.c cleanly.
Applied patch drivers/net/mlx5/mlx5_flow.c cleanly.
Applying patch drivers/net/mlx5/mlx5_flow.h with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/mlx5/mlx5_flow_dv.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch drivers/net/mlx5/mlx5_flow_hw.c cleanly.
Applied patch drivers/net/mlx5/mlx5_rx.c cleanly.
Applied patch drivers/net/mlx5/mlx5_rx.h cleanly.
Applied patch drivers/net/mlx5/mlx5_rxq.c cleanly.
Applied patch drivers/net/mlx5/mlx5_testpmd.c cleanly.
Applied patch drivers/net/mlx5/rte_pmd_mlx5.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h	(rejected hunks)
@@ -1702,7 +1702,7 @@ flow_hw_get_reg_id(enum rte_flow_item_type type, uint32_t id)
 	case RTE_FLOW_ITEM_TYPE_METER_COLOR:
 		return mlx5_flow_hw_aso_tag;
 	case RTE_FLOW_ITEM_TYPE_TAG:
-		if (id == MLX5_LINEAR_HASH_TAG_INDEX)
+		if (id == RTE_PMD_MLX5_LINEAR_HASH_TAG_INDEX)
 			return REG_C_3;
 		MLX5_ASSERT(id < MLX5_FLOW_HW_TAGS_MAX);
 		return mlx5_flow_hw_avl_tags[id];
diff a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c	(rejected hunks)
@@ -1916,7 +1916,7 @@ mlx5_flow_field_id_to_modify_info
 			uint8_t tag_index = flow_tag_index_get(data);
 			int reg;
 
-			off_be = (tag_index == MLX5_LINEAR_HASH_TAG_INDEX) ?
+			off_be = (tag_index == RTE_PMD_MLX5_LINEAR_HASH_TAG_INDEX) ?
 				 16 - (data->offset + width) + 16 : data->offset;
 			if (priv->sh->config.dv_flow_en == 2)
 				reg = flow_hw_get_reg_id(RTE_FLOW_ITEM_TYPE_TAG,

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

UNH-IOL DPDK Community Lab