Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49425dfc authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Add support for x550em_a 10G MAC type 



Add support for x550em_a 10G MAC type to the ixgbe driver. The new
MAC includes new firmware commands that need to be used to control
PHY and IOSF access, so that support is also added. The interface
supported is a native SFP+ interface.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9a5c27e6

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+3 −0
Original line number Diff line number Diff line
@@ -817,6 +817,7 @@ static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter) 
		return IXGBE_MAX_RSS_INDICES;

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		return IXGBE_MAX_RSS_INDICES_X550;

	default:

		return 0;
@@ -860,6 +861,7 @@ enum ixgbe_boards { 
	board_X540,

	board_X550,

	board_X550EM_x,

	board_x550em_a,

};



extern const struct ixgbe_info ixgbe_82598_info;
@@ -867,6 +869,7 @@ extern const struct ixgbe_info ixgbe_82599_info; 
extern const struct ixgbe_info ixgbe_X540_info;

extern const struct ixgbe_info ixgbe_X550_info;

extern const struct ixgbe_info ixgbe_X550EM_x_info;

extern const struct ixgbe_info ixgbe_x550em_a_info;

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops dcbnl_ops;

#endif

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+1 −0
Original line number Diff line number Diff line
@@ -1633,6 +1633,7 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw, 
	switch (hw->mac.type) {

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		IXGBE_WRITE_REG(hw, IXGBE_FDIRSCTPM, ~fdirtcpm);

		break;

	default:

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+1 −0
Original line number Diff line number Diff line
@@ -2855,6 +2855,7 @@ u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw) 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		pcie_offset = IXGBE_PCIE_MSIX_82599_CAPS;

		max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599;

		break;

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c

+5 −1
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2014 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -293,6 +293,7 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw, 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		return ixgbe_dcb_hw_config_82599(hw, pfc_en, refill, max,

						 bwgid, ptype, prio_tc);

	default:
@@ -311,6 +312,7 @@ s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en, u8 *prio_tc) 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		return ixgbe_dcb_config_pfc_82599(hw, pfc_en, prio_tc);

	default:

		break;
@@ -368,6 +370,7 @@ s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw, 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max,

						  bwg_id, prio_type, prio_tc);

		ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
@@ -398,6 +401,7 @@ void ixgbe_dcb_read_rtrup2tc(struct ixgbe_hw *hw, u8 *map) 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		ixgbe_dcb_read_rtrup2tc_82599(hw, map);

		break;

	default:

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+8 −1
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2014 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -547,6 +547,7 @@ static void ixgbe_get_regs(struct net_device *netdev, 
		case ixgbe_mac_X540:

		case ixgbe_mac_X550:

		case ixgbe_mac_X550EM_x:

		case ixgbe_mac_x550em_a:

			regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTL_82599(i));

			regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH_82599(i));

			break;
@@ -660,6 +661,7 @@ static void ixgbe_get_regs(struct net_device *netdev, 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		regs_buff[830] = IXGBE_READ_REG(hw, IXGBE_RTTDCS);

		regs_buff[832] = IXGBE_READ_REG(hw, IXGBE_RTRPCS);

		for (i = 0; i < 8; i++)
@@ -1443,6 +1445,7 @@ static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data) 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		toggle = 0x7FFFF30F;

		test = reg_test_82599;

		break;
@@ -1681,6 +1684,7 @@ static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter) 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		reg_ctl = IXGBE_READ_REG(hw, IXGBE_DMATXCTL);

		reg_ctl &= ~IXGBE_DMATXCTL_TE;

		IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, reg_ctl);
@@ -1720,6 +1724,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_DMATXCTL);

		reg_data |= IXGBE_DMATXCTL_TE;

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_DMATXCTL, reg_data);
@@ -1780,6 +1785,7 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter) 
	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		reg_data = IXGBE_READ_REG(hw, IXGBE_MACC);

		reg_data |= IXGBE_MACC_FLU;

		IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data);
@@ -2991,6 +2997,7 @@ static int ixgbe_get_ts_info(struct net_device *dev, 
	switch (adapter->hw.mac.type) {

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

	case ixgbe_mac_X540:

	case ixgbe_mac_82599EB:

		info->so_timestamping =