Commit 5df42c82 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

ice: fix MAC write command 



The manage MAC write command was implemented in an overly complex way
that actually didn't work, as it wasn't symmetric to the manage MAC
read command, and was feeding bytes out of order to the firmware. Fix
the implementation by just using a simple array to represent the MAC
address when it is being written via firmware command.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bf8987df

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+4 −6
Original line number Diff line number Diff line
@@ -156,13 +156,11 @@ struct ice_aqc_manage_mac_write { 
#define ICE_AQC_MAN_MAC_WR_MC_MAG_EN		BIT(0)

#define ICE_AQC_MAN_MAC_WR_WOL_LAA_PFR_KEEP	BIT(1)

#define ICE_AQC_MAN_MAC_WR_S		6

#define ICE_AQC_MAN_MAC_WR_M		(3 << ICE_AQC_MAN_MAC_WR_S)

#define ICE_AQC_MAN_MAC_WR_M		ICE_M(3, ICE_AQC_MAN_MAC_WR_S)

#define ICE_AQC_MAN_MAC_UPDATE_LAA	0

#define ICE_AQC_MAN_MAC_UPDATE_LAA_WOL	(BIT(0) << ICE_AQC_MAN_MAC_WR_S)

	/* High 16 bits of MAC address in big endian order */

	__be16 sah;

	/* Low 32 bits of MAC address in big endian order */

	__be32 sal;

#define ICE_AQC_MAN_MAC_UPDATE_LAA_WOL	BIT(ICE_AQC_MAN_MAC_WR_S)

	/* byte stream in network order */

	u8 mac_addr[ETH_ALEN];

	__le32 addr_high;

	__le32 addr_low;

};

drivers/net/ethernet/intel/ice/ice_common.c

+1 −4
Original line number Diff line number Diff line
@@ -1994,10 +1994,7 @@ ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags, 
	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_manage_mac_write);



	cmd->flags = flags;



	/* Prep values for flags, sah, sal */

	cmd->sah = htons(*((const u16 *)mac_addr));

	cmd->sal = htonl(*((const u32 *)(mac_addr + 2)));

	ether_addr_copy(cmd->mac_addr, mac_addr);



	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);

}