[PATCH 2/8] net/nfp: speed up the firmware loading process

[Chaoyong He]

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

The previous design spent too much time checking whether
the port was alive, now optimize this process and speed
up the firmware loading process.

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 | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 434d664573..e06e6b7f59 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -1065,24 +1065,29 @@ nfp_fw_loaded_check_alive(struct nfp_nsp *nsp,
                const struct nfp_dev_info *dev_info,
                struct nfp_multi_pf *multi_pf)
 {
-       int offset;
-       uint32_t i;
-       uint64_t beat;
+       uint8_t i;
+       uint64_t tmp_beat;
        uint32_t port_num;
+       uint64_t beat[dev_info->pf_num_per_unit];
+       uint32_t offset[dev_info->pf_num_per_unit];
+
+       for (port_num = 0; port_num < dev_info->pf_num_per_unit; port_num++) {
+               offset[port_num] = NFP_BEAT_OFFSET(port_num);
+               beat[port_num] = nn_readq(multi_pf->beat_addr + 
offset[port_num]);
+       }
 
        /*
         * If the beats of any other port changed in 3s,
         * we should not reload the firmware.
         */
-       for (port_num = 0; port_num < dev_info->pf_num_per_unit; port_num++) {
-               if (port_num == multi_pf->function_id)
-                       continue;
-
-               offset = NFP_BEAT_OFFSET(port_num);
-               beat = nn_readq(multi_pf->beat_addr + offset);
-               for (i = 0; i < 3; i++) {
-                       sleep(1);
-                       if (nn_readq(multi_pf->beat_addr + offset) != beat)
+       for (i = 0; i < 3; i++) {
+               sleep(1);
+               for (port_num = 0; port_num < dev_info->pf_num_per_unit; 
port_num++) {
+                       if (port_num == multi_pf->function_id)
+                               continue;
+
+                       tmp_beat = nn_readq(multi_pf->beat_addr + 
offset[port_num]);
+                       if (tmp_beat != beat[port_num])
                                return 0;
                }
        }
-- 
2.39.1