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

Commit e8915beb authored by Amir Hanania's avatar Amir Hanania Committed by Jeff Kirsher
Browse files

IXGBE: Set the SW prio_tc values at initialization to the HW setting. 



Set the SW prio_tc values at initialization to the HW setting.
Setting the SW prio_tc default values to be the HW setting by reading the
rtrup2tc register. For any TC change we need to reset the device.
This will remove the need to reset the device at the first
time we call ixgbe_dcbnl_ieee_setets.

Signed-off-by: default avatarAmir Hanania <amir.hanania@intel.com>
Tested-by: default avatarJack <Morgan&lt;jack.morgan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f7727c53

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

+23 −0
Original line number Original line Diff line number Diff line
@@ -380,3 +380,26 @@ s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw, 
	}

	}

	return 0;

	return 0;

}

}



static void ixgbe_dcb_read_rtrup2tc_82599(struct ixgbe_hw *hw, u8 *map)

{

	u32 reg, i;



	reg = IXGBE_READ_REG(hw, IXGBE_RTRUP2TC);

	for (i = 0; i < MAX_USER_PRIORITY; i++)

		map[i] = IXGBE_RTRUP2TC_UP_MASK &

			(reg >> (i * IXGBE_RTRUP2TC_UP_SHIFT));

	return;

}



void ixgbe_dcb_read_rtrup2tc(struct ixgbe_hw *hw, u8 *map)

{

	switch (hw->mac.type) {

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

		ixgbe_dcb_read_rtrup2tc_82599(hw, map);

		break;

	default:

		break;

	}

}

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -159,6 +159,8 @@ s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw, u16 *refill, u16 *max, 
s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en, u8 *tc_prio);

s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en, u8 *tc_prio);

s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, struct ixgbe_dcb_config *);

s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, struct ixgbe_dcb_config *);





void ixgbe_dcb_read_rtrup2tc(struct ixgbe_hw *hw, u8 *map);



/* DCB definitions for credit calculation */

/* DCB definitions for credit calculation */

#define DCB_CREDIT_QUANTUM	64   /* DCB Quantum */

#define DCB_CREDIT_QUANTUM	64   /* DCB Quantum */

#define MAX_CREDIT_REFILL       511  /* 0x1FF * 64B = 32704B */

#define MAX_CREDIT_REFILL       511  /* 0x1FF * 64B = 32704B */

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ 




/* Receive UP2TC mapping */

/* Receive UP2TC mapping */

#define IXGBE_RTRUP2TC_UP_SHIFT 3

#define IXGBE_RTRUP2TC_UP_SHIFT 3

#define IXGBE_RTRUP2TC_UP_MASK	7

/* Transmit UP2TC mapping */

/* Transmit UP2TC mapping */

#define IXGBE_RTTUP2TC_UP_SHIFT 3

#define IXGBE_RTTUP2TC_UP_SHIFT 3

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -554,6 +554,9 @@ static int ixgbe_dcbnl_ieee_setets(struct net_device *dev, 
		for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)

		for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)

			adapter->ixgbe_ieee_ets->prio_tc[i] =

			adapter->ixgbe_ieee_ets->prio_tc[i] =

				IEEE_8021QAZ_MAX_TCS;

				IEEE_8021QAZ_MAX_TCS;

		/* if possible update UP2TC mappings from HW */

		ixgbe_dcb_read_rtrup2tc(&adapter->hw,

					adapter->ixgbe_ieee_ets->prio_tc);

	}

	}





	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {

	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {