[SCSI] lpfc 8.2.8 : Miscellaneous Bug Fixes

[linux-2.6-omap-h63xx.git] / drivers / scsi / lpfc / lpfc_debugfs.c

diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 2588eadffbb97ded61ee302a2ed00c033b4be2d2..f85b99a7c43d0fffb39df71bd1a5d9e60cfe6845 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -454,7 +454,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
        spin_lock_irq(&phba->hbalock);
 
        len +=  snprintf(buf+len, size-len, "SLIM Mailbox\n");
-       ptr = (uint32_t *)phba->slim2p;
+       ptr = (uint32_t *)phba->slim2p.virt;
        i = sizeof(MAILBOX_t);
        while (i > 0) {
                len +=  snprintf(buf+len, size-len,
@@ -467,7 +467,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
        }
 
        len +=  snprintf(buf+len, size-len, "SLIM PCB\n");
-       ptr = (uint32_t *)&phba->slim2p->pcb;
+       ptr = (uint32_t *)phba->pcb;
        i = sizeof(PCB_t);
        while (i > 0) {
                len +=  snprintf(buf+len, size-len,
@@ -479,44 +479,16 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
                off += (8 * sizeof(uint32_t));
        }
 
-       pgpp = (struct lpfc_pgp *)&phba->slim2p->mbx.us.s3_pgp.port;
-       pring = &psli->ring[0];
-       len +=  snprintf(buf+len, size-len,
-               "Ring 0: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "
-               "RSP PutInx:%d Max:%d\n",
-               pgpp->cmdGetInx, pring->numCiocb,
-               pring->next_cmdidx, pring->local_getidx, pring->flag,
-               pgpp->rspPutInx, pring->numRiocb);
-       pgpp++;
-
-       pring = &psli->ring[1];
-       len +=  snprintf(buf+len, size-len,
-               "Ring 1: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "
-               "RSP PutInx:%d Max:%d\n",
-               pgpp->cmdGetInx, pring->numCiocb,
-               pring->next_cmdidx, pring->local_getidx, pring->flag,
-               pgpp->rspPutInx, pring->numRiocb);
-       pgpp++;
-
-       pring = &psli->ring[2];
-       len +=  snprintf(buf+len, size-len,
-               "Ring 2: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "
-               "RSP PutInx:%d Max:%d\n",
-               pgpp->cmdGetInx, pring->numCiocb,
-               pring->next_cmdidx, pring->local_getidx, pring->flag,
-               pgpp->rspPutInx, pring->numRiocb);
-       pgpp++;
-
-       pring = &psli->ring[3];
-       len +=  snprintf(buf+len, size-len,
-               "Ring 3: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "
-               "RSP PutInx:%d Max:%d\n",
-               pgpp->cmdGetInx, pring->numCiocb,
-               pring->next_cmdidx, pring->local_getidx, pring->flag,
-               pgpp->rspPutInx, pring->numRiocb);
-
-
-       ptr = (uint32_t *)&phba->slim2p->mbx.us.s3_pgp.hbq_get;
+       for (i = 0; i < 4; i++) {
+               pgpp = &phba->port_gp[i];
+               pring = &psli->ring[i];
+               len +=  snprintf(buf+len, size-len,
+                                "Ring %d: CMD GetInx:%d (Max:%d Next:%d "
+                                "Local:%d flg:x%x)  RSP PutInx:%d Max:%d\n",
+                                i, pgpp->cmdGetInx, pring->numCiocb,
+                                pring->next_cmdidx, pring->local_getidx,
+                                pring->flag, pgpp->rspPutInx, pring->numRiocb);
+       }
        word0 = readl(phba->HAregaddr);
        word1 = readl(phba->CAregaddr);
        word2 = readl(phba->HSregaddr);
@@ -1147,7 +1119,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                atomic_set(&lpfc_debugfs_hba_count, 0);
                if (!lpfc_debugfs_root) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                        "0409 Cannot create debugfs root\n");
+                                        "0408 Cannot create debugfs root\n");
                        goto debug_failed;
                }
        }
@@ -1161,7 +1133,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                        debugfs_create_dir(name, lpfc_debugfs_root);
                if (!phba->hba_debugfs_root) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                        "0409 Cannot create debugfs hba\n");
+                                        "0412 Cannot create debugfs hba\n");
                        goto debug_failed;
                }
                atomic_inc(&lpfc_debugfs_hba_count);
@@ -1175,7 +1147,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 phba, &lpfc_debugfs_op_hbqinfo);
                if (!phba->debug_hbqinfo) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                               "0409 Cannot create debugfs hbqinfo\n");
+                               "0411 Cannot create debugfs hbqinfo\n");
                        goto debug_failed;
                }
 
@@ -1187,7 +1159,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 phba, &lpfc_debugfs_op_dumpHBASlim);
                if (!phba->debug_dumpHBASlim) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                               "0409 Cannot create debugfs dumpHBASlim\n");
+                               "0413 Cannot create debugfs dumpHBASlim\n");
                        goto debug_failed;
                }
 
@@ -1199,7 +1171,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 phba, &lpfc_debugfs_op_dumpHostSlim);
                if (!phba->debug_dumpHostSlim) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                               "0409 Cannot create debugfs dumpHostSlim\n");
+                               "0414 Cannot create debugfs dumpHostSlim\n");
                        goto debug_failed;
                }
 
@@ -1229,7 +1201,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 phba, &lpfc_debugfs_op_slow_ring_trc);
                if (!phba->debug_slow_ring_trc) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                        "0409 Cannot create debugfs "
+                                        "0415 Cannot create debugfs "
                                         "slow_ring_trace\n");
                        goto debug_failed;
                }
@@ -1240,7 +1212,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                GFP_KERNEL);
                        if (!phba->slow_ring_trc) {
                                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                                "0409 Cannot create debugfs "
+                                                "0416 Cannot create debugfs "
                                                 "slow_ring buffer\n");
                                goto debug_failed;
                        }
@@ -1257,7 +1229,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                        debugfs_create_dir(name, phba->hba_debugfs_root);
                if (!vport->vport_debugfs_root) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                        "0409 Cant create debugfs");
+                                        "0417 Cant create debugfs");
                        goto debug_failed;
                }
                atomic_inc(&phba->debugfs_vport_count);
@@ -1286,7 +1258,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
 
        if (!vport->disc_trc) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                "0409 Cannot create debugfs disc trace "
+                                "0418 Cannot create debugfs disc trace "
                                 "buffer\n");
                goto debug_failed;
        }
@@ -1299,7 +1271,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 vport, &lpfc_debugfs_op_disc_trc);
        if (!vport->debug_disc_trc) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                "0409 Cannot create debugfs "
+                                "0419 Cannot create debugfs "
                                 "discovery_trace\n");
                goto debug_failed;
        }