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

Commit aee2f545 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-09-23

This series contains updates to ixgbe only.

Mark provides all the changes in this series, first clears the destination
location for I2C data initially so that the received data will not be
corrupted by previous attempts.  Then reduced the pauses/delays in the
PHY detection when no SFP is present by reducing the number of retires,
once an SFP is detected, the "normal" number of retries in PHY detection
will be used.  Added support for X55EM_x SFP+ dual-speed, and fixed 1G and
10G link stability for X550EM_x by configuring the CS4227 correctly by
moving code to ixgbe_setup_mac_link_sfp_x550em().  Added functionality to
reset CS4227, since on some platforms the CS4227 does not initialize
properly.  Next reduces the SFP polling rate, due to when an SFP is not
present, the I2C timeouts that result are very costly.  So prevent the
SFP polling from being done more than once every two seconds.  Added
support for I2C bus MUX.  Fixed the setting of RDRXCTL register which
should fall through X540 and 82599, not 82598.  In addition, added small
packet padding support in X550 by setting RDRXCTL.PSP when the driver is
in SRIOV mode.  Fixed a known hardware issue where the PCI transactions
pending bit sticks high when there are pending transactions, so
workaround the issue by wait and then continue with our reset flow.
Added a new device ID for X550EM device with SFPs.  Provided a fix with
the DCA setup, which was suggested by Alex Duyck <aduyck@mirantis.com>,
by making it so that we always set the relaxed ordering bits related to
the DCA registers even if DCA is not enbaled.  Then moves the
configuration out of the ixgbe_down() and into ixgbe_configure() before
enabling the transmit and receive rings.  This ensures that DCA is
configured correctly before starting the processing of packets.
Fixed VM-to-VM loopback mode which requires that FCRTH be set, but
the datasheets did not specify what the value should be.  It has now
been determined that the correct value should be RXPBSIZE - (24*1024).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d8ed6250 21dd5601

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

+2 −0
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ struct ixgbe_mac_addr { 


/* default to trying for four seconds */

#define IXGBE_TRY_LINK_TIMEOUT (4 * HZ)

#define IXGBE_SFP_POLL_JIFFIES (2 * HZ)	/* SFP poll every 2 seconds */



/* board specific private data structure */

struct ixgbe_adapter {
@@ -707,6 +708,7 @@ struct ixgbe_adapter { 


	u32 link_speed;

	bool link_up;

	unsigned long sfp_poll_time;

	unsigned long link_check_timeout;



	struct timer_list service_timer;

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

+25 −167
Original line number Diff line number Diff line
@@ -44,9 +44,8 @@ 
static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

						 ixgbe_link_speed speed,

						 bool autoneg_wait_to_complete);

static void

ixgbe_set_hard_rate_select_speed(struct ixgbe_hw *, ixgbe_link_speed);

static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,

					   ixgbe_link_speed speed,

					   bool autoneg_wait_to_complete);
@@ -109,6 +108,9 @@ static void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw) 
	if (hw->phy.multispeed_fiber) {

		/* Set up dual speed SFP+ support */

		mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber;

		mac->ops.setup_mac_link = ixgbe_setup_mac_link_82599;

		mac->ops.set_rate_select_speed =

					       ixgbe_set_hard_rate_select_speed;

	} else {

		if ((mac->ops.get_media_type(hw) ==

		     ixgbe_media_type_backplane) &&
@@ -646,176 +648,32 @@ static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) 
}



/**

 *  ixgbe_setup_mac_link_multispeed_fiber - Set MAC link speed

 * ixgbe_set_hard_rate_select_speed - Set module link speed

 * @hw: pointer to hardware structure

 *  @speed: new link speed

 *  @autoneg_wait_to_complete: true when waiting for completion is needed

 * @speed: link speed to set

 *

 *  Set the link speed in the AUTOC register and restarts link.

 **/

static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

					  ixgbe_link_speed speed,

					  bool autoneg_wait_to_complete)

 * Set module link speed via RS0/RS1 rate select pins.

 */

static void

ixgbe_set_hard_rate_select_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)

{

	s32 status = 0;

	ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;

	ixgbe_link_speed highest_link_speed = IXGBE_LINK_SPEED_UNKNOWN;

	u32 speedcnt = 0;

	u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);

	u32 i = 0;

	bool link_up = false;

	bool autoneg = false;



	/* Mask off requested but non-supported speeds */

	status = hw->mac.ops.get_link_capabilities(hw, &link_speed,

						   &autoneg);

	if (status != 0)

		return status;



	speed &= link_speed;



	/*

	 * Try each speed one by one, highest priority first.  We do this in

	 * software because 10gb fiber doesn't support speed autonegotiation.

	 */

	if (speed & IXGBE_LINK_SPEED_10GB_FULL) {

		speedcnt++;

		highest_link_speed = IXGBE_LINK_SPEED_10GB_FULL;



		/* If we already have link at this speed, just jump out */

		status = hw->mac.ops.check_link(hw, &link_speed, &link_up,

						false);

		if (status != 0)

			return status;



		if ((link_speed == IXGBE_LINK_SPEED_10GB_FULL) && link_up)

			goto out;



		/* Set the module link speed */

		switch (hw->phy.media_type) {

		case ixgbe_media_type_fiber:

	switch (speed) {

	case IXGBE_LINK_SPEED_10GB_FULL:

		esdp_reg |= (IXGBE_ESDP_SDP5_DIR | IXGBE_ESDP_SDP5);

			IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

			IXGBE_WRITE_FLUSH(hw);

			break;

		case ixgbe_media_type_fiber_qsfp:

			/* QSFP module automatically detects MAC link speed */

		break;

		default:

			hw_dbg(hw, "Unexpected media type.\n");

			break;

		}



		/* Allow module to change analog characteristics (1G->10G) */

		msleep(40);



		status = ixgbe_setup_mac_link_82599(hw,

						    IXGBE_LINK_SPEED_10GB_FULL,

						    autoneg_wait_to_complete);

		if (status != 0)

			return status;



		/* Flap the tx laser if it has not already been done */

		if (hw->mac.ops.flap_tx_laser)

			hw->mac.ops.flap_tx_laser(hw);



		/*

		 * Wait for the controller to acquire link.  Per IEEE 802.3ap,

		 * Section 73.10.2, we may have to wait up to 500ms if KR is

		 * attempted.  82599 uses the same timing for 10g SFI.

		 */

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

			/* Wait for the link partner to also set speed */

			msleep(100);



			/* If we have link, just jump out */

			status = hw->mac.ops.check_link(hw, &link_speed,

							&link_up, false);

			if (status != 0)

				return status;



			if (link_up)

				goto out;

		}

	}



	if (speed & IXGBE_LINK_SPEED_1GB_FULL) {

		speedcnt++;

		if (highest_link_speed == IXGBE_LINK_SPEED_UNKNOWN)

			highest_link_speed = IXGBE_LINK_SPEED_1GB_FULL;



		/* If we already have link at this speed, just jump out */

		status = hw->mac.ops.check_link(hw, &link_speed, &link_up,

						false);

		if (status != 0)

			return status;



		if ((link_speed == IXGBE_LINK_SPEED_1GB_FULL) && link_up)

			goto out;



		/* Set the module link speed */

		switch (hw->phy.media_type) {

		case ixgbe_media_type_fiber:

	case IXGBE_LINK_SPEED_1GB_FULL:

		esdp_reg &= ~IXGBE_ESDP_SDP5;

		esdp_reg |= IXGBE_ESDP_SDP5_DIR;

			IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

			IXGBE_WRITE_FLUSH(hw);

			break;

		case ixgbe_media_type_fiber_qsfp:

			/* QSFP module automatically detects MAC link speed */

		break;

	default:

			hw_dbg(hw, "Unexpected media type.\n");

			break;

		}



		/* Allow module to change analog characteristics (10G->1G) */

		msleep(40);



		status = ixgbe_setup_mac_link_82599(hw,

						    IXGBE_LINK_SPEED_1GB_FULL,

						    autoneg_wait_to_complete);

		if (status != 0)

			return status;



		/* Flap the tx laser if it has not already been done */

		if (hw->mac.ops.flap_tx_laser)

			hw->mac.ops.flap_tx_laser(hw);



		/* Wait for the link partner to also set speed */

		msleep(100);



		/* If we have link, just jump out */

		status = hw->mac.ops.check_link(hw, &link_speed, &link_up,

						false);

		if (status != 0)

			return status;



		if (link_up)

			goto out;

		hw_dbg(hw, "Invalid fixed module speed\n");

		return;

	}



	/*

	 * We didn't get link.  Configure back to the highest speed we tried,

	 * (if there was more than one).  We call ourselves back with just the

	 * single highest speed that the user requested.

	 */

	if (speedcnt > 1)

		status = ixgbe_setup_mac_link_multispeed_fiber(hw,

							       highest_link_speed,

							       autoneg_wait_to_complete);



out:

	/* Set autoneg_advertised value based on input link speed */

	hw->phy.autoneg_advertised = 0;



	if (speed & IXGBE_LINK_SPEED_10GB_FULL)

		hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;



	if (speed & IXGBE_LINK_SPEED_1GB_FULL)

		hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;



	return status;

	IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

	IXGBE_WRITE_FLUSH(hw);

}



/**

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

+220 −6
Original line number Diff line number Diff line
@@ -297,13 +297,13 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw) 


	/* Setup flow control */

	ret_val = ixgbe_setup_fc(hw);

	if (!ret_val)

		return 0;

	if (ret_val)

		return ret_val;



	/* Clear adapter stopped flag */

	hw->adapter_stopped = false;



	return ret_val;

	return 0;

}



/**
@@ -2164,10 +2164,11 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw) 
			/*

			 * In order to prevent Tx hangs when the internal Tx

			 * switch is enabled we must set the high water mark

			 * to the maximum FCRTH value.  This allows the Tx

			 * switch to function even under heavy Rx workloads.

			 * to the Rx packet buffer size - 24KB.  This allows

			 * the Tx switch to function even under heavy Rx

			 * workloads.

			 */

			fcrth = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 32;

			fcrth = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 24576;

		}



		IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), fcrth);
@@ -2476,6 +2477,9 @@ static s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw) 
	hw_dbg(hw, "GIO Master Disable bit didn't clear - requesting resets\n");

	hw->mac.flags |= IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;



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

		return 0;



	/*

	 * Before proceeding, make sure that the PCIe block does not have

	 * transactions pending.
@@ -3920,3 +3924,213 @@ bool ixgbe_mng_present(struct ixgbe_hw *hw) 
	fwsm &= IXGBE_FWSM_MODE_MASK;

	return fwsm == IXGBE_FWSM_FW_MODE_PT;

}



/**

 *  ixgbe_setup_mac_link_multispeed_fiber - Set MAC link speed

 *  @hw: pointer to hardware structure

 *  @speed: new link speed

 *  @autoneg_wait_to_complete: true when waiting for completion is needed

 *

 *  Set the link speed in the MAC and/or PHY register and restarts link.

 */

s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

					  ixgbe_link_speed speed,

					  bool autoneg_wait_to_complete)

{

	ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;

	ixgbe_link_speed highest_link_speed = IXGBE_LINK_SPEED_UNKNOWN;

	s32 status = 0;

	u32 speedcnt = 0;

	u32 i = 0;

	bool autoneg, link_up = false;



	/* Mask off requested but non-supported speeds */

	status = hw->mac.ops.get_link_capabilities(hw, &link_speed, &autoneg);

	if (status)

		return status;



	speed &= link_speed;



	/* Try each speed one by one, highest priority first.  We do this in

	 * software because 10Gb fiber doesn't support speed autonegotiation.

	 */

	if (speed & IXGBE_LINK_SPEED_10GB_FULL) {

		speedcnt++;

		highest_link_speed = IXGBE_LINK_SPEED_10GB_FULL;



		/* If we already have link at this speed, just jump out */

		status = hw->mac.ops.check_link(hw, &link_speed, &link_up,

						false);

		if (status)

			return status;



		if (link_speed == IXGBE_LINK_SPEED_10GB_FULL && link_up)

			goto out;



		/* Set the module link speed */

		switch (hw->phy.media_type) {

		case ixgbe_media_type_fiber:

			hw->mac.ops.set_rate_select_speed(hw,

						    IXGBE_LINK_SPEED_10GB_FULL);

			break;

		case ixgbe_media_type_fiber_qsfp:

			/* QSFP module automatically detects MAC link speed */

			break;

		default:

			hw_dbg(hw, "Unexpected media type\n");

			break;

		}



		/* Allow module to change analog characteristics (1G->10G) */

		msleep(40);



		status = hw->mac.ops.setup_mac_link(hw,

						    IXGBE_LINK_SPEED_10GB_FULL,

						    autoneg_wait_to_complete);

		if (status)

			return status;



		/* Flap the Tx laser if it has not already been done */

		if (hw->mac.ops.flap_tx_laser)

			hw->mac.ops.flap_tx_laser(hw);



		/* Wait for the controller to acquire link.  Per IEEE 802.3ap,

		 * Section 73.10.2, we may have to wait up to 500ms if KR is

		 * attempted.  82599 uses the same timing for 10g SFI.

		 */

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

			/* Wait for the link partner to also set speed */

			msleep(100);



			/* If we have link, just jump out */

			status = hw->mac.ops.check_link(hw, &link_speed,

							&link_up, false);

			if (status)

				return status;



			if (link_up)

				goto out;

		}

	}



	if (speed & IXGBE_LINK_SPEED_1GB_FULL) {

		speedcnt++;

		if (highest_link_speed == IXGBE_LINK_SPEED_UNKNOWN)

			highest_link_speed = IXGBE_LINK_SPEED_1GB_FULL;



		/* If we already have link at this speed, just jump out */

		status = hw->mac.ops.check_link(hw, &link_speed, &link_up,

						false);

		if (status)

			return status;



		if (link_speed == IXGBE_LINK_SPEED_1GB_FULL && link_up)

			goto out;



		/* Set the module link speed */

		switch (hw->phy.media_type) {

		case ixgbe_media_type_fiber:

			hw->mac.ops.set_rate_select_speed(hw,

						     IXGBE_LINK_SPEED_1GB_FULL);

			break;

		case ixgbe_media_type_fiber_qsfp:

			/* QSFP module automatically detects link speed */

			break;

		default:

			hw_dbg(hw, "Unexpected media type\n");

			break;

		}



		/* Allow module to change analog characteristics (10G->1G) */

		msleep(40);



		status = hw->mac.ops.setup_mac_link(hw,

						    IXGBE_LINK_SPEED_1GB_FULL,

						    autoneg_wait_to_complete);

		if (status)

			return status;



		/* Flap the Tx laser if it has not already been done */

		if (hw->mac.ops.flap_tx_laser)

			hw->mac.ops.flap_tx_laser(hw);



		/* Wait for the link partner to also set speed */

		msleep(100);



		/* If we have link, just jump out */

		status = hw->mac.ops.check_link(hw, &link_speed, &link_up,

						false);

		if (status)

			return status;



		if (link_up)

			goto out;

	}



	/* We didn't get link.  Configure back to the highest speed we tried,

	 * (if there was more than one).  We call ourselves back with just the

	 * single highest speed that the user requested.

	 */

	if (speedcnt > 1)

		status = ixgbe_setup_mac_link_multispeed_fiber(hw,

						      highest_link_speed,

						      autoneg_wait_to_complete);



out:

	/* Set autoneg_advertised value based on input link speed */

	hw->phy.autoneg_advertised = 0;



	if (speed & IXGBE_LINK_SPEED_10GB_FULL)

		hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;



	if (speed & IXGBE_LINK_SPEED_1GB_FULL)

		hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;



	return status;

}



/**

 *  ixgbe_set_soft_rate_select_speed - Set module link speed

 *  @hw: pointer to hardware structure

 *  @speed: link speed to set

 *

 *  Set module link speed via the soft rate select.

 */

void ixgbe_set_soft_rate_select_speed(struct ixgbe_hw *hw,

				      ixgbe_link_speed speed)

{

	s32 status;

	u8 rs, eeprom_data;



	switch (speed) {

	case IXGBE_LINK_SPEED_10GB_FULL:

		/* one bit mask same as setting on */

		rs = IXGBE_SFF_SOFT_RS_SELECT_10G;

		break;

	case IXGBE_LINK_SPEED_1GB_FULL:

		rs = IXGBE_SFF_SOFT_RS_SELECT_1G;

		break;

	default:

		hw_dbg(hw, "Invalid fixed module speed\n");

		return;

	}



	/* Set RS0 */

	status = hw->phy.ops.read_i2c_byte(hw, IXGBE_SFF_SFF_8472_OSCB,

					   IXGBE_I2C_EEPROM_DEV_ADDR2,

					   &eeprom_data);

	if (status) {

		hw_dbg(hw, "Failed to read Rx Rate Select RS0\n");

		return;

	}



	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) | rs;



	status = hw->phy.ops.write_i2c_byte(hw, IXGBE_SFF_SFF_8472_OSCB,

					    IXGBE_I2C_EEPROM_DEV_ADDR2,

					    eeprom_data);

	if (status) {

		hw_dbg(hw, "Failed to write Rx Rate Select RS0\n");

		return;

	}

}

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

+5 −0
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw); 
s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw);

void ixgbe_disable_rx_generic(struct ixgbe_hw *hw);

void ixgbe_enable_rx_generic(struct ixgbe_hw *hw);

s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

					  ixgbe_link_speed speed,

					  bool autoneg_wait_to_complete);

void ixgbe_set_soft_rate_select_speed(struct ixgbe_hw *hw,

				      ixgbe_link_speed speed);



#define IXGBE_FAILED_READ_REG 0xffffffffU

#define IXGBE_FAILED_READ_CFG_DWORD 0xffffffffU

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

+7 −1
Original line number Diff line number Diff line
@@ -259,7 +259,13 @@ s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en, u8 *prio_tc) 
			fcrtl = (hw->fc.low_water[i] << 10) | IXGBE_FCRTL_XONE;

			IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), fcrtl);

		} else {

			reg = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 32;

			/* In order to prevent Tx hangs when the internal Tx

			 * switch is enabled we must set the high water mark

			 * to the Rx packet buffer size - 24KB.  This allows

			 * the Tx switch to function even under heavy Rx

			 * workloads.

			 */

			reg = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 24576;

			IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), 0);

		}