[dpdk-dev] [PATCH v3 09/36] e1000/base: add evaluation of e1000_nvm_read return value

[Wenzhuo Lu]

Adding code to a case where e1000_nvn_read is called, but there is no
consideration for when the read fails (returns an error code).
Also, this patch adds an error message to a base NVM reading function that
is missing it for consistency.
This patch is not covering all cases of these conditions, it only covers
the code used by the e1000e driver.

Signed-off-by: Wenzhuo Lu <wenzhuo.lu at intel.com>
---
 drivers/net/e1000/base/e1000_manage.c | 5 ++++-
 drivers/net/e1000/base/e1000_nvm.c    | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/e1000/base/e1000_manage.c 
b/drivers/net/e1000/base/e1000_manage.c
index ac4c08a..8564a7f 100644
--- a/drivers/net/e1000/base/e1000_manage.c
+++ b/drivers/net/e1000/base/e1000_manage.c
@@ -363,9 +363,12 @@ bool e1000_enable_mng_pass_thru(struct e1000_hw *hw)
        } else if ((hw->mac.type == e1000_82574) ||
                   (hw->mac.type == e1000_82583)) {
                u16 data;
+               s32 ret_val;

                factps = E1000_READ_REG(hw, E1000_FACTPS);
-               e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+               ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+               if (ret_val)
+                       return false;

                if (!(factps & E1000_FACTPS_MNGCG) &&
                    ((data & E1000_NVM_INIT_CTRL2_MNGM) ==
diff --git a/drivers/net/e1000/base/e1000_nvm.c 
b/drivers/net/e1000/base/e1000_nvm.c
index 966a34c..01be9e4 100644
--- a/drivers/net/e1000/base/e1000_nvm.c
+++ b/drivers/net/e1000/base/e1000_nvm.c
@@ -585,6 +585,9 @@ s32 e1000_read_nvm_eerd(struct e1000_hw *hw, u16 offset, 
u16 words, u16 *data)
                           E1000_NVM_RW_REG_DATA);
        }

+       if (ret_val)
+               DEBUGOUT1("NVM read error: %d\n", ret_val);
+
        return ret_val;
 }

-- 
1.9.3