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

Commit 9a75a1ac authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: Add new support for X550 MAC's 



This patch will add in the new MAC defines and fit it into the switch
cases throughout the driver.  New functionality and enablement support will
be added in following patches.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8d697e7e

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

+21 −9
Original line number Diff line number Diff line
@@ -2799,6 +2799,8 @@ u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw) 
		break;

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		pcie_offset = IXGBE_PCIE_MSIX_82599_CAPS;

		max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599;

		break;
@@ -3192,17 +3194,27 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, 
			*link_up = false;

	}



	if ((links_reg & IXGBE_LINKS_SPEED_82599) ==

	    IXGBE_LINKS_SPEED_10G_82599)

	switch (links_reg & IXGBE_LINKS_SPEED_82599) {

	case IXGBE_LINKS_SPEED_10G_82599:

		if ((hw->mac.type >= ixgbe_mac_X550) &&

		    (links_reg & IXGBE_LINKS_SPEED_NON_STD))

			*speed = IXGBE_LINK_SPEED_2_5GB_FULL;

		else

			*speed = IXGBE_LINK_SPEED_10GB_FULL;

	else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==

		 IXGBE_LINKS_SPEED_1G_82599)

		break;

	case IXGBE_LINKS_SPEED_1G_82599:

		*speed = IXGBE_LINK_SPEED_1GB_FULL;

	else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==

		 IXGBE_LINKS_SPEED_100_82599)

		*speed = IXGBE_LINK_SPEED_100_FULL;

		break;

	case IXGBE_LINKS_SPEED_100_82599:

		if ((hw->mac.type >= ixgbe_mac_X550) &&

		    (links_reg & IXGBE_LINKS_SPEED_NON_STD))

			*speed = IXGBE_LINK_SPEED_5GB_FULL;

		else

			*speed = IXGBE_LINK_SPEED_100_FULL;

		break;

	default:

		*speed = IXGBE_LINK_SPEED_UNKNOWN;

	}



	return 0;

}

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

+8 −0
Original line number Diff line number Diff line
@@ -286,6 +286,8 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw, 
						 bwgid, ptype);

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		return ixgbe_dcb_hw_config_82599(hw, pfc_en, refill, max,

						 bwgid, ptype, prio_tc);

	default:
@@ -302,6 +304,8 @@ s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en, u8 *prio_tc) 
		return ixgbe_dcb_config_pfc_82598(hw, pfc_en);

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		return ixgbe_dcb_config_pfc_82599(hw, pfc_en, prio_tc);

	default:

		break;
@@ -357,6 +361,8 @@ s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw, 
		break;

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		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,
@@ -385,6 +391,8 @@ void ixgbe_dcb_read_rtrup2tc(struct ixgbe_hw *hw, u8 *map) 
	switch (hw->mac.type) {

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		ixgbe_dcb_read_rtrup2tc_82599(hw, map);

		break;

	default:

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

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev, 
	switch (adapter->hw.mac.type) {

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

		for (j = 0; j < netdev->addr_len; j++, i++)

			perm_addr[i] = adapter->hw.mac.san_addr[j];

		break;

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

+32 −5
Original line number Diff line number Diff line
@@ -511,6 +511,8 @@ static void ixgbe_get_regs(struct net_device *netdev, 
			break;

		case ixgbe_mac_82599EB:

		case ixgbe_mac_X540:

		case ixgbe_mac_X550:

		case ixgbe_mac_X550EM_x:

			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;
@@ -622,6 +624,8 @@ static void ixgbe_get_regs(struct net_device *netdev, 
		break;

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

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

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

		for (i = 0; i < 8; i++)
@@ -1406,6 +1410,8 @@ static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data) 
		break;

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		toggle = 0x7FFFF30F;

		test = reg_test_82599;

		break;
@@ -1644,6 +1650,8 @@ static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter) 
	switch (hw->mac.type) {

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		reg_ctl = IXGBE_READ_REG(hw, IXGBE_DMATXCTL);

		reg_ctl &= ~IXGBE_DMATXCTL_TE;

		IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, reg_ctl);
@@ -1680,6 +1688,8 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
	switch (adapter->hw.mac.type) {

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

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

		reg_data |= IXGBE_DMATXCTL_TE;

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_DMATXCTL, reg_data);
@@ -1733,12 +1743,16 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter) 
	reg_data |= IXGBE_FCTRL_BAM | IXGBE_FCTRL_SBP | IXGBE_FCTRL_MPE;

	IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg_data);



	/* X540 needs to set the MACC.FLU bit to force link up */

	if (adapter->hw.mac.type == ixgbe_mac_X540) {

	/* X540 and X550 needs to set the MACC.FLU bit to force link up */

	switch (adapter->hw.mac.type) {

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		reg_data = IXGBE_READ_REG(hw, IXGBE_MACC);

		reg_data |= IXGBE_MACC_FLU;

		IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data);

	} else {

		break;

	default:

		if (hw->mac.orig_autoc) {

			reg_data = hw->mac.orig_autoc | IXGBE_AUTOC_FLU;

			IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_data);
@@ -2776,7 +2790,14 @@ static int ixgbe_set_rss_hash_opt(struct ixgbe_adapter *adapter, 
	/* if we changed something we need to update flags */

	if (flags2 != adapter->flags2) {

		struct ixgbe_hw *hw = &adapter->hw;

		u32 mrqc = IXGBE_READ_REG(hw, IXGBE_MRQC);

		u32 mrqc;

		unsigned int pf_pool = adapter->num_vfs;



		if ((hw->mac.type >= ixgbe_mac_X550) &&

		    (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))

			mrqc = IXGBE_READ_REG(hw, IXGBE_PFVFMRQC(pf_pool));

		else

			mrqc = IXGBE_READ_REG(hw, IXGBE_MRQC);



		if ((flags2 & UDP_RSS_FLAGS) &&

		    !(adapter->flags2 & UDP_RSS_FLAGS))
@@ -2799,6 +2820,10 @@ static int ixgbe_set_rss_hash_opt(struct ixgbe_adapter *adapter, 
		if (flags2 & IXGBE_FLAG2_RSS_FIELD_IPV6_UDP)

			mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP;



		if ((hw->mac.type >= ixgbe_mac_X550) &&

		    (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))

			IXGBE_WRITE_REG(hw, IXGBE_PFVFMRQC(pf_pool), mrqc);

		else

			IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);

	}
@@ -2833,6 +2858,8 @@ static int ixgbe_get_ts_info(struct net_device *dev, 
	struct ixgbe_adapter *adapter = netdev_priv(dev);



	switch (adapter->hw.mac.type) {

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_X540:

	case ixgbe_mac_82599EB:

		info->so_timestamping =

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

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ static void ixgbe_get_first_reg_idx(struct ixgbe_adapter *adapter, u8 tc, 
		break;

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

		if (num_tcs > 4) {

			/*

			 * TCs    : TC0/1 TC2/3 TC4-7