Skip to content

L
linux
Commit c8744f44 authored by Sasha Neftin's avatar Sasha Neftin Committed by Jeff Kirsher
Browse files
Options

e1000e: Add Support for CannonLake 

The propagation of CannonLake mac type to driver functionality
Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Reviewed-by: default avatarRaanan Avargil <raanan.avargil@intel.com>
Reviewed-by: default avatarDima Ruinskiy <dima.ruinskiy@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3a3173b9
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 62 deletions
drivers/net/ethernet/intel/e1000e/ethtool.c
View file @ c8744f44
...@@ -911,19 +911,20 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) ...@@ -911,19 +911,20 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
case e1000_pch2lan: case e1000_pch2lan:
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
/* fall through */
case e1000_pch_cnp:
mask |= BIT(18); mask |= BIT(18);
break; break;
default: default:
break; break;
} }
if ((mac->type == e1000_pch_lpt) || (mac->type == e1000_pch_spt)) if (mac->type >= e1000_pch_lpt)
wlock_mac = (er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK) >> wlock_mac = (er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK) >>
E1000_FWSM_WLOCK_MAC_SHIFT; E1000_FWSM_WLOCK_MAC_SHIFT;
for (i = 0; i < mac->rar_entry_count; i++) { for (i = 0; i < mac->rar_entry_count; i++) {
if ((mac->type == e1000_pch_lpt) || if (mac->type >= e1000_pch_lpt) {
(mac->type == e1000_pch_spt)) {
/* Cannot test write-protected SHRAL[n] registers */ /* Cannot test write-protected SHRAL[n] registers */
if ((wlock_mac == 1) || (wlock_mac && (i > wlock_mac))) if ((wlock_mac == 1) || (wlock_mac && (i > wlock_mac)))
continue; continue;
...@@ -1532,7 +1533,7 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter) ...@@ -1532,7 +1533,7 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
u32 rctl, fext_nvm11, tarc0; u32 rctl, fext_nvm11, tarc0;
if (hw->mac.type == e1000_pch_spt) { if (hw->mac.type >= e1000_pch_spt) {
fext_nvm11 = er32(FEXTNVM11); fext_nvm11 = er32(FEXTNVM11);
fext_nvm11 |= E1000_FEXTNVM11_DISABLE_MULR_FIX; fext_nvm11 |= E1000_FEXTNVM11_DISABLE_MULR_FIX;
ew32(FEXTNVM11, fext_nvm11); ew32(FEXTNVM11, fext_nvm11);
...@@ -1576,6 +1577,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter) ...@@ -1576,6 +1577,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
switch (hw->mac.type) { switch (hw->mac.type) {
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
fext_nvm11 = er32(FEXTNVM11); fext_nvm11 = er32(FEXTNVM11);
fext_nvm11 &= ~E1000_FEXTNVM11_DISABLE_MULR_FIX; fext_nvm11 &= ~E1000_FEXTNVM11_DISABLE_MULR_FIX;
ew32(FEXTNVM11, fext_nvm11); ew32(FEXTNVM11, fext_nvm11);
......
drivers/net/ethernet/intel/e1000e/ich8lan.c
View file @ c8744f44
...@@ -237,7 +237,7 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw) ...@@ -237,7 +237,7 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw)
if (ret_val) if (ret_val)
return false; return false;
out: out:
if ((hw->mac.type == e1000_pch_lpt) || (hw->mac.type == e1000_pch_spt)) { if (hw->mac.type >= e1000_pch_lpt) {
/* Only unforce SMBus if ME is not active */ /* Only unforce SMBus if ME is not active */
if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) { if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
/* Unforce SMBus mode in PHY */ /* Unforce SMBus mode in PHY */
...@@ -333,6 +333,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) ...@@ -333,6 +333,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
switch (hw->mac.type) { switch (hw->mac.type) {
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
if (e1000_phy_is_accessible_pchlan(hw)) if (e1000_phy_is_accessible_pchlan(hw))
break; break;
...@@ -474,6 +475,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) ...@@ -474,6 +475,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
case e1000_pch2lan: case e1000_pch2lan:
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
/* In case the PHY needs to be in mdio slow mode, /* In case the PHY needs to be in mdio slow mode,
* set slow mode and try to get the PHY id again. * set slow mode and try to get the PHY id again.
*/ */
...@@ -607,7 +609,7 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw) ...@@ -607,7 +609,7 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
nvm->type = e1000_nvm_flash_sw; nvm->type = e1000_nvm_flash_sw;
if (hw->mac.type == e1000_pch_spt) { if (hw->mac.type >= e1000_pch_spt) {
/* in SPT, gfpreg doesn't exist. NVM size is taken from the /* in SPT, gfpreg doesn't exist. NVM size is taken from the
* STRAP register. This is because in SPT the GbE Flash region * STRAP register. This is because in SPT the GbE Flash region
* is no longer accessed through the flash registers. Instead, * is no longer accessed through the flash registers. Instead,
...@@ -715,6 +717,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw) ...@@ -715,6 +717,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
/* fall-through */ /* fall-through */
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
case e1000_pchlan: case e1000_pchlan:
/* check management mode */ /* check management mode */
mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan; mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
...@@ -732,7 +735,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw) ...@@ -732,7 +735,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
break; break;
} }
if ((mac->type == e1000_pch_lpt) || (mac->type == e1000_pch_spt)) { if (mac->type >= e1000_pch_lpt) {
mac->rar_entry_count = E1000_PCH_LPT_RAR_ENTRIES; mac->rar_entry_count = E1000_PCH_LPT_RAR_ENTRIES;
mac->ops.rar_set = e1000_rar_set_pch_lpt; mac->ops.rar_set = e1000_rar_set_pch_lpt;
mac->ops.setup_physical_interface = mac->ops.setup_physical_interface =
...@@ -1399,9 +1402,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) ...@@ -1399,9 +1402,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
* aggressive resulting in many collisions. To avoid this, increase * aggressive resulting in many collisions. To avoid this, increase
* the IPG and reduce Rx latency in the PHY. * the IPG and reduce Rx latency in the PHY.
*/ */
if (((hw->mac.type == e1000_pch2lan) || if ((hw->mac.type >= e1000_pch2lan) && link) {
(hw->mac.type == e1000_pch_lpt) ||
(hw->mac.type == e1000_pch_spt)) && link) {
u16 speed, duplex; u16 speed, duplex;
e1000e_get_speed_and_duplex_copper(hw, &speed, &duplex); e1000e_get_speed_and_duplex_copper(hw, &speed, &duplex);
...@@ -1412,7 +1413,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) ...@@ -1412,7 +1413,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
tipg_reg |= 0xFF; tipg_reg |= 0xFF;
/* Reduce Rx latency in analog PHY */ /* Reduce Rx latency in analog PHY */
emi_val = 0; emi_val = 0;
} else if (hw->mac.type == e1000_pch_spt && } else if (hw->mac.type >= e1000_pch_spt &&
duplex == FULL_DUPLEX && speed != SPEED_1000) { duplex == FULL_DUPLEX && speed != SPEED_1000) {
tipg_reg |= 0xC; tipg_reg |= 0xC;
emi_val = 1; emi_val = 1;
...@@ -1435,8 +1436,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) ...@@ -1435,8 +1436,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
emi_addr = I217_RX_CONFIG; emi_addr = I217_RX_CONFIG;
ret_val = e1000_write_emi_reg_locked(hw, emi_addr, emi_val); ret_val = e1000_write_emi_reg_locked(hw, emi_addr, emi_val);
if (hw->mac.type == e1000_pch_lpt || if (hw->mac.type >= e1000_pch_lpt) {
hw->mac.type == e1000_pch_spt) {
u16 phy_reg; u16 phy_reg;
e1e_rphy_locked(hw, I217_PLL_CLOCK_GATE_REG, &phy_reg); e1e_rphy_locked(hw, I217_PLL_CLOCK_GATE_REG, &phy_reg);
...@@ -1452,7 +1452,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) ...@@ -1452,7 +1452,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
if (ret_val) if (ret_val)
return ret_val; return ret_val;
if (hw->mac.type == e1000_pch_spt) { if (hw->mac.type >= e1000_pch_spt) {
u16 data; u16 data;
u16 ptr_gap; u16 ptr_gap;
...@@ -1502,7 +1502,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) ...@@ -1502,7 +1502,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
* on power up. * on power up.
* Set the Beacon Duration for I217 to 8 usec * Set the Beacon Duration for I217 to 8 usec
*/ */
if ((hw->mac.type == e1000_pch_lpt) || (hw->mac.type == e1000_pch_spt)) { if (hw->mac.type >= e1000_pch_lpt) {
u32 mac_reg; u32 mac_reg;
mac_reg = er32(FEXTNVM4); mac_reg = er32(FEXTNVM4);
...@@ -1520,8 +1520,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) ...@@ -1520,8 +1520,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
if (ret_val) if (ret_val)
return ret_val; return ret_val;
} }
if ((hw->mac.type == e1000_pch_lpt) || if (hw->mac.type >= e1000_pch_lpt) {
(hw->mac.type == e1000_pch_spt)) {
/* Set platform power management values for /* Set platform power management values for
* Latency Tolerance Reporting (LTR) * Latency Tolerance Reporting (LTR)
*/ */
...@@ -1533,15 +1532,18 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) ...@@ -1533,15 +1532,18 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
/* Clear link partner's EEE ability */ /* Clear link partner's EEE ability */
hw->dev_spec.ich8lan.eee_lp_ability = 0; hw->dev_spec.ich8lan.eee_lp_ability = 0;
/* FEXTNVM6 K1-off workaround */ if (hw->mac.type >= e1000_pch_lpt) {
if (hw->mac.type == e1000_pch_spt) {
u32 pcieanacfg = er32(PCIEANACFG);
u32 fextnvm6 = er32(FEXTNVM6); u32 fextnvm6 = er32(FEXTNVM6);
if (pcieanacfg & E1000_FEXTNVM6_K1_OFF_ENABLE) if (hw->mac.type == e1000_pch_spt) {
fextnvm6 |= E1000_FEXTNVM6_K1_OFF_ENABLE; /* FEXTNVM6 K1-off workaround - for SPT only */
else u32 pcieanacfg = er32(PCIEANACFG);
fextnvm6 &= ~E1000_FEXTNVM6_K1_OFF_ENABLE;
if (pcieanacfg & E1000_FEXTNVM6_K1_OFF_ENABLE)
fextnvm6 |= E1000_FEXTNVM6_K1_OFF_ENABLE;
else
fextnvm6 &= ~E1000_FEXTNVM6_K1_OFF_ENABLE;
}
ew32(FEXTNVM6, fextnvm6); ew32(FEXTNVM6, fextnvm6);
} }
...@@ -1640,6 +1642,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) ...@@ -1640,6 +1642,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
case e1000_pch2lan: case e1000_pch2lan:
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
rc = e1000_init_phy_params_pchlan(hw); rc = e1000_init_phy_params_pchlan(hw);
break; break;
default: default:
...@@ -2091,6 +2094,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw) ...@@ -2091,6 +2094,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
case e1000_pch2lan: case e1000_pch2lan:
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M; sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
break; break;
default: default:
...@@ -3125,6 +3129,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank) ...@@ -3125,6 +3129,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
switch (hw->mac.type) { switch (hw->mac.type) {
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
bank1_offset = nvm->flash_bank_size; bank1_offset = nvm->flash_bank_size;
act_offset = E1000_ICH_NVM_SIG_WORD; act_offset = E1000_ICH_NVM_SIG_WORD;
...@@ -3380,7 +3385,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw) ...@@ -3380,7 +3385,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
/* Clear FCERR and DAEL in hw status by writing 1 */ /* Clear FCERR and DAEL in hw status by writing 1 */
hsfsts.hsf_status.flcerr = 1; hsfsts.hsf_status.flcerr = 1;
hsfsts.hsf_status.dael = 1; hsfsts.hsf_status.dael = 1;
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
ew32flash(ICH_FLASH_HSFSTS, hsfsts.regval & 0xFFFF); ew32flash(ICH_FLASH_HSFSTS, hsfsts.regval & 0xFFFF);
else else
ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval); ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
...@@ -3399,7 +3404,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw) ...@@ -3399,7 +3404,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
* Begin by setting Flash Cycle Done. * Begin by setting Flash Cycle Done.
*/ */
hsfsts.hsf_status.flcdone = 1; hsfsts.hsf_status.flcdone = 1;
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
ew32flash(ICH_FLASH_HSFSTS, hsfsts.regval & 0xFFFF); ew32flash(ICH_FLASH_HSFSTS, hsfsts.regval & 0xFFFF);
else else
ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval); ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
...@@ -3423,7 +3428,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw) ...@@ -3423,7 +3428,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
* now set the Flash Cycle Done. * now set the Flash Cycle Done.
*/ */
hsfsts.hsf_status.flcdone = 1; hsfsts.hsf_status.flcdone = 1;
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
ew32flash(ICH_FLASH_HSFSTS, ew32flash(ICH_FLASH_HSFSTS,
hsfsts.regval & 0xFFFF); hsfsts.regval & 0xFFFF);
else else
...@@ -3450,13 +3455,13 @@ static s32 e1000_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout) ...@@ -3450,13 +3455,13 @@ static s32 e1000_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout)
u32 i = 0; u32 i = 0;
/* Start a cycle by writing 1 in Flash Cycle Go in Hw Flash Control */ /* Start a cycle by writing 1 in Flash Cycle Go in Hw Flash Control */
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
hsflctl.regval = er32flash(ICH_FLASH_HSFSTS) >> 16; hsflctl.regval = er32flash(ICH_FLASH_HSFSTS) >> 16;
else else
hsflctl.regval = er16flash(ICH_FLASH_HSFCTL); hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
hsflctl.hsf_ctrl.flcgo = 1; hsflctl.hsf_ctrl.flcgo = 1;
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
ew32flash(ICH_FLASH_HSFSTS, hsflctl.regval << 16); ew32flash(ICH_FLASH_HSFSTS, hsflctl.regval << 16);
else else
ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval); ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
...@@ -3527,7 +3532,7 @@ static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -3527,7 +3532,7 @@ static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
/* In SPT, only 32 bits access is supported, /* In SPT, only 32 bits access is supported,
* so this function should not be called. * so this function should not be called.
*/ */
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
return -E1000_ERR_NVM; return -E1000_ERR_NVM;
else else
ret_val = e1000_read_flash_data_ich8lan(hw, offset, 1, &word); ret_val = e1000_read_flash_data_ich8lan(hw, offset, 1, &word);
...@@ -3634,8 +3639,7 @@ static s32 e1000_read_flash_data32_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -3634,8 +3639,7 @@ static s32 e1000_read_flash_data32_ich8lan(struct e1000_hw *hw, u32 offset,
s32 ret_val = -E1000_ERR_NVM; s32 ret_val = -E1000_ERR_NVM;
u8 count = 0; u8 count = 0;
if (offset > ICH_FLASH_LINEAR_ADDR_MASK || if (offset > ICH_FLASH_LINEAR_ADDR_MASK || hw->mac.type < e1000_pch_spt)
hw->mac.type != e1000_pch_spt)
return -E1000_ERR_NVM; return -E1000_ERR_NVM;
flash_linear_addr = ((ICH_FLASH_LINEAR_ADDR_MASK & offset) + flash_linear_addr = ((ICH_FLASH_LINEAR_ADDR_MASK & offset) +
hw->nvm.flash_base_addr); hw->nvm.flash_base_addr);
...@@ -4068,6 +4072,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw) ...@@ -4068,6 +4072,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
switch (hw->mac.type) { switch (hw->mac.type) {
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
word = NVM_COMPAT; word = NVM_COMPAT;
valid_csum_mask = NVM_COMPAT_VALID_CSUM; valid_csum_mask = NVM_COMPAT_VALID_CSUM;
break; break;
...@@ -4153,7 +4158,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -4153,7 +4158,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
s32 ret_val; s32 ret_val;
u8 count = 0; u8 count = 0;
if (hw->mac.type == e1000_pch_spt) { if (hw->mac.type >= e1000_pch_spt) {
if (size != 4 || offset > ICH_FLASH_LINEAR_ADDR_MASK) if (size != 4 || offset > ICH_FLASH_LINEAR_ADDR_MASK)
return -E1000_ERR_NVM; return -E1000_ERR_NVM;
} else { } else {
...@@ -4173,7 +4178,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -4173,7 +4178,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
/* In SPT, This register is in Lan memory space, not /* In SPT, This register is in Lan memory space, not
* flash. Therefore, only 32 bit access is supported * flash. Therefore, only 32 bit access is supported
*/ */
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
hsflctl.regval = er32flash(ICH_FLASH_HSFSTS) >> 16; hsflctl.regval = er32flash(ICH_FLASH_HSFSTS) >> 16;
else else
hsflctl.regval = er16flash(ICH_FLASH_HSFCTL); hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
...@@ -4185,7 +4190,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -4185,7 +4190,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
* not flash. Therefore, only 32 bit access is * not flash. Therefore, only 32 bit access is
* supported * supported
*/ */
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
ew32flash(ICH_FLASH_HSFSTS, hsflctl.regval << 16); ew32flash(ICH_FLASH_HSFSTS, hsflctl.regval << 16);
else else
ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval); ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
...@@ -4243,7 +4248,7 @@ static s32 e1000_write_flash_data32_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -4243,7 +4248,7 @@ static s32 e1000_write_flash_data32_ich8lan(struct e1000_hw *hw, u32 offset,
s32 ret_val; s32 ret_val;
u8 count = 0; u8 count = 0;
if (hw->mac.type == e1000_pch_spt) { if (hw->mac.type >= e1000_pch_spt) {
if (offset > ICH_FLASH_LINEAR_ADDR_MASK) if (offset > ICH_FLASH_LINEAR_ADDR_MASK)
return -E1000_ERR_NVM; return -E1000_ERR_NVM;
} }
...@@ -4259,7 +4264,7 @@ static s32 e1000_write_flash_data32_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -4259,7 +4264,7 @@ static s32 e1000_write_flash_data32_ich8lan(struct e1000_hw *hw, u32 offset,
/* In SPT, This register is in Lan memory space, not /* In SPT, This register is in Lan memory space, not
* flash. Therefore, only 32 bit access is supported * flash. Therefore, only 32 bit access is supported
*/ */
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
hsflctl.regval = er32flash(ICH_FLASH_HSFSTS) hsflctl.regval = er32flash(ICH_FLASH_HSFSTS)
>> 16; >> 16;
else else
...@@ -4272,7 +4277,7 @@ static s32 e1000_write_flash_data32_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -4272,7 +4277,7 @@ static s32 e1000_write_flash_data32_ich8lan(struct e1000_hw *hw, u32 offset,
* not flash. Therefore, only 32 bit access is * not flash. Therefore, only 32 bit access is
* supported * supported
*/ */
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
ew32flash(ICH_FLASH_HSFSTS, hsflctl.regval << 16); ew32flash(ICH_FLASH_HSFSTS, hsflctl.regval << 16);
else else
ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval); ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
...@@ -4464,14 +4469,14 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank) ...@@ -4464,14 +4469,14 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
/* Write a value 11 (block Erase) in Flash /* Write a value 11 (block Erase) in Flash
* Cycle field in hw flash control * Cycle field in hw flash control
*/ */
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
hsflctl.regval = hsflctl.regval =
er32flash(ICH_FLASH_HSFSTS) >> 16; er32flash(ICH_FLASH_HSFSTS) >> 16;
else else
hsflctl.regval = er16flash(ICH_FLASH_HSFCTL); hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_ERASE; hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_ERASE;
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
ew32flash(ICH_FLASH_HSFSTS, ew32flash(ICH_FLASH_HSFSTS,
hsflctl.regval << 16); hsflctl.regval << 16);
else else
...@@ -4894,8 +4899,7 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw) ...@@ -4894,8 +4899,7 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
ew32(RFCTL, reg); ew32(RFCTL, reg);
/* Enable ECC on Lynxpoint */ /* Enable ECC on Lynxpoint */
if ((hw->mac.type == e1000_pch_lpt) || if (hw->mac.type >= e1000_pch_lpt) {
(hw->mac.type == e1000_pch_spt)) {
reg = er32(PBECCSTS); reg = er32(PBECCSTS);
reg |= E1000_PBECCSTS_ECC_ENABLE; reg |= E1000_PBECCSTS_ECC_ENABLE;
ew32(PBECCSTS, reg); ew32(PBECCSTS, reg);
...@@ -5299,7 +5303,7 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw) ...@@ -5299,7 +5303,7 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
(device_id == E1000_DEV_ID_PCH_LPTLP_I218_V) || (device_id == E1000_DEV_ID_PCH_LPTLP_I218_V) ||
(device_id == E1000_DEV_ID_PCH_I218_LM3) || (device_id == E1000_DEV_ID_PCH_I218_LM3) ||
(device_id == E1000_DEV_ID_PCH_I218_V3) || (device_id == E1000_DEV_ID_PCH_I218_V3) ||
(hw->mac.type == e1000_pch_spt)) { (hw->mac.type >= e1000_pch_spt)) {
u32 fextnvm6 = er32(FEXTNVM6); u32 fextnvm6 = er32(FEXTNVM6);
ew32(FEXTNVM6, fextnvm6 & ~E1000_FEXTNVM6_REQ_PLL_CLK); ew32(FEXTNVM6, fextnvm6 & ~E1000_FEXTNVM6_REQ_PLL_CLK);
......
drivers/net/ethernet/intel/e1000e/netdev.c
View file @ c8744f44
...@@ -1792,8 +1792,7 @@ static irqreturn_t e1000_intr_msi(int __always_unused irq, void *data) ...@@ -1792,8 +1792,7 @@ static irqreturn_t e1000_intr_msi(int __always_unused irq, void *data)
} }
/* Reset on uncorrectable ECC error */ /* Reset on uncorrectable ECC error */
if ((icr & E1000_ICR_ECCER) && ((hw->mac.type == e1000_pch_lpt) || if ((icr & E1000_ICR_ECCER) && (hw->mac.type >= e1000_pch_lpt)) {
(hw->mac.type == e1000_pch_spt))) {
u32 pbeccsts = er32(PBECCSTS); u32 pbeccsts = er32(PBECCSTS);
adapter->corr_errors += adapter->corr_errors +=
...@@ -1873,8 +1872,7 @@ static irqreturn_t e1000_intr(int __always_unused irq, void *data) ...@@ -1873,8 +1872,7 @@ static irqreturn_t e1000_intr(int __always_unused irq, void *data)
} }
/* Reset on uncorrectable ECC error */ /* Reset on uncorrectable ECC error */
if ((icr & E1000_ICR_ECCER) && ((hw->mac.type == e1000_pch_lpt) || if ((icr & E1000_ICR_ECCER) && (hw->mac.type >= e1000_pch_lpt)) {
(hw->mac.type == e1000_pch_spt))) {
u32 pbeccsts = er32(PBECCSTS); u32 pbeccsts = er32(PBECCSTS);
adapter->corr_errors += adapter->corr_errors +=
...@@ -2242,8 +2240,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter) ...@@ -2242,8 +2240,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
if (adapter->msix_entries) { if (adapter->msix_entries) {
ew32(EIAC_82574, adapter->eiac_mask & E1000_EIAC_MASK_82574); ew32(EIAC_82574, adapter->eiac_mask & E1000_EIAC_MASK_82574);
ew32(IMS, adapter->eiac_mask | E1000_IMS_LSC); ew32(IMS, adapter->eiac_mask | E1000_IMS_LSC);
} else if ((hw->mac.type == e1000_pch_lpt) || } else if (hw->mac.type >= e1000_pch_lpt) {
(hw->mac.type == e1000_pch_spt)) {
ew32(IMS, IMS_ENABLE_MASK | E1000_IMS_ECCER); ew32(IMS, IMS_ENABLE_MASK | E1000_IMS_ECCER);
} else { } else {
ew32(IMS, IMS_ENABLE_MASK); ew32(IMS, IMS_ENABLE_MASK);
...@@ -3001,8 +2998,8 @@ static void e1000_configure_tx(struct e1000_adapter *adapter) ...@@ -3001,8 +2998,8 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
hw->mac.ops.config_collision_dist(hw); hw->mac.ops.config_collision_dist(hw);
/* SPT Si errata workaround to avoid data corruption */ /* SPT and CNP Si errata workaround to avoid data corruption */
if (hw->mac.type == e1000_pch_spt) { if (hw->mac.type >= e1000_pch_spt) {
u32 reg_val; u32 reg_val;
reg_val = er32(IOSFPC); reg_val = er32(IOSFPC);
...@@ -3498,8 +3495,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca) ...@@ -3498,8 +3495,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)
/* Make sure clock is enabled on I217/I218/I219 before checking /* Make sure clock is enabled on I217/I218/I219 before checking
* the frequency * the frequency
*/ */
if (((hw->mac.type == e1000_pch_lpt) || if ((hw->mac.type >= e1000_pch_lpt) &&
(hw->mac.type == e1000_pch_spt)) &&
!(er32(TSYNCTXCTL) & E1000_TSYNCTXCTL_ENABLED) && !(er32(TSYNCTXCTL) & E1000_TSYNCTXCTL_ENABLED) &&
!(er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_ENABLED)) { !(er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_ENABLED)) {
u32 fextnvm7 = er32(FEXTNVM7); u32 fextnvm7 = er32(FEXTNVM7);
...@@ -4039,6 +4035,7 @@ void e1000e_reset(struct e1000_adapter *adapter) ...@@ -4039,6 +4035,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
case e1000_pch2lan: case e1000_pch2lan:
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
case e1000_pch_cnp:
fc->refresh_time = 0x0400; fc->refresh_time = 0x0400;
if (adapter->netdev->mtu <= ETH_DATA_LEN) { if (adapter->netdev->mtu <= ETH_DATA_LEN) {
...@@ -4083,7 +4080,7 @@ void e1000e_reset(struct e1000_adapter *adapter) ...@@ -4083,7 +4080,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
} }
} }
if (hw->mac.type == e1000_pch_spt) if (hw->mac.type >= e1000_pch_spt)
e1000_flush_desc_rings(adapter); e1000_flush_desc_rings(adapter);
/* Allow time for pending master requests to run */ /* Allow time for pending master requests to run */
mac->ops.reset_hw(hw); mac->ops.reset_hw(hw);
...@@ -4158,7 +4155,7 @@ void e1000e_reset(struct e1000_adapter *adapter) ...@@ -4158,7 +4155,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
phy_data &= ~IGP02E1000_PM_SPD; phy_data &= ~IGP02E1000_PM_SPD;
e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, phy_data); e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, phy_data);
} }
if (hw->mac.type == e1000_pch_spt && adapter->int_mode == 0) { if (hw->mac.type >= e1000_pch_spt && adapter->int_mode == 0) {
u32 reg; u32 reg;
/* Fextnvm7 @ 0xe4[2] = 1 */ /* Fextnvm7 @ 0xe4[2] = 1 */
...@@ -4292,7 +4289,7 @@ void e1000e_down(struct e1000_adapter *adapter, bool reset) ...@@ -4292,7 +4289,7 @@ void e1000e_down(struct e1000_adapter *adapter, bool reset)
if (!pci_channel_offline(adapter->pdev)) { if (!pci_channel_offline(adapter->pdev)) {
if (reset) if (reset)
e1000e_reset(adapter); e1000e_reset(adapter);
else if (hw->mac.type == e1000_pch_spt) else if (hw->mac.type >= e1000_pch_spt)
e1000_flush_desc_rings(adapter); e1000_flush_desc_rings(adapter);
} }
e1000_clean_tx_ring(adapter->tx_ring); e1000_clean_tx_ring(adapter->tx_ring);
...@@ -4980,8 +4977,7 @@ static void e1000e_update_stats(struct e1000_adapter *adapter) ...@@ -4980,8 +4977,7 @@ static void e1000e_update_stats(struct e1000_adapter *adapter)
adapter->stats.mgpdc += er32(MGTPDC); adapter->stats.mgpdc += er32(MGTPDC);
/* Correctable ECC Errors */ /* Correctable ECC Errors */
if ((hw->mac.type == e1000_pch_lpt) || if (hw->mac.type >= e1000_pch_lpt) {
(hw->mac.type == e1000_pch_spt)) {
u32 pbeccsts = er32(PBECCSTS); u32 pbeccsts = er32(PBECCSTS);
adapter->corr_errors += adapter->corr_errors +=
...@@ -6355,8 +6351,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) ...@@ -6355,8 +6351,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
if (adapter->hw.phy.type == e1000_phy_igp_3) { if (adapter->hw.phy.type == e1000_phy_igp_3) {
e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw); e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
} else if ((hw->mac.type == e1000_pch_lpt) || } else if (hw->mac.type >= e1000_pch_lpt) {
(hw->mac.type == e1000_pch_spt)) {
if (!(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC))) if (!(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC)))
/* ULP does not support wake from unicast, multicast /* ULP does not support wake from unicast, multicast
* or broadcast. * or broadcast.
......
drivers/net/ethernet/intel/e1000e/ptp.c
View file @ c8744f44
...@@ -301,8 +301,8 @@ void e1000e_ptp_init(struct e1000_adapter *adapter) ...@@ -301,8 +301,8 @@ void e1000e_ptp_init(struct e1000_adapter *adapter)
case e1000_pch2lan: case e1000_pch2lan:
case e1000_pch_lpt: case e1000_pch_lpt:
case e1000_pch_spt: case e1000_pch_spt:
if (((hw->mac.type != e1000_pch_lpt) && case e1000_pch_cnp:
(hw->mac.type != e1000_pch_spt)) || if ((hw->mac.type < e1000_pch_lpt) ||
(er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)) { (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)) {
adapter->ptp_clock_info.max_adj = 24000000 - 1; adapter->ptp_clock_info.max_adj = 24000000 - 1;
break; break;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7