scsi: qla2xxx: fix error message on <qla2400

This patch fixes IO traps caught by hardware when mailbox command fails
on qla2200. The error handler assumes newer firmware that is available
on 2400 and newer HBA-s.

This causes ugly crashes on sparc64.

Fix it with separate debug prints on different firmware generations like
most other places do.

[mkp: updated based on feedback from Himanshu]

Signed-off-by: Meelis Roos <mroos@linux.ee>
Acked-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

2 files changed, 14 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 3e9dc54b89a3..d52ee990707d 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -14,7 +14,7 @@
  * | Module Init and Probe        |       0x0193       | 0x0146         |
  * |                              |                    | 0x015b-0x0160  |
  * |                              |                    | 0x016e         |
- * | Mailbox commands             |       0x1205       | 0x11a2-0x11ff  |
+ * | Mailbox commands             |       0x1206       | 0x11a2-0x11ff  |
  * | Device Discovery             |       0x2134       | 0x210e-0x2116  |
  * |                              |                    | 0x211a         |
  * |                              |                    | 0x211c-0x2128  |
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 7397aeddd96c..9a97f2ceffba 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -503,11 +503,19 @@ mbx_done:
                                 }
                         pr_warn(" cmd=%x ****\n", command);
                 }
-                ql_dbg(ql_dbg_mbx, vha, 0x1198,
-                    "host_status=%#x intr_ctrl=%#x intr_status=%#x\n",
-                    RD_REG_DWORD(&reg->isp24.host_status),
-                    RD_REG_DWORD(&reg->isp24.ictrl),
-                    RD_REG_DWORD(&reg->isp24.istatus));
+                if (IS_FWI2_CAPABLE(ha) && !(IS_P3P_TYPE(ha))) {
+                        ql_dbg(ql_dbg_mbx, vha, 0x1198,
+                            "host_status=%#x intr_ctrl=%#x intr_status=%#x\n",
+                            RD_REG_DWORD(&reg->isp24.host_status),
+                            RD_REG_DWORD(&reg->isp24.ictrl),
+                            RD_REG_DWORD(&reg->isp24.istatus));
+                } else {
+                        ql_dbg(ql_dbg_mbx, vha, 0x1206,
+                            "ctrl_status=%#x ictrl=%#x istatus=%#x\n",
+                            RD_REG_WORD(&reg->isp.ctrl_status),
+                            RD_REG_WORD(&reg->isp.ictrl),
+                            RD_REG_WORD(&reg->isp.istatus));
+                }
         } else {
                 ql_dbg(ql_dbg_mbx, base_vha, 0x1021, "Done %s.\n", __func__);
         }