svn commit: r301366 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Sat Jun  4 16:31:04 2016
New Revision: 301366
URL: https://svnweb.freebsd.org/changeset/base/301366

Log:
  MFC r299905
  
  sfxge(4): fix V1 licensing MCDI operations
  
  Implementation of the MCDI commands for Siena boards was requesting
  the wrong operation.
  
  Submitted by:   Richard Houldsworth <rhouldsworth at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx_lic.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_lic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_lic.c	Sat Jun  4 16:28:52 2016	(r301365)
+++ stable/10/sys/dev/sfxge/common/efx_lic.c	Sat Jun  4 16:31:04 2016	(r301366)
@@ -349,12 +349,15 @@ efx_mcdi_fc_license_update_license(
 	EFSYS_ASSERT(enp->en_family == EFX_FAMILY_SIENA);
 
 	(void) memset(payload, 0, sizeof (payload));
-	req.emr_cmd = MC_CMD_FC_OP_LICENSE;
+	req.emr_cmd = MC_CMD_FC;
 	req.emr_in_buf = payload;
 	req.emr_in_length = MC_CMD_FC_IN_LICENSE_LEN;
 	req.emr_out_buf = payload;
 	req.emr_out_length = 0;
 
+	MCDI_IN_SET_DWORD(req, FC_IN_CMD,
+	    MC_CMD_FC_OP_LICENSE);
+
 	MCDI_IN_SET_DWORD(req, FC_IN_LICENSE_OP,
 	    MC_CMD_FC_IN_LICENSE_UPDATE_LICENSE);
 
@@ -393,12 +396,15 @@ efx_mcdi_fc_license_get_key_stats(
 	EFSYS_ASSERT(enp->en_family == EFX_FAMILY_SIENA);
 
 	(void) memset(payload, 0, sizeof (payload));
-	req.emr_cmd = MC_CMD_FC_OP_LICENSE;
+	req.emr_cmd = MC_CMD_FC;
 	req.emr_in_buf = payload;
 	req.emr_in_length = MC_CMD_FC_IN_LICENSE_LEN;
 	req.emr_out_buf = payload;
 	req.emr_out_length = MC_CMD_FC_OUT_LICENSE_LEN;
 
+	MCDI_IN_SET_DWORD(req, FC_IN_CMD,
+	    MC_CMD_FC_OP_LICENSE);
+
 	MCDI_IN_SET_DWORD(req, FC_IN_LICENSE_OP,
 	    MC_CMD_FC_IN_LICENSE_GET_KEY_STATS);