aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/qla4xxx/ql4_dbg.h7
-rw-r--r--drivers/scsi/qla4xxx/ql4_isr.c8
2 files changed, 11 insertions, 4 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_dbg.h b/drivers/scsi/qla4xxx/ql4_dbg.h
index 5b0afc18ef18..51c365bcf912 100644
--- a/drivers/scsi/qla4xxx/ql4_dbg.h
+++ b/drivers/scsi/qla4xxx/ql4_dbg.h
@@ -12,6 +12,7 @@
12/* #define QL_DEBUG_LEVEL_3 */ /* Output function tracing */ 12/* #define QL_DEBUG_LEVEL_3 */ /* Output function tracing */
13/* #define QL_DEBUG_LEVEL_4 */ 13/* #define QL_DEBUG_LEVEL_4 */
14/* #define QL_DEBUG_LEVEL_5 */ 14/* #define QL_DEBUG_LEVEL_5 */
15/* #define QL_DEBUG_LEVEL_7 */
15/* #define QL_DEBUG_LEVEL_9 */ 16/* #define QL_DEBUG_LEVEL_9 */
16 17
17#define QL_DEBUG_LEVEL_2 /* ALways enable error messagess */ 18#define QL_DEBUG_LEVEL_2 /* ALways enable error messagess */
@@ -48,6 +49,12 @@
48#define DEBUG5(x) do {} while (0); 49#define DEBUG5(x) do {} while (0);
49#endif /* */ 50#endif /* */
50 51
52#if defined(QL_DEBUG_LEVEL_7)
53#define DEBUG7(x) do {x; } while (0)
54#else /* */
55#define DEBUG7(x) do {} while (0)
56#endif /* */
57
51#if defined(QL_DEBUG_LEVEL_9) 58#if defined(QL_DEBUG_LEVEL_9)
52#define DEBUG9(x) do {x;} while (0); 59#define DEBUG9(x) do {x;} while (0);
53#else /* */ 60#else /* */
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 1b83dc283d2e..e02a884b950b 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -1099,8 +1099,8 @@ irqreturn_t qla4_82xx_intr_handler(int irq, void *dev_id)
1099 1099
1100 status = qla4_82xx_rd_32(ha, ISR_INT_STATE_REG); 1100 status = qla4_82xx_rd_32(ha, ISR_INT_STATE_REG);
1101 if (!ISR_IS_LEGACY_INTR_TRIGGERED(status)) { 1101 if (!ISR_IS_LEGACY_INTR_TRIGGERED(status)) {
1102 DEBUG2(ql4_printk(KERN_INFO, ha, 1102 DEBUG7(ql4_printk(KERN_INFO, ha,
1103 "%s legacy Int not triggered\n", __func__)); 1103 "%s legacy Int not triggered\n", __func__));
1104 return IRQ_NONE; 1104 return IRQ_NONE;
1105 } 1105 }
1106 1106
@@ -1158,7 +1158,7 @@ irqreturn_t qla4_83xx_intr_handler(int irq, void *dev_id)
1158 1158
1159 /* Legacy interrupt is valid if bit31 of leg_int_ptr is set */ 1159 /* Legacy interrupt is valid if bit31 of leg_int_ptr is set */
1160 if (!(leg_int_ptr & LEG_INT_PTR_B31)) { 1160 if (!(leg_int_ptr & LEG_INT_PTR_B31)) {
1161 DEBUG2(ql4_printk(KERN_ERR, ha, 1161 DEBUG7(ql4_printk(KERN_ERR, ha,
1162 "%s: Legacy Interrupt Bit 31 not set, spurious interrupt!\n", 1162 "%s: Legacy Interrupt Bit 31 not set, spurious interrupt!\n",
1163 __func__)); 1163 __func__));
1164 return IRQ_NONE; 1164 return IRQ_NONE;
@@ -1166,7 +1166,7 @@ irqreturn_t qla4_83xx_intr_handler(int irq, void *dev_id)
1166 1166
1167 /* Validate the PCIE function ID set in leg_int_ptr bits [19..16] */ 1167 /* Validate the PCIE function ID set in leg_int_ptr bits [19..16] */
1168 if ((leg_int_ptr & PF_BITS_MASK) != ha->pf_bit) { 1168 if ((leg_int_ptr & PF_BITS_MASK) != ha->pf_bit) {
1169 DEBUG2(ql4_printk(KERN_ERR, ha, 1169 DEBUG7(ql4_printk(KERN_ERR, ha,
1170 "%s: Incorrect function ID 0x%x in legacy interrupt register, ha->pf_bit = 0x%x\n", 1170 "%s: Incorrect function ID 0x%x in legacy interrupt register, ha->pf_bit = 0x%x\n",
1171 __func__, (leg_int_ptr & PF_BITS_MASK), 1171 __func__, (leg_int_ptr & PF_BITS_MASK),
1172 ha->pf_bit)); 1172 ha->pf_bit));