On 8/27/2016 4:47 PM, Xiao Wang wrote:
> This patch removes X550em SFP iXFI setup for the drivers since there
> is no released hardware production with SFP iXFI.
XFI?
>
> Signed-off-by: Xiao Wang <xiao.w.wang at intel.com>
> ---
> drivers/net/ixgbe/base/ixgbe_x550.c | 57
> +++++++------------------------------
> 1 file changed, 11 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c
> b/drivers/net/ixgbe/base/ixgbe_x550.c
> index aa6e859..b8fdb00 100644
> --- a/drivers/net/ixgbe/base/ixgbe_x550.c
> +++ b/drivers/net/ixgbe/base/ixgbe_x550.c
> @@ -2460,53 +2460,18 @@ s32 ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw
> *hw,
> if (ret_val != IXGBE_SUCCESS)
> return ret_val;
>
> - if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
> - /* Configure CS4227 LINE side to 10G SR. */
> - reg_slice = IXGBE_CS4227_LINE_SPARE22_MSB +
> - (hw->bus.lan_id << 12);
> - reg_val = IXGBE_CS4227_SPEED_10G;
> - ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
> - reg_val);
> -
> - reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
> - (hw->bus.lan_id << 12);
> + /* Configure internal PHY for KR/KX. */
> + ixgbe_setup_kr_speed_x550em(hw, speed);
> +
> + /* Configure CS4227 LINE side to proper mode. */
> + reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
> + (hw->bus.lan_id << 12);
These lines can join
