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

Commit 87371b9d authored by Matthew Vick's avatar Matthew Vick Committed by Jeff Kirsher
Browse files

igb: Enable EEE LP advertisement 



On EEE-capable devices, query the PHY to determine what the link partner is
advertising.

Signed-off-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b980ac18

drivers/net/ethernet/intel/igb/e1000_82575.c

+35 −0
Original line number Diff line number Diff line
@@ -2284,6 +2284,41 @@ static s32 igb_update_nvm_checksum_i350(struct e1000_hw *hw) 
	return ret_val;

}



/**

 *  __igb_access_emi_reg - Read/write EMI register

 *  @hw: pointer to the HW structure

 *  @addr: EMI address to program

 *  @data: pointer to value to read/write from/to the EMI address

 *  @read: boolean flag to indicate read or write

 **/

static s32 __igb_access_emi_reg(struct e1000_hw *hw, u16 address,

				  u16 *data, bool read)

{

	s32 ret_val = E1000_SUCCESS;



	ret_val = hw->phy.ops.write_reg(hw, E1000_EMIADD, address);

	if (ret_val)

		return ret_val;



	if (read)

		ret_val = hw->phy.ops.read_reg(hw, E1000_EMIDATA, data);

	else

		ret_val = hw->phy.ops.write_reg(hw, E1000_EMIDATA, *data);



	return ret_val;

}



/**

 *  igb_read_emi_reg - Read Extended Management Interface register

 *  @hw: pointer to the HW structure

 *  @addr: EMI address to program

 *  @data: value to be read from the EMI address

 **/

s32 igb_read_emi_reg(struct e1000_hw *hw, u16 addr, u16 *data)

{

	return __igb_access_emi_reg(hw, addr, data, true);

}



/**

 *  igb_set_eee_i350 - Enable/disable EEE support

 *  @hw: pointer to the HW structure

drivers/net/ethernet/intel/igb/e1000_82575.h

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *, bool, int); 
void igb_vmdq_set_loopback_pf(struct e1000_hw *, bool);

void igb_vmdq_set_replication_pf(struct e1000_hw *, bool);

u16 igb_rxpbs_adjust_82580(u32 data);

s32 igb_read_emi_reg(struct e1000_hw *, u16 addr, u16 *data);

s32 igb_set_eee_i350(struct e1000_hw *);

s32 igb_init_thermal_sensor_thresh_generic(struct e1000_hw *);

s32 igb_get_thermal_sensor_data_generic(struct e1000_hw *hw);

drivers/net/ethernet/intel/igb/e1000_defines.h

+4 −0
Original line number Diff line number Diff line
@@ -885,6 +885,10 @@ 
#define E1000_EEER_LPI_FC            0x00040000  /* EEE Enable on FC */

#define E1000_EEE_SU_LPI_CLK_STP     0X00800000  /* EEE LPI Clock Stop */

#define E1000_EEER_EEE_NEG           0x20000000  /* EEE capability nego */

#define E1000_EEE_LP_ADV_ADDR_I350   0x040F      /* EEE LP Advertisement */

#define E1000_EEE_LP_ADV_DEV_I210    7           /* EEE LP Adv Device */

#define E1000_EEE_LP_ADV_ADDR_I210   61          /* EEE LP Adv Register */

#define E1000_MMDAC_FUNC_DATA        0x4000      /* Data, no post increment */



/* SerDes Control */

#define E1000_GEN_CTL_READY             0x80000000

drivers/net/ethernet/intel/igb/e1000_i210.c

+65 −0
Original line number Diff line number Diff line
@@ -708,3 +708,68 @@ s32 igb_valid_led_default_i210(struct e1000_hw *hw, u16 *data) 
out:

	return ret_val;

}



/**

 *  __igb_access_xmdio_reg - Read/write XMDIO register

 *  @hw: pointer to the HW structure

 *  @address: XMDIO address to program

 *  @dev_addr: device address to program

 *  @data: pointer to value to read/write from/to the XMDIO address

 *  @read: boolean flag to indicate read or write

 **/

static s32 __igb_access_xmdio_reg(struct e1000_hw *hw, u16 address,

				  u8 dev_addr, u16 *data, bool read)

{

	s32 ret_val = E1000_SUCCESS;



	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, dev_addr);

	if (ret_val)

		return ret_val;



	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAAD, address);

	if (ret_val)

		return ret_val;



	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, E1000_MMDAC_FUNC_DATA |

							 dev_addr);

	if (ret_val)

		return ret_val;



	if (read)

		ret_val = hw->phy.ops.read_reg(hw, E1000_MMDAAD, data);

	else

		ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAAD, *data);

	if (ret_val)

		return ret_val;



	/* Recalibrate the device back to 0 */

	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, 0);

	if (ret_val)

		return ret_val;



	return ret_val;

}



/**

 *  igb_read_xmdio_reg - Read XMDIO register

 *  @hw: pointer to the HW structure

 *  @addr: XMDIO address to program

 *  @dev_addr: device address to program

 *  @data: value to be read from the EMI address

 **/

s32 igb_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 *data)

{

	return __igb_access_xmdio_reg(hw, addr, dev_addr, data, true);

}



/**

 *  igb_write_xmdio_reg - Write XMDIO register

 *  @hw: pointer to the HW structure

 *  @addr: XMDIO address to program

 *  @dev_addr: device address to program

 *  @data: value to be written to the XMDIO address

 **/

s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data)

{

	return __igb_access_xmdio_reg(hw, addr, dev_addr, &data, false);

}

drivers/net/ethernet/intel/igb/e1000_i210.h

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ extern s32 igb_read_nvm_i211(struct e1000_hw *hw, u16 offset, u16 words, 
			       u16 *data);

extern s32 igb_read_invm_version(struct e1000_hw *hw,

				 struct e1000_fw_version *invm_ver);

extern s32 igb_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr,

			      u16 *data);

extern s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr,

			       u16 data);



#define E1000_STM_OPCODE		0xDB00

#define E1000_EEPROM_FLASH_SIZE_WORD	0x11