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

[Andrew Rybchenko]

Author: arybchik
Date: Sat Jun  4 16:36:23 2016
New Revision: 301371
URL: https://svnweb.freebsd.org/changeset/base/301371

Log:
  MFC r299915
  
  sfxge(4): improve TX/RX queue error messages
  
  Report the full error descriptor in a form that can be passed to
  firmwaresrc/dpcpu/scripts/evdecode
  
  Submitted by:   Mark Spender <mspender at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

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

Modified: stable/10/sys/dev/sfxge/common/ef10_ev.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/ef10_ev.c	Sat Jun  4 16:35:29 2016	(r301370)
+++ stable/10/sys/dev/sfxge/common/ef10_ev.c	Sat Jun  4 16:36:23 2016	(r301371)
@@ -871,7 +871,9 @@ ef10_ev_mcdi(
 		 */
 		enp->en_reset_flags |= EFX_RESET_TXQ_ERR;
 
-		EFSYS_PROBE1(tx_descq_err, uint32_t, MCDI_EV_FIELD(eqp, DATA));
+		EFSYS_PROBE2(tx_descq_err,
+			    uint32_t, EFX_QWORD_FIELD(*eqp, EFX_DWORD_1),
+			    uint32_t, EFX_QWORD_FIELD(*eqp, EFX_DWORD_0));
 
 		/* Inform the driver that a reset is required. */
 		eecp->eec_exception(arg, EFX_EXCEPTION_TX_ERROR,
@@ -911,7 +913,9 @@ ef10_ev_mcdi(
 		 */
 		enp->en_reset_flags |= EFX_RESET_RXQ_ERR;
 
-		EFSYS_PROBE1(rx_descq_err, uint32_t, MCDI_EV_FIELD(eqp, DATA));
+		EFSYS_PROBE2(rx_descq_err,
+			    uint32_t, EFX_QWORD_FIELD(*eqp, EFX_DWORD_1),
+			    uint32_t, EFX_QWORD_FIELD(*eqp, EFX_DWORD_0));
 
 		/* Inform the driver that a reset is required. */
 		eecp->eec_exception(arg, EFX_EXCEPTION_RX_ERROR,