net/e1000/base: support i211

Add support SF/FW synchronization.
Add support to print PBA when using flashless.

Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>

diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c
index 4c3611c..8db2872 100644 (file)
--- a/drivers/net/e1000/base/e1000_82575.c
+++ b/drivers/net/e1000/base/e1000_82575.c
@@ -435,7 +435,7 @@ STATIC s32 e1000_init_mac_params_82575(struct e1000_hw *hw)
        if ((mac->type == e1000_i210) || (mac->type == e1000_i211))
                mac->ops.init_hw = e1000_init_hw_i210;
        else
-       mac->ops.init_hw = e1000_init_hw_82575;
+               mac->ops.init_hw = e1000_init_hw_82575;
        /* link setup */
        mac->ops.setup_link = e1000_setup_link_generic;
        /* physical interface link setup */
@@ -486,7 +486,7 @@ STATIC s32 e1000_init_mac_params_82575(struct e1000_hw *hw)
        /* acquire SW_FW sync */
        mac->ops.acquire_swfw_sync = e1000_acquire_swfw_sync_82575;
        mac->ops.release_swfw_sync = e1000_release_swfw_sync_82575;
-       if (mac->type >= e1000_i210) {
+       if (mac->type == e1000_i210 || mac->type == e1000_i211) {
                mac->ops.acquire_swfw_sync = e1000_acquire_swfw_sync_i210;
                mac->ops.release_swfw_sync = e1000_release_swfw_sync_i210;
        }

diff --git a/drivers/net/e1000/base/e1000_nvm.c b/drivers/net/e1000/base/e1000_nvm.c
index 56e2db1..4d4a8e0 100644 (file)
--- 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;
        }