Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
  [SCSI] usbstorage: use last_sector_bug flag universally
  [SCSI] libsas: abstract STP task status into a function
  [SCSI] ultrastor: clean up inline asm warnings
  [SCSI] aic7xxx: fix firmware build
  [SCSI] aacraid: fib context lock for management ioctls
  [SCSI] ch: remove forward declarations
  [SCSI] ch: fix device minor number management bug
  [SCSI] ch: handle class_device_create failure properly
  [SCSI] NCR5380: fix section mismatch
  [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
  [SCSI] IB/iSER: add logical unit reset support
  [SCSI] don't use __GFP_DMA for sense buffers if not required
  [SCSI] use dynamically allocated sense buffer
  [SCSI] scsi.h: add macro for enclosure bit of inquiry data
  [SCSI] sd: add fix for devices with last sector access problems
  [SCSI] fix pcmcia compile problem
  [SCSI] aacraid: add Voodoo Lite class of cards.
  [SCSI] aacraid: add new driver features flags
  [SCSI] qla2xxx: Update version number to 8.02.00-k7.
  [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
  ...

1 files changed, 127 insertions, 30 deletions

diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index d6a98bc970ff..783d1eea13ef 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -43,6 +43,7 @@
 #include "lpfc_crtn.h"
 #include "lpfc_vport.h"
 #include "lpfc_version.h"
+#include "lpfc_compat.h"
 #include "lpfc_debugfs.h"
 
 #ifdef CONFIG_LPFC_DEBUG_FS
@@ -75,18 +76,18 @@ module_param(lpfc_debugfs_enable, int, 0);
 MODULE_PARM_DESC(lpfc_debugfs_enable, "Enable debugfs services");
 
 /* This MUST be a power of 2 */
-static int lpfc_debugfs_max_disc_trc = 0;
+static int lpfc_debugfs_max_disc_trc;
 module_param(lpfc_debugfs_max_disc_trc, int, 0);
 MODULE_PARM_DESC(lpfc_debugfs_max_disc_trc,
         "Set debugfs discovery trace depth");
 
 /* This MUST be a power of 2 */
-static int lpfc_debugfs_max_slow_ring_trc = 0;
+static int lpfc_debugfs_max_slow_ring_trc;
 module_param(lpfc_debugfs_max_slow_ring_trc, int, 0);
 MODULE_PARM_DESC(lpfc_debugfs_max_slow_ring_trc,
         "Set debugfs slow ring trace depth");
 
-static int lpfc_debugfs_mask_disc_trc = 0;
+int lpfc_debugfs_mask_disc_trc;
 module_param(lpfc_debugfs_mask_disc_trc, int, 0);
 MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
         "Set debugfs discovery trace mask");
@@ -100,8 +101,11 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
 #define LPFC_NODELIST_SIZE 8192
 #define LPFC_NODELIST_ENTRY_SIZE 120
 
-/* dumpslim output buffer size */
-#define LPFC_DUMPSLIM_SIZE 4096
+/* dumpHBASlim output buffer size */
+#define LPFC_DUMPHBASLIM_SIZE 4096
+
+/* dumpHostSlim output buffer size */
+#define LPFC_DUMPHOSTSLIM_SIZE 4096
 
 /* hbqinfo output buffer size */
 #define LPFC_HBQINFO_SIZE 8192
@@ -243,16 +247,17 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)
         raw_index = phba->hbq_get[i];
         getidx = le32_to_cpu(raw_index);
         len +=  snprintf(buf+len, size-len,
-                "entrys:%d Put:%d nPut:%d localGet:%d hbaGet:%d\n",
-                hbqs->entry_count, hbqs->hbqPutIdx, hbqs->next_hbqPutIdx,
-                hbqs->local_hbqGetIdx, getidx);
+                "entrys:%d bufcnt:%d Put:%d nPut:%d localGet:%d hbaGet:%d\n",
+                hbqs->entry_count, hbqs->buffer_count, hbqs->hbqPutIdx,
+                hbqs->next_hbqPutIdx, hbqs->local_hbqGetIdx, getidx);
 
         hbqe = (struct lpfc_hbq_entry *) phba->hbqs[i].hbq_virt;
         for (j=0; j<hbqs->entry_count; j++) {
                 len +=  snprintf(buf+len, size-len,
                         "%03d: %08x %04x %05x ", j,
-                        hbqe->bde.addrLow, hbqe->bde.tus.w, hbqe->buffer_tag);
-
+                        le32_to_cpu(hbqe->bde.addrLow),
+                        le32_to_cpu(hbqe->bde.tus.w),
+                        le32_to_cpu(hbqe->buffer_tag));
                 i = 0;
                 found = 0;
 
@@ -276,7 +281,7 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)
                 list_for_each_entry(d_buf, &hbqs->hbq_buffer_list, list) {
                         hbq_buf = container_of(d_buf, struct hbq_dmabuf, dbuf);
                         phys = ((uint64_t)hbq_buf->dbuf.phys & 0xffffffff);
-                        if (phys == hbqe->bde.addrLow) {
+                        if (phys == le32_to_cpu(hbqe->bde.addrLow)) {
                                 len +=  snprintf(buf+len, size-len,
                                         "Buf%d: %p %06x\n", i,
                                         hbq_buf->dbuf.virt, hbq_buf->tag);
@@ -297,18 +302,58 @@ skipit:
         return len;
 }
 
+static int lpfc_debugfs_last_hba_slim_off;
+
+static int
+lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)
+{
+        int len = 0;
+        int i, off;
+        uint32_t *ptr;
+        char buffer[1024];
+
+        off = 0;
+        spin_lock_irq(&phba->hbalock);
+
+        len +=  snprintf(buf+len, size-len, "HBA SLIM\n");
+        lpfc_memcpy_from_slim(buffer,
+                ((uint8_t *)phba->MBslimaddr) + lpfc_debugfs_last_hba_slim_off,
+                1024);
+
+        ptr = (uint32_t *)&buffer[0];
+        off = lpfc_debugfs_last_hba_slim_off;
+
+        /* Set it up for the next time */
+        lpfc_debugfs_last_hba_slim_off += 1024;
+        if (lpfc_debugfs_last_hba_slim_off >= 4096)
+                lpfc_debugfs_last_hba_slim_off = 0;
+
+        i = 1024;
+        while (i > 0) {
+                len +=  snprintf(buf+len, size-len,
+                "%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+                off, *ptr, *(ptr+1), *(ptr+2), *(ptr+3), *(ptr+4),
+                *(ptr+5), *(ptr+6), *(ptr+7));
+                ptr += 8;
+                i -= (8 * sizeof(uint32_t));
+                off += (8 * sizeof(uint32_t));
+        }
+
+        spin_unlock_irq(&phba->hbalock);
+        return len;
+}
+
 static int
-lpfc_debugfs_dumpslim_data(struct lpfc_hba *phba, char *buf, int size)
+lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
 {
         int len = 0;
-        int cnt, i, off;
+        int i, off;
         uint32_t word0, word1, word2, word3;
         uint32_t *ptr;
         struct lpfc_pgp *pgpp;
         struct lpfc_sli *psli = &phba->sli;
         struct lpfc_sli_ring *pring;
 
-        cnt = LPFC_DUMPSLIM_SIZE;
         off = 0;
         spin_lock_irq(&phba->hbalock);
 
@@ -620,7 +665,34 @@ out:
 }
 
 static int
-lpfc_debugfs_dumpslim_open(struct inode *inode, struct file *file)
+lpfc_debugfs_dumpHBASlim_open(struct inode *inode, struct file *file)
+{
+        struct lpfc_hba *phba = inode->i_private;
+        struct lpfc_debug *debug;
+        int rc = -ENOMEM;
+
+        debug = kmalloc(sizeof(*debug), GFP_KERNEL);
+        if (!debug)
+                goto out;
+
+        /* Round to page boundry */
+        debug->buffer = kmalloc(LPFC_DUMPHBASLIM_SIZE, GFP_KERNEL);
+        if (!debug->buffer) {
+                kfree(debug);
+                goto out;
+        }
+
+        debug->len = lpfc_debugfs_dumpHBASlim_data(phba, debug->buffer,
+                LPFC_DUMPHBASLIM_SIZE);
+        file->private_data = debug;
+
+        rc = 0;
+out:
+        return rc;
+}
+
+static int
+lpfc_debugfs_dumpHostSlim_open(struct inode *inode, struct file *file)
 {
         struct lpfc_hba *phba = inode->i_private;
         struct lpfc_debug *debug;
@@ -631,14 +703,14 @@ lpfc_debugfs_dumpslim_open(struct inode *inode, struct file *file)
                 goto out;
 
         /* Round to page boundry */
-        debug->buffer = kmalloc(LPFC_DUMPSLIM_SIZE, GFP_KERNEL);
+        debug->buffer = kmalloc(LPFC_DUMPHOSTSLIM_SIZE, GFP_KERNEL);
         if (!debug->buffer) {
                 kfree(debug);
                 goto out;
         }
 
-        debug->len = lpfc_debugfs_dumpslim_data(phba, debug->buffer,
-                LPFC_DUMPSLIM_SIZE);
+        debug->len = lpfc_debugfs_dumpHostSlim_data(phba, debug->buffer,
+                LPFC_DUMPHOSTSLIM_SIZE);
         file->private_data = debug;
 
         rc = 0;
@@ -741,10 +813,19 @@ static struct file_operations lpfc_debugfs_op_hbqinfo = {
         .release =      lpfc_debugfs_release,
 };
 
-#undef lpfc_debugfs_op_dumpslim
-static struct file_operations lpfc_debugfs_op_dumpslim = {
+#undef lpfc_debugfs_op_dumpHBASlim
+static struct file_operations lpfc_debugfs_op_dumpHBASlim = {
+        .owner =        THIS_MODULE,
+        .open =         lpfc_debugfs_dumpHBASlim_open,
+        .llseek =       lpfc_debugfs_lseek,
+        .read =         lpfc_debugfs_read,
+        .release =      lpfc_debugfs_release,
+};
+
+#undef lpfc_debugfs_op_dumpHostSlim
+static struct file_operations lpfc_debugfs_op_dumpHostSlim = {
         .owner =        THIS_MODULE,
-        .open =         lpfc_debugfs_dumpslim_open,
+        .open =         lpfc_debugfs_dumpHostSlim_open,
         .llseek =       lpfc_debugfs_lseek,
         .read =         lpfc_debugfs_read,
         .release =      lpfc_debugfs_release,
@@ -812,15 +893,27 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                         goto debug_failed;
                 }
 
-                /* Setup dumpslim */
-                snprintf(name, sizeof(name), "dumpslim");
-                phba->debug_dumpslim =
+                /* Setup dumpHBASlim */
+                snprintf(name, sizeof(name), "dumpHBASlim");
+                phba->debug_dumpHBASlim =
+                        debugfs_create_file(name, S_IFREG|S_IRUGO|S_IWUSR,
+                                 phba->hba_debugfs_root,
+                                 phba, &lpfc_debugfs_op_dumpHBASlim);
+                if (!phba->debug_dumpHBASlim) {
+                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
+                                "0409 Cannot create debugfs dumpHBASlim\n");
+                        goto debug_failed;
+                }
+
+                /* Setup dumpHostSlim */
+                snprintf(name, sizeof(name), "dumpHostSlim");
+                phba->debug_dumpHostSlim =
                         debugfs_create_file(name, S_IFREG|S_IRUGO|S_IWUSR,
                                  phba->hba_debugfs_root,
-                                 phba, &lpfc_debugfs_op_dumpslim);
-                if (!phba->debug_dumpslim) {
+                                 phba, &lpfc_debugfs_op_dumpHostSlim);
+                if (!phba->debug_dumpHostSlim) {
                         lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                "0409 Cannot create debugfs dumpslim\n");
+                                "0409 Cannot create debugfs dumpHostSlim\n");
                         goto debug_failed;
                 }
 
@@ -970,9 +1063,13 @@ lpfc_debugfs_terminate(struct lpfc_vport *vport)
                         debugfs_remove(phba->debug_hbqinfo); /* hbqinfo */
                         phba->debug_hbqinfo = NULL;
                 }
-                if (phba->debug_dumpslim) {
-                        debugfs_remove(phba->debug_dumpslim); /* dumpslim */
-                        phba->debug_dumpslim = NULL;
+                if (phba->debug_dumpHBASlim) {
+                        debugfs_remove(phba->debug_dumpHBASlim); /* HBASlim */
+                        phba->debug_dumpHBASlim = NULL;
+                }
+                if (phba->debug_dumpHostSlim) {
+                        debugfs_remove(phba->debug_dumpHostSlim); /* HostSlim */
+                        phba->debug_dumpHostSlim = NULL;
                 }
                 if (phba->slow_ring_trc) {
                         kfree(phba->slow_ring_trc);