[PATCH 06/11] net/nfp: adjust physical port check for multiple PFs

[Chaoyong He]

From: Peng Zhang <peng.zh...@corigine.com>

If the firmware supports multiple PFs each PF is represented by a single
physical port. While if the firmware only supports a single PF there
might be one or more physical ports represented by a single PF.

Adjust the check to handle both single and multiple PFs firmware.

Signed-off-by: Peng Zhang <peng.zh...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Long Wu <long...@corigine.com>
---
 drivers/net/nfp/nfp_ethdev.c | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 7022ef435f..3ebfd444b3 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -712,6 +712,15 @@ nfp_fw_setup(struct rte_pci_device *dev,
        return err;
 }
 
+static inline bool
+nfp_check_multi_pf_from_fw(uint32_t total_vnics)
+{
+       if (total_vnics == 1)
+               return true;
+
+       return false;
+}
+
 static inline bool
 nfp_check_multi_pf_from_nsp(struct rte_pci_device *pci_dev,
                struct nfp_cpp *cpp)
@@ -765,14 +774,22 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev,
                goto app_cleanup;
        }
 
-       /*
-        * For coreNIC the number of vNICs exposed should be the same as the
-        * number of physical ports.
-        */
-       if (total_vnics != nfp_eth_table->count) {
-               PMD_INIT_LOG(ERR, "Total physical ports do not match number of 
vNICs");
-               ret = -ENODEV;
-               goto app_cleanup;
+       if (pf_dev->multi_pf.enabled) {
+               if (!nfp_check_multi_pf_from_fw(total_vnics)) {
+                       PMD_INIT_LOG(ERR, "NSP report multipf, but FW report 
not multipf");
+                       ret = -ENODEV;
+                       goto app_cleanup;
+               }
+       } else {
+               /*
+                * For coreNIC the number of vNICs exposed should be the same 
as the
+                * number of physical ports.
+                */
+               if (total_vnics != nfp_eth_table->count) {
+                       PMD_INIT_LOG(ERR, "Total physical ports do not match 
number of vNICs");
+                       ret = -ENODEV;
+                       goto app_cleanup;
+               }
        }
 
        /* Populate coreNIC app properties */
-- 
2.39.1