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

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

ixgbe: add new function to check for management presence 



This patch adds a support function that will indicate for the
existence of management FW.

Signed-off-by: default avatarDonald C Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 92faef85

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

+2 −6
Original line number Diff line number Diff line
@@ -504,16 +504,12 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) 
 **/

static void ixgbe_stop_mac_link_on_d3_82599(struct ixgbe_hw *hw)

{

	u32 autoc2_reg, fwsm;

	u32 autoc2_reg;

	u16 ee_ctrl_2 = 0;



	hw->eeprom.ops.read(hw, IXGBE_EEPROM_CTRL_2, &ee_ctrl_2);



	/* Check to see if MNG FW could be enabled */

	fwsm = IXGBE_READ_REG(hw, IXGBE_FWSM(hw));



	if (((fwsm & IXGBE_FWSM_MODE_MASK) != IXGBE_FWSM_FW_MODE_PT) &&

	    !hw->wol_enabled &&

	if (!ixgbe_mng_present(hw) && !hw->wol_enabled &&

	    ee_ctrl_2 & IXGBE_EEPROM_CCD_BIT) {

		autoc2_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC2);

		autoc2_reg |= IXGBE_AUTOC2_LINK_DISABLE_ON_D3_MASK;

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

+15 −0
Original line number Diff line number Diff line
@@ -3905,3 +3905,18 @@ void ixgbe_enable_rx_generic(struct ixgbe_hw *hw) 
		}

	}

}



/** ixgbe_mng_present - returns true when management capability is present

 * @hw: pointer to hardware structure

 **/

bool ixgbe_mng_present(struct ixgbe_hw *hw)

{

	u32 fwsm;



	if (hw->mac.type < ixgbe_mac_82599EB)

		return false;



	fwsm = IXGBE_READ_REG(hw, IXGBE_FWSM(hw));

	fwsm &= IXGBE_FWSM_MODE_MASK;

	return fwsm == IXGBE_FWSM_FW_MODE_PT;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min, 
s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,

				 u32 length, u32 timeout, bool return_data);

void ixgbe_clear_tx_pending(struct ixgbe_hw *hw);

bool ixgbe_mng_present(struct ixgbe_hw *hw);

bool ixgbe_mng_enabled(struct ixgbe_hw *hw);



void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int num_pb,