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

Commit 4e8e1bca authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: add new media type. 



This patch adds support for a new media type fiber_fixed.  This is useful
to avoid all the SFP+ hot plug support path on devices who's fix fiber need
not worry about such things.  This patch is needed for a following patch
that adds support for "fiber_fixed" devices.

v2: cleaned up logging message based on feedback from David Miller

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

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

+86 −7
Original line number Diff line number Diff line
@@ -526,6 +526,75 @@ static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) 
	}

}



/**

 *  ixgbe_set_fiber_fixed_speed - Set module link speed for fixed fiber

 *  @hw: pointer to hardware structure

 *  @speed: link speed to set

 *

 *  We set the module speed differently for fixed fiber.  For other

 *  multi-speed devices we don't have an error value so here if we

 *  detect an error we just log it and exit.

 */

static void ixgbe_set_fiber_fixed_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");

		goto out;

	}



	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");

		goto out;

	}



	/* Set RS1 */

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

					   IXGBE_I2C_EEPROM_DEV_ADDR2,

					   &eeprom_data);

	if (status) {

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

		goto out;

	}



	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) & rs;



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

					    IXGBE_I2C_EEPROM_DEV_ADDR2,

					    eeprom_data);

	if (status) {

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

		goto out;

	}

out:

	return;

}



/**

 *  ixgbe_setup_mac_link_multispeed_fiber - Set MAC link speed

 *  @hw: pointer to hardware structure
@@ -573,9 +642,14 @@ static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, 
			goto out;



		/* Set the module link speed */

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

			ixgbe_set_fiber_fixed_speed(hw,

					IXGBE_LINK_SPEED_10GB_FULL);

		} else {

			esdp_reg |= (IXGBE_ESDP_SDP5_DIR | IXGBE_ESDP_SDP5);

			IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

			IXGBE_WRITE_FLUSH(hw);

		}



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

		msleep(40);
@@ -625,10 +699,15 @@ static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, 
			goto out;



		/* Set the module link speed */

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

			ixgbe_set_fiber_fixed_speed(hw,

						IXGBE_LINK_SPEED_1GB_FULL);

		} else {

			esdp_reg &= ~IXGBE_ESDP_SDP5;

			esdp_reg |= IXGBE_ESDP_SDP5_DIR;

			IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

			IXGBE_WRITE_FLUSH(hw);

		}



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

		msleep(40);

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

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) 
	bool link_up;



	switch (hw->phy.media_type) {

	case ixgbe_media_type_fiber_fixed:

	case ixgbe_media_type_fiber:

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

		/* if link is down, assume supported */
@@ -138,6 +139,7 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw) 
	 * we link at 10G, the 1G advertisement is harmless and vice versa.

	 */

	switch (hw->phy.media_type) {

	case ixgbe_media_type_fiber_fixed:

	case ixgbe_media_type_fiber:

	case ixgbe_media_type_backplane:

		reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
@@ -2404,6 +2406,7 @@ void ixgbe_fc_autoneg(struct ixgbe_hw *hw) 


	switch (hw->phy.media_type) {

	/* Autoneg flow control on fiber adapters */

	case ixgbe_media_type_fiber_fixed:

	case ixgbe_media_type_fiber:

		if (speed == IXGBE_LINK_SPEED_1GB_FULL)

			ret_val = ixgbe_fc_autoneg_fiber(hw);

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

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#define IXGBE_SFF_CABLE_SPEC_COMP    0x3C

#define IXGBE_SFF_SFF_8472_SWAP      0x5C

#define IXGBE_SFF_SFF_8472_COMP      0x5E

#define IXGBE_SFF_SFF_8472_OSCB	0x6E

#define IXGBE_SFF_SFF_8472_ESCB	0x76



/* Bitmasks */

#define IXGBE_SFF_DA_PASSIVE_CABLE           0x4
@@ -54,6 +56,9 @@ 
#define IXGBE_SFF_1GBASET_CAPABLE            0x8

#define IXGBE_SFF_10GBASESR_CAPABLE          0x10

#define IXGBE_SFF_10GBASELR_CAPABLE          0x20

#define IXGBE_SFF_SOFT_RS_SELECT_MASK	0x8

#define IXGBE_SFF_SOFT_RS_SELECT_10G	0x8

#define IXGBE_SFF_SOFT_RS_SELECT_1G	0x0

#define IXGBE_SFF_ADDRESSING_MODE	     0x4

#define IXGBE_I2C_EEPROM_READ_MASK           0x100

#define IXGBE_I2C_EEPROM_STATUS_MASK         0x3

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

+1 −0
Original line number Diff line number Diff line
@@ -2622,6 +2622,7 @@ enum ixgbe_sfp_type { 
enum ixgbe_media_type {

	ixgbe_media_type_unknown = 0,

	ixgbe_media_type_fiber,

	ixgbe_media_type_fiber_fixed,

	ixgbe_media_type_fiber_lco,

	ixgbe_media_type_copper,

	ixgbe_media_type_backplane,