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

_apply patch failure_

Submitter: Chaoyong He <chaoyong.he@corigine.com>
Date: Tuesday, February 21 2023 03:10:55 
Applied on: CommitID:9bd5ebca59c865aead7096358fb733e53a72007b
Apply patch set 124247-124249 failed:

Checking patch drivers/net/nfp/nfp_common.c...
error: while searching for:
	return 0;
}

/*
 * Local variables:
 * c-file-style: "Linux"

error: patch failed: drivers/net/nfp/nfp_common.c:1584
Checking patch drivers/net/nfp/nfp_common.h...
error: while searching for:
		uint16_t *min_tx_desc,
		uint16_t *max_tx_desc);
int nfp_net_check_dma_mask(struct nfp_net_hw *hw, char *name);

#define NFP_NET_DEV_PRIVATE_TO_HW(adapter)\
	(&((struct nfp_net_adapter *)adapter)->hw)

error: patch failed: drivers/net/nfp/nfp_common.h:455
Checking patch drivers/net/nfp/nfp_ctrl.h...
Checking patch drivers/net/nfp/nfp_ethdev.c...
Hunk #2 succeeded at 613 (offset 5 lines).
Checking patch drivers/net/nfp/nfp_ethdev_vf.c...
Hunk #2 succeeded at 375 (offset 5 lines).
Checking patch drivers/net/nfp/nfp_rxtx.c...
Applying patch drivers/net/nfp/nfp_common.c with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/nfp/nfp_common.h with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Applied patch drivers/net/nfp/nfp_ctrl.h cleanly.
Applied patch drivers/net/nfp/nfp_ethdev.c cleanly.
Applied patch drivers/net/nfp/nfp_ethdev_vf.c cleanly.
Applied patch drivers/net/nfp/nfp_rxtx.c cleanly.
diff a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c	(rejected hunks)
@@ -1584,6 +1584,29 @@ nfp_net_check_dma_mask(struct nfp_net_hw *hw, char *name)
 	return 0;
 }
 
+void
+nfp_net_init_metadata_format(struct nfp_net_hw *hw)
+{
+	/*
+	 * ABI 4.x and ctrl vNIC always use chained metadata, in other cases we allow use of
+	 * single metadata if only RSS(v1) is supported by hw capability, and RSS(v2)
+	 * also indicate that we are using chained metadata.
+	 */
+	if (NFD_CFG_MAJOR_VERSION_of(hw->ver) == 4) {
+		hw->meta_format = NFP_NET_METAFORMAT_CHANINED;
+	} else if ((hw->cap & NFP_NET_CFG_CTRL_CHAIN_META) != 0) {
+		hw->meta_format = NFP_NET_METAFORMAT_CHANINED;
+		/*
+		 * RSS is incompatible with chained metadata. hw->cap just represents
+		 * firmware's ability rather than the firmware's configuration. We decide
+		 * to reduce the confusion to allow us can use hw->cap to identify RSS later.
+		 */
+		hw->cap &= ~NFP_NET_CFG_CTRL_RSS;
+	} else {
+		hw->meta_format = NFP_NET_METAFORMAT_SINGLE;
+	}
+}
+
 /*
  * Local variables:
  * c-file-style: "Linux"
diff a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h	(rejected hunks)
@@ -455,6 +461,7 @@ int nfp_net_tx_desc_limits(struct nfp_net_hw *hw,
 		uint16_t *min_tx_desc,
 		uint16_t *max_tx_desc);
 int nfp_net_check_dma_mask(struct nfp_net_hw *hw, char *name);
+void nfp_net_init_metadata_format(struct nfp_net_hw *hw);
 
 #define NFP_NET_DEV_PRIVATE_TO_HW(adapter)\
 	(&((struct nfp_net_adapter *)adapter)->hw)

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

UNH-IOL DPDK Community Lab