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

Commit 22896639 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: change how we handle alternate mac addresses 



This patch allows us to treat the alternate mac address as though it is the
physical address on the adapter.  This is accomplished by letting the
alt_mac_address function to only fail on an NVM error.  If no errors occur
and the alternate mac address is not present then RAR0 is read as the
default mac address.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3272686c

drivers/net/igb/e1000_82575.c

+11 −2
Original line number Diff line number Diff line
@@ -1152,9 +1152,18 @@ static s32 igb_read_mac_addr_82575(struct e1000_hw *hw) 
{

	s32 ret_val = 0;



	if (igb_check_alt_mac_addr(hw))

	/*

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

	 * so that it will override the Si installed default perm

	 * address.

	 */

	ret_val = igb_check_alt_mac_addr(hw);

	if (ret_val)

		goto out;



	ret_val = igb_read_mac_addr(hw);



out:

	return ret_val;

}

drivers/net/igb/e1000_hw.h

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ struct e1000_hw; 
#define E1000_FUNC_0     0

#define E1000_FUNC_1     1



#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3



enum e1000_mac_type {

	e1000_undefined = 0,

	e1000_82575,

drivers/net/igb/e1000_mac.c

+9 −8
Original line number Diff line number Diff line
@@ -185,13 +185,12 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw) 
	}



	if (nvm_alt_mac_addr_offset == 0xFFFF) {

		ret_val = -(E1000_NOT_IMPLEMENTED);

		/* There is no Alternate MAC Address */

		goto out;

	}



	if (hw->bus.func == E1000_FUNC_1)

		nvm_alt_mac_addr_offset += ETH_ALEN/sizeof(u16);



		nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1;

	for (i = 0; i < ETH_ALEN; i += 2) {

		offset = nvm_alt_mac_addr_offset + (i >> 1);

		ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data);
@@ -206,14 +205,16 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw) 


	/* if multicast bit is set, the alternate address will not be used */

	if (alt_mac_addr[0] & 0x01) {

		ret_val = -(E1000_NOT_IMPLEMENTED);

		hw_dbg("Ignoring Alternate Mac Address with MC bit set\n");

		goto out;

	}



	for (i = 0; i < ETH_ALEN; i++)

		hw->mac.addr[i] = hw->mac.perm_addr[i] = alt_mac_addr[i];



	hw->mac.ops.rar_set(hw, hw->mac.perm_addr, 0);

	/*

	 * We have a valid alternate MAC address, and we want to treat it the

	 * same as the normal permanent MAC address stored by the HW into the

	 * RAR. Do this by mapping this address into RAR0.

	 */

	hw->mac.ops.rar_set(hw, alt_mac_addr, 0);



out:

	return ret_val;