From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw131656 [PATCH] [v5, 26/26] net/nfp: extend the usage of nfp BAR from 8 to 24
Date: Tue, 19 Sep 2023 19:59:43 -0700 (PDT) [thread overview]
Message-ID: <650a601f.9f0a0220.6bf1.7425SMTPIN_ADDED_MISSING@mx.google.com> (raw)
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/131656
_apply patch failure_
Submitter: Chaoyong He <chaoyong.he@corigine.com>
Date: Wednesday, September 20 2023 01:29:33
Applied on: CommitID:a4e700a878e7fa2651fd718e61f7228c3277e556
Apply patch set 131656 failed:
Checking patch drivers/net/nfp/nfp_ethdev.c...
error: while searching for:
* use a lock file if UIO is being used.
*/
if (pci_dev->kdrv == RTE_PCI_KDRV_VFIO)
cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, false);
else
cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, true);
if (cpp == NULL) {
PMD_INIT_LOG(ERR, "A CPP handle can not be obtained");
error: patch failed: drivers/net/nfp/nfp_ethdev.c:920
error: while searching for:
* use a lock file if UIO is being used.
*/
if (pci_dev->kdrv == RTE_PCI_KDRV_VFIO)
cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, false);
else
cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, true);
if (cpp == NULL) {
PMD_INIT_LOG(ERR, "A CPP handle can not be obtained");
error: patch failed: drivers/net/nfp/nfp_ethdev.c:1121
Checking patch drivers/net/nfp/nfpcore/nfp6000_pcie.c...
error: drivers/net/nfp/nfpcore/nfp6000_pcie.c: does not exist in index
Checking patch drivers/net/nfp/nfpcore/nfp6000_pcie.h...
error: drivers/net/nfp/nfpcore/nfp6000_pcie.h: does not exist in index
Checking patch drivers/net/nfp/nfpcore/nfp_cpp.h...
error: while searching for:
#define NFP_CPP_NUM_TARGETS 16
/*
* NFP CPP operations structure
*/
error: patch failed: drivers/net/nfp/nfpcore/nfp_cpp.h:18
error: while searching for:
size_t area_priv_size;
/* Instance an NFP CPP */
int (*init)(struct nfp_cpp *cpp,
struct rte_pci_device *dev);
/*
* Free the bus.
error: patch failed: drivers/net/nfp/nfpcore/nfp_cpp.h:26
Checking patch drivers/net/nfp/nfpcore/nfp_cppcore.c...
error: while searching for:
* NOTE: cpp_lock is NOT locked for op->init,
* since it may call NFP CPP API operations
*/
err = cpp->op->init(cpp, pci_dev);
if (err < 0) {
PMD_DRV_LOG(ERR, "NFP interface initialization failed");
free(cpp);
error: patch failed: drivers/net/nfp/nfpcore/nfp_cppcore.c:947
Applying patch drivers/net/nfp/nfp_ethdev.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applying patch drivers/net/nfp/nfpcore/nfp_cpp.h with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applying patch drivers/net/nfp/nfpcore/nfp_cppcore.c with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c (rejected hunks)
@@ -920,9 +920,9 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
* use a lock file if UIO is being used.
*/
if (pci_dev->kdrv == RTE_PCI_KDRV_VFIO)
- cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, false);
+ cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, false);
else
- cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, true);
+ cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, true);
if (cpp == NULL) {
PMD_INIT_LOG(ERR, "A CPP handle can not be obtained");
@@ -1121,9 +1121,9 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev)
* use a lock file if UIO is being used.
*/
if (pci_dev->kdrv == RTE_PCI_KDRV_VFIO)
- cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, false);
+ cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, false);
else
- cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, true);
+ cpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, true);
if (cpp == NULL) {
PMD_INIT_LOG(ERR, "A CPP handle can not be obtained");
diff a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h (rejected hunks)
@@ -18,6 +18,8 @@ struct nfp_cpp_area;
#define NFP_CPP_NUM_TARGETS 16
+#define PCI_64BIT_BAR_COUNT 3
+
/*
* NFP CPP operations structure
*/
@@ -26,8 +28,7 @@ struct nfp_cpp_operations {
size_t area_priv_size;
/* Instance an NFP CPP */
- int (*init)(struct nfp_cpp *cpp,
- struct rte_pci_device *dev);
+ int (*init)(struct nfp_cpp *cpp);
/*
* Free the bus.
diff a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c (rejected hunks)
@@ -947,7 +947,7 @@ nfp_cpp_alloc(struct rte_pci_device *pci_dev,
* NOTE: cpp_lock is NOT locked for op->init,
* since it may call NFP CPP API operations
*/
- err = cpp->op->init(cpp, pci_dev);
+ err = cpp->op->init(cpp);
if (err < 0) {
PMD_DRV_LOG(ERR, "NFP interface initialization failed");
free(cpp);
https://lab.dpdk.org/results/dashboard/patchsets/27657/
UNH-IOL DPDK Community Lab
reply other threads:[~2023-09-20 2:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=650a601f.9f0a0220.6bf1.7425SMTPIN_ADDED_MISSING@mx.google.com \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).