[PATCH] net/ice/base: add retries for reading NVM

[Zhichao Zeng]

Reading NVM fails in some scenarios, so synchronize with the share code
in the kernel driver to add retries for reading NVM.

Signed-off-by: Zhichao Zeng <zhichaox.z...@intel.com>
---
 drivers/net/ice/base/ice_nvm.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c
index 528489929e..2bfc608a8e 100644
--- a/drivers/net/ice/base/ice_nvm.c
+++ b/drivers/net/ice/base/ice_nvm.c
@@ -71,6 +71,7 @@ ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, 
u8 *data,
 {
        u32 inlen = *length;
        u32 bytes_read = 0;
+       int retry_cnt = 0;
        bool last_cmd;
        int status;
 
@@ -106,11 +107,24 @@ ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 
*length, u8 *data,
                                         offset, (u16)read_size,
                                         data + bytes_read, last_cmd,
                                         read_shadow_ram, NULL);
-               if (status)
-                       break;
-
-               bytes_read += read_size;
-               offset += read_size;
+               if (status) {
+                       if (hw->adminq.sq_last_status != ICE_AQ_RC_EBUSY ||
+                               retry_cnt > ICE_SQ_SEND_MAX_EXECUTE)
+                               break;
+                       ice_debug(hw, ICE_DBG_NVM,
+                                 "NVM read EBUSY error, retry %d\n",
+                                 retry_cnt + 1);
+                       ice_release_nvm(hw);
+                       msleep(ICE_SQ_SEND_DELAY_TIME_MS);
+                       status = ice_acquire_nvm(hw, ICE_RES_READ);
+                       if (status)
+                               break;
+                       retry_cnt++;
+               } else {
+                       bytes_read += read_size;
+                       offset += read_size;
+                       retry_cnt = 0;
+               }
        } while (!last_cmd);
 
        *length = bytes_read;
-- 
2.34.1