Commit 3f0c16e8 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller

e1000e: cleanup e1000_sw_lcd_config_ich8lan()

Do not acquire and release the PHY unnecessarily for parts that return
from this workaround without actually accessing the PHY registers.
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3af50481
...@@ -820,14 +820,6 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw) ...@@ -820,14 +820,6 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
s32 ret_val = 0; s32 ret_val = 0;
u16 word_addr, reg_data, reg_addr, phy_page = 0; u16 word_addr, reg_data, reg_addr, phy_page = 0;
if (!(hw->mac.type == e1000_ich8lan && phy->type == e1000_phy_igp_3) &&
!(hw->mac.type == e1000_pchlan))
return ret_val;
ret_val = hw->phy.ops.acquire(hw);
if (ret_val)
return ret_val;
/* /*
* Initialize the PHY from the NVM on ICH platforms. This * Initialize the PHY from the NVM on ICH platforms. This
* is needed due to an issue where the NVM configuration is * is needed due to an issue where the NVM configuration is
...@@ -835,12 +827,26 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw) ...@@ -835,12 +827,26 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
* Therefore, after each PHY reset, we will load the * Therefore, after each PHY reset, we will load the
* configuration data out of the NVM manually. * configuration data out of the NVM manually.
*/ */
if ((adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_M_AMT) || switch (hw->mac.type) {
(adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_M) || case e1000_ich8lan:
(hw->mac.type == e1000_pchlan)) if (phy->type != e1000_phy_igp_3)
sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M; return ret_val;
else
if (adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_AMT) {
sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG; sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;
break;
}
/* Fall-thru */
case e1000_pchlan:
sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
break;
default:
return ret_val;
}
ret_val = hw->phy.ops.acquire(hw);
if (ret_val)
return ret_val;
data = er32(FEXTNVM); data = er32(FEXTNVM);
if (!(data & sw_cfg_mask)) if (!(data & sw_cfg_mask))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment