[dpdk-dev] [PATCH 07/70] net/e1000/base: modify flash presence for i225 devices

[Guinan Sun]

ntroduce flash presence method for i225 devices.
Resolve conflict with legacy i210.

Signed-off-by: Sasha Neftin <sasha.nef...@intel.com>
Signed-off-by: Guinan Sun <guinanx....@intel.com>
---
 drivers/net/e1000/base/e1000_nvm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/e1000/base/e1000_nvm.c 
b/drivers/net/e1000/base/e1000_nvm.c
index 56e2db122..86dd26015 100644
--- a/drivers/net/e1000/base/e1000_nvm.c
+++ b/drivers/net/e1000/base/e1000_nvm.c
@@ -749,8 +749,9 @@ s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 
*pba_num,
 
        DEBUGFUNC("e1000_read_pba_string_generic");
 
-       if ((hw->mac.type >= e1000_i210) &&
-           !e1000_get_flash_presence_i210(hw)) {
+       if ((hw->mac.type == e1000_i210 ||
+            hw->mac.type == e1000_i211) &&
+            !e1000_get_flash_presence_i210(hw)) {
                DEBUGOUT("Flashless no PBA string\n");
                return -E1000_ERR_NVM_PBA_SECTION;
        }
@@ -1287,6 +1288,9 @@ void e1000_get_fw_version(struct e1000_hw *hw, struct 
e1000_fw_version *fw_vers)
                        return;
                }
                /* fall through */
+#ifndef NO_I225_SUPPORT
+       case e1000_i225:
+#endif /* NO_I225_SUPPORT */
        case e1000_i350:
                hw->nvm.ops.read(hw, NVM_ETRACK_HIWORD, 1, &etrack_test);
                /* find combo image version */
-- 
2.17.1