|WARNING| pw127157-127158 [PATCH] [2/2] net/nfp: add support of showing firmware version

|WARNING| pw127157-127158 [PATCH] [2/2] net/nfp: add support of showing firmware version

[dpdklab]

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

_apply patch failure_

Submitter: Chaoyong He <chaoyong.he@corigine.com>
Date: Monday, May 22 2023 11:40:09 
Applied on: CommitID:a399d7b5a994e335c446d4b15d7622d71dd8848c
Apply patch set 127157-127158 failed:

Checking patch drivers/net/nfp/flower/nfp_flower.c...
Hunk #1 succeeded at 649 (offset -1 lines).
Hunk #2 succeeded at 660 (offset -1 lines).
Checking patch drivers/net/nfp/nfp_common.c...
Hunk #1 succeeded at 246 (offset -110 lines).
error: while searching for:
{
	uint16_t tx_dpp;

	switch (NFD_CFG_CLASS_VER_of(hw->ver)) {
	case NFP_NET_CFG_VERSION_DP_NFD3:
		tx_dpp = NFD3_TX_DESC_PER_PKT;
		break;
	case NFP_NET_CFG_VERSION_DP_NFDK:
		if (NFD_CFG_MAJOR_VERSION_of(hw->ver) < 5) {
			PMD_DRV_LOG(ERR, "NFDK must use ABI 5 or newer, found: %d",
				NFD_CFG_MAJOR_VERSION_of(hw->ver));
			return -EINVAL;
		}
		tx_dpp = NFDK_TX_DESC_PER_SIMPLE_PKT;

error: patch failed: drivers/net/nfp/nfp_common.c:1114
Hunk #3 succeeded at 1618 (offset -292 lines).
Hunk #4 succeeded at 1636 (offset -292 lines).
error: while searching for:
		hw->meta_format = NFP_NET_METAFORMAT_SINGLE;
	}
}

error: patch failed: drivers/net/nfp/nfp_common.c:1944
Checking patch drivers/net/nfp/nfp_common.h...
Hunk #1 succeeded at 88 (offset 8 lines).
Hunk #2 succeeded at 186 (offset 8 lines).
Hunk #3 succeeded at 462 (offset -10 lines).
Checking patch drivers/net/nfp/nfp_ctrl.h...
Hunk #1 succeeded at 140 (offset 10 lines).
Hunk #2 succeeded at 171 (offset 10 lines).
Checking patch drivers/net/nfp/nfp_ethdev.c...
Hunk #1 succeeded at 468 (offset 2 lines).
error: while searching for:
	PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar);
	PMD_INIT_LOG(DEBUG, "MAC stats: %p", hw->mac_stats);

	hw->ver = nn_cfg_readl(hw, NFP_NET_CFG_VERSION);

	if (nfp_net_check_dma_mask(hw, pci_dev->name) != 0)
		return -ENODEV;

error: patch failed: drivers/net/nfp/nfp_ethdev.c:571
Hunk #3 succeeded at 611 (offset -18 lines).
Checking patch drivers/net/nfp/nfp_ethdev_vf.c...
Hunk #1 succeeded at 247 (offset 1 line).
Hunk #2 succeeded at 299 (offset 1 line).
Hunk #3 succeeded at 373 (offset -7 lines).
Checking patch drivers/net/nfp/nfp_rxtx.c...
Hunk #1 succeeded at 1289 (offset 525 lines).
Applied patch drivers/net/nfp/flower/nfp_flower.c cleanly.
Applying patch drivers/net/nfp/nfp_common.c with 2 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Rejected hunk #5.
Applied patch drivers/net/nfp/nfp_common.h cleanly.
Applied patch drivers/net/nfp/nfp_ctrl.h cleanly.
Applying patch drivers/net/nfp/nfp_ethdev.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Applied patch drivers/net/nfp/nfp_ethdev_vf.c cleanly.
Applied patch drivers/net/nfp/nfp_rxtx.c cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c	(rejected hunks)
@@ -1114,14 +1113,14 @@ nfp_net_tx_desc_limits(struct nfp_net_hw *hw,
 {
 	uint16_t tx_dpp;
 
-	switch (NFD_CFG_CLASS_VER_of(hw->ver)) {
+	switch (hw->ver.extend) {
 	case NFP_NET_CFG_VERSION_DP_NFD3:
 		tx_dpp = NFD3_TX_DESC_PER_PKT;
 		break;
 	case NFP_NET_CFG_VERSION_DP_NFDK:
-		if (NFD_CFG_MAJOR_VERSION_of(hw->ver) < 5) {
+		if (hw->ver.major < 5) {
 			PMD_DRV_LOG(ERR, "NFDK must use ABI 5 or newer, found: %d",
-				NFD_CFG_MAJOR_VERSION_of(hw->ver));
+					hw->ver.major);
 			return -EINVAL;
 		}
 		tx_dpp = NFDK_TX_DESC_PER_SIMPLE_PKT;
@@ -1944,3 +1942,15 @@ nfp_net_init_metadata_format(struct nfp_net_hw *hw)
 		hw->meta_format = NFP_NET_METAFORMAT_SINGLE;
 	}
 }
+
+void
+nfp_net_cfg_read_version(struct nfp_net_hw *hw)
+{
+	union {
+		uint32_t whole;
+		struct nfp_net_fw_ver split;
+	} version;
+
+	version.whole = nn_cfg_readl(hw, NFP_NET_CFG_VERSION);
+	hw->ver = version.split;
+}
diff a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c	(rejected hunks)
@@ -571,7 +571,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
 	PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar);
 	PMD_INIT_LOG(DEBUG, "MAC stats: %p", hw->mac_stats);
 
-	hw->ver = nn_cfg_readl(hw, NFP_NET_CFG_VERSION);
+	nfp_net_cfg_read_version(hw);
 
 	if (nfp_net_check_dma_mask(hw, pci_dev->name) != 0)
 		return -ENODEV;
Checking patch drivers/net/nfp/flower/nfp_flower_representor.c...
Hunk #1 succeeded at 530 (offset 5 lines).
Hunk #2 succeeded at 552 (offset 5 lines).
Checking patch drivers/net/nfp/nfp_common.c...
error: drivers/net/nfp/nfp_common.c: does not match index
Checking patch drivers/net/nfp/nfp_common.h...
error: drivers/net/nfp/nfp_common.h: does not match index
Checking patch drivers/net/nfp/nfp_ethdev.c...
error: drivers/net/nfp/nfp_ethdev.c: does not match index
Checking patch drivers/net/nfp/nfp_ethdev_vf.c...
error: drivers/net/nfp/nfp_ethdev_vf.c: does not match index
Applied patch drivers/net/nfp/flower/nfp_flower_representor.c cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch

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

UNH-IOL DPDK Community Lab