Print this page
6064 ixgbe needs X550 support

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/ixgbe/ixgbe_debug.h
          +++ new/usr/src/uts/common/io/ixgbe/ixgbe_debug.h
↓ open down ↓ 18 lines elided ↑ open up ↑
  19   19   * information: Portions Copyright [yyyy] [name of copyright owner]
  20   20   *
  21   21   * CDDL HEADER END
  22   22   */
  23   23  
  24   24  /*
  25   25   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  26   26   * Use is subject to license terms.
  27   27   */
  28   28  
       29 +/*
       30 + * Copyright 2016 OmniTI Computer Consulting, Inc. All rights reserved.
       31 + */
       32 +
  29   33  #ifndef _IXGBE_DEBUG_H
  30   34  #define _IXGBE_DEBUG_H
  31   35  
  32   36  #ifdef __cplusplus
  33   37  extern "C" {
  34   38  #endif
  35   39  
  36   40  
  37   41  #ifdef DEBUG
  38   42  #define IXGBE_DEBUG
↓ open down ↓ 21 lines elided ↑ open up ↑
  60   64  #define IXGBE_DEBUGLOG_1(adapter, fmt, d1)
  61   65  #define IXGBE_DEBUGLOG_2(adapter, fmt, d1, d2)
  62   66  #define IXGBE_DEBUGLOG_3(adapter, fmt, d1, d2, d3)
  63   67  #define IXGBE_DEBUGLOG_6(adapter, fmt, d1, d2, d3, d4, d5, d6)
  64   68  
  65   69  #define IXGBE_DEBUG_STAT_COND(val, cond)
  66   70  #define IXGBE_DEBUG_STAT(val)
  67   71  
  68   72  #endif  /* IXGBE_DEBUG */
  69   73  
  70      -#define IXGBE_STAT(val)         (val)++;
  71      -
  72   74  #ifdef IXGBE_DEBUG
  73      -
  74   75  void ixgbe_pci_dump(void *);
  75   76  void ixgbe_dump_interrupt(void *, char *);
  76   77  void ixgbe_dump_addr(void *, char *, const uint8_t *);
  77   78  
  78      -#endif  /* IXGBE_DEBUG */
  79      -
  80      -#ifdef IXGBE_DEBUG
  81      -
  82   79  #define DEBUGOUT(S)     \
  83   80          IXGBE_DEBUGLOG_0(NULL, S)
  84   81  #define DEBUGOUT1(S, A) \
  85   82          IXGBE_DEBUGLOG_1(NULL, S, A)
  86   83  #define DEBUGOUT2(S, A, B)      \
  87   84          IXGBE_DEBUGLOG_2(NULL, S, A, B)
  88   85  #define DEBUGOUT3(S, A, B, C)   \
  89   86          IXGBE_DEBUGLOG_3(NULL, S, A, B, C)
  90   87  #define DEBUGOUT6(S, A, B, C, D, E, F)  \
  91   88          IXGBE_DEBUGLOG_6(NULL, S, A, B, C, D, E, F)
  92   89  
  93      -/*
  94      - * DEBUGFUNC() is used to print the function call information, however since
  95      - * Dtrace in Solaris can be used to trace function calls, this function is
  96      - * not useful in Solaris, and DEBUGFUNC() can spam a large number of
  97      - * function call system logs (see CR6918426). We sould eliminate
  98      - * DEBUGFUNC(), but since DEBUGFUNC() is used by the shared code
  99      - * (maintained by Intel) which is used and shared by ixgbe drivers in
 100      - * different OSes, we can not remove it, so in Solaris just simply define
 101      - * it as blank.
 102      - */
 103      -#define DEBUGFUNC(F)
       90 +#define IXGBE_ERROR_INVALID_STATE       "INVALID STATE"
       91 +#define IXGBE_ERROR_POLLING             "POLLING ERROR"
       92 +#define IXGBE_ERROR_CAUTION             "CAUTION"
       93 +#define IXGBE_ERROR_SOFTWARE            "SOFTWARE ERROR"
       94 +#define IXGBE_ERROR_ARGUMENT            "BAD ARGUMENT"
       95 +#define IXGBE_ERROR_UNSUPPORTED         "UNSUPPORTED"
 104   96  
       97 +#define ERROR_REPORT1(S, A)             DEBUGOUT1(S, A)
       98 +#define ERROR_REPORT2(S, A, B)          DEBUGOUT2(S, A, B)
       99 +#define ERROR_REPORT3(S, A, B, C)       DEBUGOUT3(S, A, B, C)
      100 +
 105  101  #else
 106  102  
 107  103  #define DEBUGOUT(S)
 108  104  #define DEBUGOUT1(S, A)
 109  105  #define DEBUGOUT2(S, A, B)
 110  106  #define DEBUGOUT3(S, A, B, C)
 111  107  #define DEBUGOUT6(S, A, B, C, D, E, F)
 112  108  
 113      -#define DEBUGFUNC(F)
      109 +#define ERROR_REPORT1(S, A)
      110 +#define ERROR_REPORT2(S, A, B)
      111 +#define ERROR_REPORT3(S, A, B, C)
 114  112  
 115  113  #endif  /* IXGBE_DEBUG */
 116  114  
      115 +/*
      116 + * DEBUGFUNC() is used to print the function call information, however since
      117 + * DTrace in illumos can be used to trace function calls, this function is
      118 + * not useful in illumos, and DEBUGFUNC() can spam a large number of
      119 + * function call system logs (see CR6918426). We sould eliminate
      120 + * DEBUGFUNC(), but since DEBUGFUNC() is used by the shared code
      121 + * (maintained by Intel) which is used and shared by ixgbe drivers in
      122 + * different OSes, we can not remove it, so in illumos just simply define
      123 + * it as blank.
      124 + */
      125 +#define DEBUGFUNC(F)
      126 +
      127 +#define IXGBE_STAT(val)         (val)++;
      128 +
 117  129  extern void ixgbe_log(void *, const char *, ...);
 118  130  
 119  131  #ifdef __cplusplus
 120  132  }
 121  133  #endif
 122  134  
 123  135  #endif  /* _IXGBE_DEBUG_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX