svn commit: r291585 - head/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Tue Dec  1 15:26:46 2015
New Revision: 291585
URL: https://svnweb.freebsd.org/changeset/base/291585

Log:
  sfxge: support MAC spoofing for 4.2.x firmare
  
  Common code should infer other privileges from Admin privilege to
  support firmware that pre-dates introduction of specific privilege
  flags.
  
  Submitted by:   Richard Houldsworth <rhouldsworth at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      2 days
  Differential Revision: https://reviews.freebsd.org/D4327

Modified:
  head/sys/dev/sfxge/common/hunt_mcdi.c

Modified: head/sys/dev/sfxge/common/hunt_mcdi.c
==============================================================================
--- head/sys/dev/sfxge/common/hunt_mcdi.c	Tue Dec  1 14:55:24 2015	(r291584)
+++ head/sys/dev/sfxge/common/hunt_mcdi.c	Tue Dec  1 15:26:46 2015	(r291585)
@@ -435,7 +435,11 @@ hunt_mcdi_fw_update_supported(
 
 	EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_HUNTINGTON);
 
-	/* use privilege mask state at MCDI attach */
+	/*
+	 * Use privilege mask state at MCDI attach.
+	 * Admin privilege must be used prior to introduction of
+	 * specific flag.
+	 */
 	*supportedp = (encp->enc_privilege_mask &
 	    MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN)
 	    == MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN;
@@ -449,13 +453,20 @@ hunt_mcdi_macaddr_change_supported(
 	__out		boolean_t *supportedp)
 {
 	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
+	uint32_t privilege_mask = encp->enc_privilege_mask;
 
 	EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_HUNTINGTON);
 
-	/* use privilege mask state at MCDI attach */
-	*supportedp = (encp->enc_privilege_mask &
-	    MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING)
-	    == MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING;
+	/*
+	 * Use privilege mask state at MCDI attach.
+	 * Admin privilege must be used prior to introduction of
+	 * specific flag (at v4.6).
+	 */
+	*supportedp =
+	    ((privilege_mask & MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING) ==
+	    MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING) ||
+	    ((privilege_mask & MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN) ==
+	    MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN);
 
 	return (0);
 }