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

_apply patch failure_

Submitter: Michael Baum <michaelba@nvidia.com>
Date: Tuesday, February 22 2022 12:48:15 
Applied on: CommitID:ecc0dd455e9a56db783463d83173c3f348b560ce
Apply patch set 107963-107967 failed:

Checking patch doc/guides/nics/mlx5.rst...
Checking patch doc/guides/platform/mlx5.rst...
Checking patch drivers/common/mlx5/linux/mlx5_common_os.c...
Checking patch drivers/common/mlx5/mlx5_common.c...
error: while searching for:

/*
 * Device parameter to force doorbell register mapping
 * to non-cahed region eliminating the extra write memory barrier.
 */
#define MLX5_TX_DB_NC "tx_db_nc"

/* In case this is an x86_64 intel processor to check if
 * we should use relaxed ordering.
 */

error: patch failed: drivers/common/mlx5/mlx5_common.c:35
error: while searching for:
		DRV_LOG(WARNING, "%s: \"%s\" is an invalid integer.", key, val);
		return -rte_errno;
	}
	if (strcmp(key, MLX5_TX_DB_NC) == 0) {
		if (tmp != MLX5_TXDB_CACHED &&
		    tmp != MLX5_TXDB_NCACHED &&
		    tmp != MLX5_TXDB_HEURISTIC) {
			DRV_LOG(ERR, "Invalid Tx doorbell mapping parameter.");
			rte_errno = EINVAL;
			return -rte_errno;
		}

error: patch failed: drivers/common/mlx5/mlx5_common.c:255
error: while searching for:
		RTE_DEVARGS_KEY_CLASS,
		MLX5_DRIVER_KEY,
		MLX5_TX_DB_NC,
		MLX5_MR_EXT_MEMSEG_EN,
		MLX5_SYS_MEM_EN,
		MLX5_MR_MEMPOOL_REG_EN,

error: patch failed: drivers/common/mlx5/mlx5_common.c:293
Hunk #4 succeeded at 180 (offset -151 lines).
Hunk #5 succeeded at 965 (offset -281 lines).
Checking patch drivers/common/mlx5/mlx5_common_defs.h...
Checking patch drivers/net/mlx5/linux/mlx5_verbs.c...
Hunk #1 succeeded at 927 (offset 1 line).
Checking patch drivers/net/mlx5/mlx5_devx.c...
Hunk #1 succeeded at 1325 (offset -1 lines).
Applied patch doc/guides/nics/mlx5.rst cleanly.
Applied patch doc/guides/platform/mlx5.rst cleanly.
Applied patch drivers/common/mlx5/linux/mlx5_common_os.c cleanly.
Applying patch drivers/common/mlx5/mlx5_common.c with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Applied patch drivers/common/mlx5/mlx5_common_defs.h cleanly.
Applied patch drivers/net/mlx5/linux/mlx5_verbs.c cleanly.
Applied patch drivers/net/mlx5/mlx5_devx.c cleanly.
diff a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c	(rejected hunks)
@@ -35,10 +35,17 @@ uint8_t haswell_broadwell_cpu;
 
 /*
  * Device parameter to force doorbell register mapping
- * to non-cahed region eliminating the extra write memory barrier.
+ * to non-cached region eliminating the extra write memory barrier.
+ * Deprecated, ignored (Name changed to sq_db_nc).
  */
 #define MLX5_TX_DB_NC "tx_db_nc"
 
+/*
+ * Device parameter to force doorbell register mapping
+ * to non-cached region eliminating the extra write memory barrier.
+ */
+#define MLX5_SQ_DB_NC "sq_db_nc"
+
 /* In case this is an x86_64 intel processor to check if
  * we should use relaxed ordering.
  */
@@ -255,11 +262,17 @@ mlx5_common_args_check_handler(const char *key, const char *val, void *opaque)
 		DRV_LOG(WARNING, "%s: \"%s\" is an invalid integer.", key, val);
 		return -rte_errno;
 	}
-	if (strcmp(key, MLX5_TX_DB_NC) == 0) {
-		if (tmp != MLX5_TXDB_CACHED &&
-		    tmp != MLX5_TXDB_NCACHED &&
-		    tmp != MLX5_TXDB_HEURISTIC) {
-			DRV_LOG(ERR, "Invalid Tx doorbell mapping parameter.");
+	if (strcmp(key, MLX5_TX_DB_NC) == 0)
+		DRV_LOG(WARNING,
+			"%s: deprecated parameter, converted to queue_db_nc",
+			key);
+	if (strcmp(key, MLX5_SQ_DB_NC) == 0 ||
+	    strcmp(key, MLX5_TX_DB_NC) == 0) {
+		if (tmp != MLX5_SQ_DB_CACHED &&
+		    tmp != MLX5_SQ_DB_NCACHED &&
+		    tmp != MLX5_SQ_DB_HEURISTIC) {
+			DRV_LOG(ERR,
+				"Invalid Send Queue doorbell mapping parameter.");
 			rte_errno = EINVAL;
 			return -rte_errno;
 		}
@@ -293,6 +306,7 @@ mlx5_common_config_get(struct mlx5_kvargs_ctrl *mkvlist,
 		RTE_DEVARGS_KEY_CLASS,
 		MLX5_DRIVER_KEY,
 		MLX5_TX_DB_NC,
+		MLX5_SQ_DB_NC,
 		MLX5_MR_EXT_MEMSEG_EN,
 		MLX5_SYS_MEM_EN,
 		MLX5_MR_MEMPOOL_REG_EN,

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

UNH-IOL DPDK Community Lab