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

Commit 0b0c2b31 authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: Enable flow control pause parameter auto-negotiation support 



This patch enables flow control pause parameters auto-negotiation support
to 82599 based 10G Base-T, backplane devices and multi-speed fiber optics
modules at 1G speed

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a3aeea0e

drivers/net/ixgbe/ixgbe_82598.c

+4 −3
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num) 


	/* Negotiate the fc mode to use */

	ret_val = ixgbe_fc_autoneg(hw);

	if (ret_val)

	if (ret_val == IXGBE_ERR_FLOW_CONTROL)

		goto out;



	/* Disable any previous flow control settings */
@@ -384,10 +384,10 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num) 
	 * 2: Tx flow control is enabled (we can send pause frames but

	 *     we do not support receiving pause frames).

	 * 3: Both Rx and Tx flow control (symmetric) are enabled.

	 * other: Invalid.

#ifdef CONFIG_DCB

	 * 4: Priority Flow Control is enabled.

#endif

	 * other: Invalid.

	 */

	switch (hw->fc.current_mode) {

	case ixgbe_fc_none:
@@ -444,9 +444,10 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num) 
		reg = (rx_pba_size - hw->fc.low_water) << 6;

		if (hw->fc.send_xon)

			reg |= IXGBE_FCRTL_XONE;



		IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num), reg);



		reg = (rx_pba_size - hw->fc.high_water) << 10;

		reg = (rx_pba_size - hw->fc.high_water) << 6;

		reg |= IXGBE_FCRTH_FCEN;



		IXGBE_WRITE_REG(hw, IXGBE_FCRTH(packetbuf_num), reg);

drivers/net/ixgbe/ixgbe_82599.c

+3 −0
Original line number Diff line number Diff line
@@ -772,6 +772,9 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, 


	/* Check to see if speed passed in is supported. */

	hw->mac.ops.get_link_capabilities(hw, &link_capabilities, &autoneg);

	if (status != 0)

		goto out;



	speed &= link_capabilities;



	if (speed == IXGBE_LINK_SPEED_UNKNOWN) {

drivers/net/ixgbe/ixgbe_common.c

+265 −195
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec); 
static void ixgbe_release_eeprom(struct ixgbe_hw *hw);



static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);

static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw);

static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw);

static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw);

static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw);

static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,

			      u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm);

static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);



/**
@@ -1566,7 +1572,7 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num) 
#endif /* CONFIG_DCB */

	/* Negotiate the fc mode to use */

	ret_val = ixgbe_fc_autoneg(hw);

	if (ret_val)

	if (ret_val == IXGBE_ERR_FLOW_CONTROL)

		goto out;



	/* Disable any previous flow control settings */
@@ -1674,12 +1680,13 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num) 
 **/

s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)

{

	s32 ret_val = 0;

	s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;

	ixgbe_link_speed speed;

	u32 pcs_anadv_reg, pcs_lpab_reg, linkstat;

	u32 links2, anlp1_reg, autoc_reg, links;

	bool link_up;



	if (hw->fc.disable_fc_autoneg)

		goto out;



	/*

	 * AN should have completed when the cable was plugged in.

	 * Look for reasons to bail out.  Bail out if:
@@ -1690,108 +1697,113 @@ s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw) 
	 * So use link_up_wait_to_complete=false.

	 */

	hw->mac.ops.check_link(hw, &speed, &link_up, false);



	if (hw->fc.disable_fc_autoneg || (!link_up)) {

		hw->fc.fc_was_autonegged = false;

		hw->fc.current_mode = hw->fc.requested_mode;

	if (!link_up) {

		ret_val = IXGBE_ERR_FLOW_CONTROL;

		goto out;

	}



	/*

	 * On backplane, bail out if

	 * - backplane autoneg was not completed, or if

	 * - we are 82599 and link partner is not AN enabled

	 */

	if (hw->phy.media_type == ixgbe_media_type_backplane) {

		links = IXGBE_READ_REG(hw, IXGBE_LINKS);

		if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {

			hw->fc.fc_was_autonegged = false;

			hw->fc.current_mode = hw->fc.requested_mode;

			goto out;

	switch (hw->phy.media_type) {

	/* Autoneg flow control on fiber adapters */

	case ixgbe_media_type_fiber:

		if (speed == IXGBE_LINK_SPEED_1GB_FULL)

			ret_val = ixgbe_fc_autoneg_fiber(hw);

		break;



	/* Autoneg flow control on backplane adapters */

	case ixgbe_media_type_backplane:

		ret_val = ixgbe_fc_autoneg_backplane(hw);

		break;



	/* Autoneg flow control on copper adapters */

	case ixgbe_media_type_copper:

		if (ixgbe_device_supports_autoneg_fc(hw) == 0)

			ret_val = ixgbe_fc_autoneg_copper(hw);

		break;



	default:

		break;

	}



		if (hw->mac.type == ixgbe_mac_82599EB) {

			links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);

			if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {

out:

	if (ret_val == 0) {

		hw->fc.fc_was_autonegged = true;

	} else {

		hw->fc.fc_was_autonegged = false;

		hw->fc.current_mode = hw->fc.requested_mode;

				goto out;

			}

	}

	return ret_val;

}



/**

 *  ixgbe_fc_autoneg_fiber - Enable flow control on 1 gig fiber

 *  @hw: pointer to hardware structure

 *

 *  Enable flow control according on 1 gig fiber.

 **/

static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)

{

	u32 pcs_anadv_reg, pcs_lpab_reg, linkstat;

	s32 ret_val;



	/*

	 * On multispeed fiber at 1g, bail out if

	 * - link is up but AN did not complete, or if

	 * - link is up and AN completed but timed out

	 */

	if (hw->phy.multispeed_fiber && (speed == IXGBE_LINK_SPEED_1GB_FULL)) {



	linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);

	if (((linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||

	    ((linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {

			hw->fc.fc_was_autonegged = false;

			hw->fc.current_mode = hw->fc.requested_mode;

		ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;

		goto out;

	}



	pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);

	pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);



	ret_val =  ixgbe_negotiate_fc(hw, pcs_anadv_reg,

			       pcs_lpab_reg, IXGBE_PCS1GANA_SYM_PAUSE,

			       IXGBE_PCS1GANA_ASM_PAUSE,

			       IXGBE_PCS1GANA_SYM_PAUSE,

			       IXGBE_PCS1GANA_ASM_PAUSE);



out:

	return ret_val;

}



/**

 *  ixgbe_fc_autoneg_backplane - Enable flow control IEEE clause 37

 *  @hw: pointer to hardware structure

 *

 *  Enable flow control according to IEEE clause 37.

 **/

static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw)

{

	u32 links2, anlp1_reg, autoc_reg, links;

	s32 ret_val;



	/*

	 * Bail out on

	 * - copper or CX4 adapters

	 * - fiber adapters running at 10gig

	 * On backplane, bail out if

	 * - backplane autoneg was not completed, or if

	 * - we are 82599 and link partner is not AN enabled

	 */

	if ((hw->phy.media_type == ixgbe_media_type_copper) ||

	     (hw->phy.media_type == ixgbe_media_type_cx4) ||

	     ((hw->phy.media_type == ixgbe_media_type_fiber) &&

	     (speed == IXGBE_LINK_SPEED_10GB_FULL))) {

	links = IXGBE_READ_REG(hw, IXGBE_LINKS);

	if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {

		hw->fc.fc_was_autonegged = false;

		hw->fc.current_mode = hw->fc.requested_mode;

		ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;

		goto out;

	}



	/*

	 * Read the AN advertisement and LP ability registers and resolve

	 * local flow control settings accordingly

	 */

	if ((speed == IXGBE_LINK_SPEED_1GB_FULL) &&

	    (hw->phy.media_type != ixgbe_media_type_backplane)) {

		pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);

		pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);

		if ((pcs_anadv_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&

		    (pcs_lpab_reg & IXGBE_PCS1GANA_SYM_PAUSE)) {

			/*

			 * Now we need to check if the user selected Rx ONLY

			 * of pause frames.  In this case, we had to advertise

			 * FULL flow control because we could not advertise RX

			 * ONLY. Hence, we must now check to see if we need to

			 * turn OFF the TRANSMISSION of PAUSE frames.

			 */

			if (hw->fc.requested_mode == ixgbe_fc_full) {

				hw->fc.current_mode = ixgbe_fc_full;

				hw_dbg(hw, "Flow Control = FULL.\n");

			} else {

				hw->fc.current_mode = ixgbe_fc_rx_pause;

				hw_dbg(hw, "Flow Control=RX PAUSE only\n");

			}

		} else if (!(pcs_anadv_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&

			   (pcs_anadv_reg & IXGBE_PCS1GANA_ASM_PAUSE) &&

			   (pcs_lpab_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&

			   (pcs_lpab_reg & IXGBE_PCS1GANA_ASM_PAUSE)) {

			hw->fc.current_mode = ixgbe_fc_tx_pause;

			hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");

		} else if ((pcs_anadv_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&

			   (pcs_anadv_reg & IXGBE_PCS1GANA_ASM_PAUSE) &&

			   !(pcs_lpab_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&

			   (pcs_lpab_reg & IXGBE_PCS1GANA_ASM_PAUSE)) {

			hw->fc.current_mode = ixgbe_fc_rx_pause;

			hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");

		} else {

			hw->fc.current_mode = ixgbe_fc_none;

			hw_dbg(hw, "Flow Control = NONE.\n");

	if (hw->mac.type == ixgbe_mac_82599EB) {

		links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);

		if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {

			hw->fc.fc_was_autonegged = false;

			hw->fc.current_mode = hw->fc.requested_mode;

			ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;

			goto out;

		}

	}



	if (hw->phy.media_type == ixgbe_media_type_backplane) {

	/*

	 * Read the 10g AN autoc and LP ability registers and resolve

	 * local flow control settings accordingly
@@ -1799,8 +1811,58 @@ s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw) 
	autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);

	anlp1_reg = IXGBE_READ_REG(hw, IXGBE_ANLP1);



		if ((autoc_reg & IXGBE_AUTOC_SYM_PAUSE) &&

		    (anlp1_reg & IXGBE_ANLP1_SYM_PAUSE)) {

	ret_val = ixgbe_negotiate_fc(hw, autoc_reg,

		anlp1_reg, IXGBE_AUTOC_SYM_PAUSE, IXGBE_AUTOC_ASM_PAUSE,

		IXGBE_ANLP1_SYM_PAUSE, IXGBE_ANLP1_ASM_PAUSE);



out:

	return ret_val;

}



/**

 *  ixgbe_fc_autoneg_copper - Enable flow control IEEE clause 37

 *  @hw: pointer to hardware structure

 *

 *  Enable flow control according to IEEE clause 37.

 **/

static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw)

{

	u16 technology_ability_reg = 0;

	u16 lp_technology_ability_reg = 0;



	hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,

			     MDIO_MMD_AN,

			     &technology_ability_reg);

	hw->phy.ops.read_reg(hw, MDIO_AN_LPA,

			     MDIO_MMD_AN,

			     &lp_technology_ability_reg);



	return ixgbe_negotiate_fc(hw, (u32)technology_ability_reg,

				  (u32)lp_technology_ability_reg,

				  IXGBE_TAF_SYM_PAUSE, IXGBE_TAF_ASM_PAUSE,

				  IXGBE_TAF_SYM_PAUSE, IXGBE_TAF_ASM_PAUSE);

}



/**

 *  ixgbe_negotiate_fc - Negotiate flow control

 *  @hw: pointer to hardware structure

 *  @adv_reg: flow control advertised settings

 *  @lp_reg: link partner's flow control settings

 *  @adv_sym: symmetric pause bit in advertisement

 *  @adv_asm: asymmetric pause bit in advertisement

 *  @lp_sym: symmetric pause bit in link partner advertisement

 *  @lp_asm: asymmetric pause bit in link partner advertisement

 *

 *  Find the intersection between advertised settings and link partner's

 *  advertised settings

 **/

static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,

			      u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)

{

	if ((!(adv_reg)) ||  (!(lp_reg)))

		return IXGBE_ERR_FC_NOT_NEGOTIATED;



	if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {

		/*

		 * Now we need to check if the user selected Rx ONLY

		 * of pause frames.  In this case, we had to advertise
@@ -1813,30 +1875,21 @@ s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw) 
			hw_dbg(hw, "Flow Control = FULL.\n");

		} else {

			hw->fc.current_mode = ixgbe_fc_rx_pause;

				hw_dbg(hw, "Flow Control=RX PAUSE only\n");

			hw_dbg(hw, "Flow Control=RX PAUSE frames only\n");

		}

		} else if (!(autoc_reg & IXGBE_AUTOC_SYM_PAUSE) &&

			   (autoc_reg & IXGBE_AUTOC_ASM_PAUSE) &&

			   (anlp1_reg & IXGBE_ANLP1_SYM_PAUSE) &&

			   (anlp1_reg & IXGBE_ANLP1_ASM_PAUSE)) {

	} else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&

		   (lp_reg & lp_sym) && (lp_reg & lp_asm)) {

		hw->fc.current_mode = ixgbe_fc_tx_pause;

		hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");

		} else if ((autoc_reg & IXGBE_AUTOC_SYM_PAUSE) &&

			   (autoc_reg & IXGBE_AUTOC_ASM_PAUSE) &&

			   !(anlp1_reg & IXGBE_ANLP1_SYM_PAUSE) &&

			   (anlp1_reg & IXGBE_ANLP1_ASM_PAUSE)) {

	} else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&

		   !(lp_reg & lp_sym) && (lp_reg & lp_asm)) {

		hw->fc.current_mode = ixgbe_fc_rx_pause;

		hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");

	} else {

		hw->fc.current_mode = ixgbe_fc_none;

		hw_dbg(hw, "Flow Control = NONE.\n");

	}

	}

	/* Record that current_mode is the result of a successful autoneg */

	hw->fc.fc_was_autonegged = true;



out:

	return ret_val;

	return 0;

}



/**
@@ -1848,7 +1901,8 @@ s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw) 
static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)

{

	s32 ret_val = 0;

	u32 reg;

	u32 reg = 0, reg_bp = 0;

	u16 reg_cu = 0;



#ifdef CONFIG_DCB

	if (hw->fc.requested_mode == ixgbe_fc_pfc) {
@@ -1856,7 +1910,7 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num) 
		goto out;

	}



#endif

#endif /* CONFIG_DCB */

	/* Validate the packetbuf configuration */

	if (packetbuf_num < 0 || packetbuf_num > 7) {

		hw_dbg(hw, "Invalid packet buffer number [%d], expected range "
@@ -1894,11 +1948,26 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num) 
		hw->fc.requested_mode = ixgbe_fc_full;



	/*

	 * Set up the 1G flow control advertisement registers so the HW will be

	 * able to do fc autoneg once the cable is plugged in.  If we end up

	 * using 10g instead, this is harmless.

	 * Set up the 1G and 10G flow control advertisement registers so the

	 * HW will be able to do fc autoneg once the cable is plugged in.  If

	 * we link at 10G, the 1G advertisement is harmless and vice versa.

	 */



	switch (hw->phy.media_type) {

	case ixgbe_media_type_fiber:

	case ixgbe_media_type_backplane:

		reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);

		reg_bp = IXGBE_READ_REG(hw, IXGBE_AUTOC);

		break;



	case ixgbe_media_type_copper:

		hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,

					MDIO_MMD_AN, &reg_cu);

		break;



	default:

		;

	}



	/*

	 * The possible values of fc.requested_mode are:
@@ -1917,6 +1986,11 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num) 
	case ixgbe_fc_none:

		/* Flow control completely disabled by software override. */

		reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);

		if (hw->phy.media_type == ixgbe_media_type_backplane)

			reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE |

				    IXGBE_AUTOC_ASM_PAUSE);

		else if (hw->phy.media_type == ixgbe_media_type_copper)

			reg_cu &= ~(IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);

		break;

	case ixgbe_fc_rx_pause:

		/*
@@ -1928,6 +2002,11 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num) 
		 * disable the adapter's ability to send PAUSE frames.

		 */

		reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);

		if (hw->phy.media_type == ixgbe_media_type_backplane)

			reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |

				   IXGBE_AUTOC_ASM_PAUSE);

		else if (hw->phy.media_type == ixgbe_media_type_copper)

			reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);

		break;

	case ixgbe_fc_tx_pause:

		/*
@@ -1936,10 +2015,22 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num) 
		 */

		reg |= (IXGBE_PCS1GANA_ASM_PAUSE);

		reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE);

		if (hw->phy.media_type == ixgbe_media_type_backplane) {

			reg_bp |= (IXGBE_AUTOC_ASM_PAUSE);

			reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE);

		} else if (hw->phy.media_type == ixgbe_media_type_copper) {

			reg_cu |= (IXGBE_TAF_ASM_PAUSE);

			reg_cu &= ~(IXGBE_TAF_SYM_PAUSE);

		}

		break;

	case ixgbe_fc_full:

		/* Flow control (both Rx and Tx) is enabled by SW override. */

		reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);

		if (hw->phy.media_type == ixgbe_media_type_backplane)

			reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |

				   IXGBE_AUTOC_ASM_PAUSE);

		else if (hw->phy.media_type == ixgbe_media_type_copper)

			reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);

		break;

#ifdef CONFIG_DCB

	case ixgbe_fc_pfc:
@@ -1953,6 +2044,11 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num) 
		break;

	}



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

		/*

		 * Enable auto-negotiation between the MAC & PHY;

		 * the MAC will advertise clause 37 flow control.

		 */

		IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);

		reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
@@ -1962,71 +2058,23 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num) 


		IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);

		hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);

	}



	/*

	 * Set up the 10G flow control advertisement registers so the HW

	 * can do fc autoneg once the cable is plugged in.  If we end up

	 * using 1g instead, this is harmless.

	 */

	reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);



	/*

	 * The possible values of fc.requested_mode are:

	 * 0: Flow control is completely disabled

	 * 1: Rx flow control is enabled (we can receive pause frames,

	 *    but not send pause frames).

	 * 2: Tx flow control is enabled (we can send pause frames but

	 *    we do not support receiving pause frames).

	 * 3: Both Rx and Tx flow control (symmetric) are enabled.

	 * other: Invalid.

	 */

	switch (hw->fc.requested_mode) {

	case ixgbe_fc_none:

		/* Flow control completely disabled by software override. */

		reg &= ~(IXGBE_AUTOC_SYM_PAUSE | IXGBE_AUTOC_ASM_PAUSE);

		break;

	case ixgbe_fc_rx_pause:

		/*

		 * Rx Flow control is enabled and Tx Flow control is

		 * disabled by software override. Since there really

		 * isn't a way to advertise that we are capable of RX

		 * Pause ONLY, we will advertise that we support both

		 * symmetric and asymmetric Rx PAUSE.  Later, we will

		 * disable the adapter's ability to send PAUSE frames.

		 */

		reg |= (IXGBE_AUTOC_SYM_PAUSE | IXGBE_AUTOC_ASM_PAUSE);

		break;

	case ixgbe_fc_tx_pause:

		/*

		 * Tx Flow control is enabled, and Rx Flow control is

		 * disabled by software override.

	 * AUTOC restart handles negotiation of 1G and 10G on backplane

	 * and copper. There is no need to set the PCS1GCTL register.

	 *

	 */

		reg |= (IXGBE_AUTOC_ASM_PAUSE);

		reg &= ~(IXGBE_AUTOC_SYM_PAUSE);

		break;

	case ixgbe_fc_full:

		/* Flow control (both Rx and Tx) is enabled by SW override. */

		reg |= (IXGBE_AUTOC_SYM_PAUSE | IXGBE_AUTOC_ASM_PAUSE);

		break;

#ifdef CONFIG_DCB

	case ixgbe_fc_pfc:

		goto out;

		break;

#endif /* CONFIG_DCB */

	default:

		hw_dbg(hw, "Flow control param set incorrectly\n");

		ret_val = IXGBE_ERR_CONFIG;

		goto out;

		break;

	if (hw->phy.media_type == ixgbe_media_type_backplane) {

		reg_bp |= IXGBE_AUTOC_AN_RESTART;

		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_bp);

	} else if ((hw->phy.media_type == ixgbe_media_type_copper) &&

		    (ixgbe_device_supports_autoneg_fc(hw) == 0)) {

		hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,

				      MDIO_MMD_AN, reg_cu);

	}

	/*

	 * AUTOC restart handles negotiation of 1G and 10G. There is

	 * no need to set the PCS1GCTL register.

	 */

	reg |= IXGBE_AUTOC_AN_RESTART;

	IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg);

	hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);



	hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);

out:

	return ret_val;

}
@@ -2750,6 +2798,28 @@ s32 ixgbe_get_wwn_prefix_generic(struct ixgbe_hw *hw, u16 *wwnn_prefix, 
	return 0;

}



/**

 *  ixgbe_device_supports_autoneg_fc - Check if phy supports autoneg flow

 *  control

 *  @hw: pointer to hardware structure

 *

 *  There are several phys that do not support autoneg flow control. This

 *  function check the device id to see if the associated phy supports

 *  autoneg flow control.

 **/

static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)

{



	switch (hw->device_id) {

	case IXGBE_DEV_ID_X540T:

		return 0;

	case IXGBE_DEV_ID_82599_T3_LOM:

		return 0;

	default:

		return IXGBE_ERR_FC_NOT_SUPPORTED;

	}

}



/**

 *  ixgbe_set_mac_anti_spoofing - Enable/Disable MAC anti-spoofing

 *  @hw: pointer to hardware structure

drivers/net/ixgbe/ixgbe_main.c

+2 −1
Original line number Diff line number Diff line
@@ -3775,7 +3775,8 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw) 
	if (ret)

		goto link_cfg_out;



	if (hw->mac.ops.get_link_capabilities)

	autoneg = hw->phy.autoneg_advertised;

	if ((!autoneg) && (hw->mac.ops.get_link_capabilities))

		ret = hw->mac.ops.get_link_capabilities(hw, &autoneg,

							&negotiation);

	if (ret)

drivers/net/ixgbe/ixgbe_phy.h

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ 
#define IXGBE_I2C_EEPROM_STATUS_FAIL         0x2

#define IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS  0x3



/* Flow control defines */

#define IXGBE_TAF_SYM_PAUSE                  0x400

#define IXGBE_TAF_ASM_PAUSE                  0x800



/* Bit-shift macros */

#define IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT    24

#define IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT    16