1 files changed, 47 insertions, 140 deletions

diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index 930414541ec6..98a377b99017 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -8,146 +8,6 @@
 #include "qla_def.h"
 
 /*
- * Driver debug definitions.
- */
-/* #define QL_DEBUG_LEVEL_1  */ /* Output register accesses to COM1 */
-/* #define QL_DEBUG_LEVEL_2  */ /* Output error msgs to COM1 */
-/* #define QL_DEBUG_LEVEL_3  */ /* Output function trace msgs to COM1 */
-/* #define QL_DEBUG_LEVEL_4  */ /* Output NVRAM trace msgs to COM1 */
-/* #define QL_DEBUG_LEVEL_5  */ /* Output ring trace msgs to COM1 */
-/* #define QL_DEBUG_LEVEL_6  */ /* Output WATCHDOG timer trace to COM1 */
-/* #define QL_DEBUG_LEVEL_7  */ /* Output RISC load trace msgs to COM1 */
-/* #define QL_DEBUG_LEVEL_8  */ /* Output ring saturation msgs to COM1 */
-/* #define QL_DEBUG_LEVEL_9  */ /* Output IOCTL trace msgs */
-/* #define QL_DEBUG_LEVEL_10 */ /* Output IOCTL error msgs */
-/* #define QL_DEBUG_LEVEL_11 */ /* Output Mbx Cmd trace msgs */
-/* #define QL_DEBUG_LEVEL_12 */ /* Output IP trace msgs */
-/* #define QL_DEBUG_LEVEL_13 */ /* Output fdmi function trace msgs */
-/* #define QL_DEBUG_LEVEL_14 */ /* Output RSCN trace msgs */
-/* #define QL_DEBUG_LEVEL_15 */ /* Output NPIV trace msgs */
-/* #define QL_DEBUG_LEVEL_16 */ /* Output ISP84XX trace msgs */
-/* #define QL_DEBUG_LEVEL_17 */ /* Output EEH trace messages */
-/* #define QL_DEBUG_LEVEL_18 */ /* Output T10 CRC trace messages */
-
-/*
-* Macros use for debugging the driver.
-*/
-
-#define DEBUG(x)        do { if (ql2xextended_error_logging) { x; } } while (0)
-
-#if defined(QL_DEBUG_LEVEL_1)
-#define DEBUG1(x)       do {x;} while (0)
-#else
-#define DEBUG1(x)       do {} while (0)
-#endif
-
-#define DEBUG2(x)       do { if (ql2xextended_error_logging) { x; } } while (0)
-#define DEBUG2_3(x)     do { if (ql2xextended_error_logging) { x; } } while (0)
-#define DEBUG2_3_11(x)  do { if (ql2xextended_error_logging) { x; } } while (0)
-#define DEBUG2_9_10(x)  do { if (ql2xextended_error_logging) { x; } } while (0)
-#define DEBUG2_11(x)    do { if (ql2xextended_error_logging) { x; } } while (0)
-#define DEBUG2_13(x)    do { if (ql2xextended_error_logging) { x; } } while (0)
-#define DEBUG2_16(x)    do { if (ql2xextended_error_logging) { x; } } while (0)
-#define DEBUG2_17(x)    do { if (ql2xextended_error_logging) { x; } } while (0)
-
-#if defined(QL_DEBUG_LEVEL_3)
-#define DEBUG3(x)       do {x;} while (0)
-#define DEBUG3_11(x)    do {x;} while (0)
-#else
-#define DEBUG3(x)       do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_4)
-#define DEBUG4(x)       do {x;} while (0)
-#else
-#define DEBUG4(x)       do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_5)
-#define DEBUG5(x)          do {x;} while (0)
-#else
-#define DEBUG5(x)       do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_7)
-#define DEBUG7(x)          do {x;} while (0)
-#else
-#define DEBUG7(x)          do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_9)
-#define DEBUG9(x)       do {x;} while (0)
-#define DEBUG9_10(x)    do {x;} while (0)
-#else
-#define DEBUG9(x)       do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_10)
-#define DEBUG10(x)      do {x;} while (0)
-#define DEBUG9_10(x)    do {x;} while (0)
-#else
-#define DEBUG10(x)      do {} while (0)
-  #if !defined(DEBUG9_10)
-  #define DEBUG9_10(x)  do {} while (0)
-  #endif
-#endif
-
-#if defined(QL_DEBUG_LEVEL_11)
-#define DEBUG11(x)      do{x;} while(0)
-#if !defined(DEBUG3_11)
-#define DEBUG3_11(x)    do{x;} while(0)
-#endif
-#else
-#define DEBUG11(x)      do{} while(0)
-  #if !defined(QL_DEBUG_LEVEL_3)
-  #define DEBUG3_11(x)  do{} while(0)
-  #endif
-#endif
-
-#if defined(QL_DEBUG_LEVEL_12)
-#define DEBUG12(x)      do {x;} while (0)
-#else
-#define DEBUG12(x)      do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_13)
-#define DEBUG13(x)      do {x;} while (0)
-#else
-#define DEBUG13(x)      do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_14)
-#define DEBUG14(x)      do {x;} while (0)
-#else
-#define DEBUG14(x)      do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_15)
-#define DEBUG15(x)      do {x;} while (0)
-#else
-#define DEBUG15(x)      do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_16)
-#define DEBUG16(x)      do {x;} while (0)
-#else
-#define DEBUG16(x)      do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_17)
-#define DEBUG17(x)      do {x;} while (0)
-#else
-#define DEBUG17(x)      do {} while (0)
-#endif
-
-#if defined(QL_DEBUG_LEVEL_18)
-#define DEBUG18(x)      do {if (ql2xextended_error_logging) x; } while (0)
-#else
-#define DEBUG18(x)      do {} while (0)
-#endif
-
-
-/*
  * Firmware Dump structure definition
  */
 
@@ -370,3 +230,50 @@ struct qla2xxx_fw_dump {
                 struct qla81xx_fw_dump isp81;
         } isp;
 };
+
+#define QL_MSGHDR "qla2xxx"
+
+#define ql_log_fatal            0 /* display fatal errors */
+#define ql_log_warn             1 /* display critical errors */
+#define ql_log_info             2 /* display all recovered errors */
+#define ql_log_all              3 /* This value is only used by ql_errlev.
+                                   * No messages will use this value.
+                                   * This should be always highest value
+                                   * as compared to other log levels.
+                                   */
+
+extern int ql_errlev;
+
+void
+ql_dbg(uint32_t, scsi_qla_host_t *vha, int32_t, char *, ...);
+void
+ql_dbg_pci(uint32_t, struct pci_dev *pdev, int32_t, char *, ...);
+
+void
+ql_log(uint32_t, scsi_qla_host_t *vha, int32_t, char *, ...);
+void
+ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, char *, ...);
+
+/* Debug Levels */
+/* The 0x40000000 is the max value any debug level can have
+ * as ql2xextended_error_logging is of type signed int
+ */
+#define ql_dbg_init     0x40000000 /* Init Debug */
+#define ql_dbg_mbx      0x20000000 /* MBX Debug */
+#define ql_dbg_disc     0x10000000 /* Device Discovery Debug */
+#define ql_dbg_io       0x08000000 /* IO Tracing Debug */
+#define ql_dbg_dpc      0x04000000 /* DPC Thead Debug */
+#define ql_dbg_async    0x02000000 /* Async events Debug */
+#define ql_dbg_timer    0x01000000 /* Timer Debug */
+#define ql_dbg_user     0x00800000 /* User Space Interations Debug */
+#define ql_dbg_taskm    0x00400000 /* Task Management Debug */
+#define ql_dbg_aer      0x00200000 /* AER/EEH Debug */
+#define ql_dbg_multiq   0x00100000 /* MultiQ Debug */
+#define ql_dbg_p3p      0x00080000 /* P3P specific Debug */
+#define ql_dbg_vport    0x00040000 /* Virtual Port Debug */
+#define ql_dbg_buffer   0x00020000 /* For dumping the buffer/regs */
+#define ql_dbg_misc     0x00010000 /* For dumping everything that is not
+                                    * not covered by upper categories
+                                    */
+
+#define QL_DBG_BUF_LEN  512