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

Commit 608f8a0d authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: use alternate MAC address on ESB2 if available 



Similar to 82571/2/3 parts that already do this, if ESB2/80003es2lan parts
have an alternate MAC address provided in the EEPROM use it instead of the
default MAC address.  This patch makes the the actual code that does this
generic so that it can be better used by both MAC families.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0159f24e

drivers/net/e1000e/82571.c

+30 −3
Original line number Diff line number Diff line
@@ -922,8 +922,11 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) 
	ew32(IMC, 0xffffffff);

	icr = er32(ICR);



	if (hw->mac.type == e1000_82571 &&

		hw->dev_spec.e82571.alt_mac_addr_is_present)

	/* Install any alternate MAC address into RAR0 */

	ret_val = e1000_check_alt_mac_addr_generic(hw);

	if (ret_val)

		return ret_val;



	e1000e_set_laa_state_82571(hw, true);



	/* Reinitialize the 82571 serdes link state machine */
@@ -1620,6 +1623,29 @@ static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw) 
	return 0;

}



/**

 *  e1000_read_mac_addr_82571 - Read device MAC address

 *  @hw: pointer to the HW structure

 **/

static s32 e1000_read_mac_addr_82571(struct e1000_hw *hw)

{

	s32 ret_val = 0;



	/*

	 * If there's an alternate MAC address place it in RAR0

	 * so that it will override the Si installed default perm

	 * address.

	 */

	ret_val = e1000_check_alt_mac_addr_generic(hw);

	if (ret_val)

		goto out;



	ret_val = e1000_read_mac_addr_generic(hw);



out:

	return ret_val;

}



/**

 * e1000_power_down_phy_copper_82571 - Remove link during PHY power down

 * @hw: pointer to the HW structure
@@ -1706,6 +1732,7 @@ static struct e1000_mac_operations e82571_mac_ops = { 
	.setup_link		= e1000_setup_link_82571,

	/* .setup_physical_interface: media type dependent */

	.setup_led		= e1000e_setup_led_generic,

	.read_mac_addr		= e1000_read_mac_addr_82571,

};



static struct e1000_phy_operations e82_phy_ops_igp = {

drivers/net/e1000e/defines.h

+2 −0
Original line number Diff line number Diff line
@@ -460,6 +460,8 @@ 
 */

#define E1000_RAR_ENTRIES     15

#define E1000_RAH_AV  0x80000000        /* Receive descriptor valid */

#define E1000_RAL_MAC_ADDR_LEN 4

#define E1000_RAH_MAC_ADDR_LEN 2



/* Error Codes */

#define E1000_ERR_NVM      1

drivers/net/e1000e/e1000.h

+10 −1
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ extern s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw); 
extern s32 e1000e_force_mac_fc(struct e1000_hw *hw);

extern s32 e1000e_blink_led(struct e1000_hw *hw);

extern void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);

extern s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw);

extern void e1000e_reset_adaptive(struct e1000_hw *hw);

extern void e1000e_update_adaptive(struct e1000_hw *hw);
@@ -629,7 +630,15 @@ extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 
extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);

extern void e1000e_release_nvm(struct e1000_hw *hw);

extern void e1000e_reload_nvm(struct e1000_hw *hw);

extern s32 e1000e_read_mac_addr(struct e1000_hw *hw);

extern s32 e1000_read_mac_addr_generic(struct e1000_hw *hw);



static inline s32 e1000e_read_mac_addr(struct e1000_hw *hw)

{

	if (hw->mac.ops.read_mac_addr)

		return hw->mac.ops.read_mac_addr(hw);



	return e1000_read_mac_addr_generic(hw);

}



static inline s32 e1000_validate_nvm_checksum(struct e1000_hw *hw)

{

drivers/net/e1000e/es2lan.c

+27 −1
Original line number Diff line number Diff line
@@ -814,7 +814,9 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) 
	ew32(IMC, 0xffffffff);

	icr = er32(ICR);



	return 0;

	ret_val = e1000_check_alt_mac_addr_generic(hw);



	return ret_val;

}



/**
@@ -1339,6 +1341,29 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, 
	return ret_val;

}



/**

 *  e1000_read_mac_addr_80003es2lan - Read device MAC address

 *  @hw: pointer to the HW structure

 **/

static s32 e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw)

{

	s32 ret_val = 0;



	/*

	 * If there's an alternate MAC address place it in RAR0

	 * so that it will override the Si installed default perm

	 * address.

	 */

	ret_val = e1000_check_alt_mac_addr_generic(hw);

	if (ret_val)

		goto out;



	ret_val = e1000_read_mac_addr_generic(hw);



out:

	return ret_val;

}



/**

 * e1000_power_down_phy_copper_80003es2lan - Remove link during PHY power down

 * @hw: pointer to the HW structure
@@ -1403,6 +1428,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) 
}



static struct e1000_mac_operations es2_mac_ops = {

	.read_mac_addr		= e1000_read_mac_addr_80003es2lan,

	.id_led_init		= e1000e_id_led_init,

	.check_mng_mode		= e1000e_check_mng_mode_generic,

	/* check_for_link dependent on media type */

drivers/net/e1000e/hw.h

+4 −1
Original line number Diff line number Diff line
@@ -389,6 +389,9 @@ enum e1e_registers { 


#define E1000_FUNC_1 1



#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0

#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3



enum e1000_mac_type {

	e1000_82571,

	e1000_82572,
@@ -756,6 +759,7 @@ struct e1000_mac_operations { 
	s32  (*setup_physical_interface)(struct e1000_hw *);

	s32  (*setup_led)(struct e1000_hw *);

	void (*write_vfta)(struct e1000_hw *, u32, u32);

	s32  (*read_mac_addr)(struct e1000_hw *);

};



/* Function pointers for the PHY. */
@@ -897,7 +901,6 @@ struct e1000_fc_info { 


struct e1000_dev_spec_82571 {

	bool laa_is_present;

	bool alt_mac_addr_is_present;

	u32 smb_counter;

};