microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

ixgbe: remove SFP ixfi support 

Remove SFP ixfi code since there is no HW that currently supports it.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Emil Tantilov 2016-10-03 17:09:58 -07:00 коммит произвёл Jeff Kirsher
Родитель 1fa7125277
Коммит 812d7dff10
1 изменённых файлов: 11 добавлений и 65 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

76
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
Просмотреть файл

@ -1313,7 +1313,7 @@ ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
__always_unused bool autoneg_wait_to_complete) __always_unused bool autoneg_wait_to_complete)
{ {
s32 status; s32 status;
u16 slice, value; u16 reg_slice, reg_val;
bool setup_linear = false; bool setup_linear = false;
/* Check if SFP module is supported and linear */ /* Check if SFP module is supported and linear */
@ -1329,71 +1329,17 @@ ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
if (status) if (status)
return status; return status;
if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) { /* Configure internal PHY for KR/KX. */
/* Configure CS4227 LINE side to 10G SR. */ ixgbe_setup_kr_speed_x550em(hw, speed);
slice = IXGBE_CS4227_LINE_SPARE22_MSB + (hw->bus.lan_id << 12);
value = IXGBE_CS4227_SPEED_10G;
status = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,
slice, value);
if (status)
goto i2c_err;
slice = IXGBE_CS4227_LINE_SPARE24_LSB + (hw->bus.lan_id << 12); /* Configure CS4227 LINE side to proper mode. */
value = (IXGBE_CS4227_EDC_MODE_SR << 1) | 1; reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB + (hw->bus.lan_id << 12);
status = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227, if (setup_linear)
slice, value); reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
if (status) else
goto i2c_err; reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
status = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,
/* Configure CS4227 for HOST connection rate then type. */ reg_slice, reg_val);
slice = IXGBE_CS4227_HOST_SPARE22_MSB + (hw->bus.lan_id << 12);
value = speed & IXGBE_LINK_SPEED_10GB_FULL ?
IXGBE_CS4227_SPEED_10G : IXGBE_CS4227_SPEED_1G;
status = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,
slice, value);
if (status)
goto i2c_err;
slice = IXGBE_CS4227_HOST_SPARE24_LSB + (hw->bus.lan_id << 12);
if (setup_linear)
value = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 1;
else
value = (IXGBE_CS4227_EDC_MODE_SR << 1) | 1;
status = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,
slice, value);
if (status)
goto i2c_err;
/* Setup XFI internal link. */
status = ixgbe_setup_ixfi_x550em(hw, &speed);
if (status) {
hw_dbg(hw, "setup_ixfi failed with %d\n", status);
return status;
}
} else {
/* Configure internal PHY for KR/KX. */
status = ixgbe_setup_kr_speed_x550em(hw, speed);
if (status) {
hw_dbg(hw, "setup_kr_speed failed with %d\n", status);
return status;
}
/* Configure CS4227 LINE side to proper mode. */
slice = IXGBE_CS4227_LINE_SPARE24_LSB + (hw->bus.lan_id << 12);
if (setup_linear)
value = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 1;
else
value = (IXGBE_CS4227_EDC_MODE_SR << 1) | 1;
status = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,
slice, value);
if (status)
goto i2c_err;
}
return 0;
i2c_err:
hw_dbg(hw, "combined i2c access failed with %d\n", status);
return status; return status;
} }