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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
  [SCSI] 53c700: remove reliance on deprecated cmnd fields
  [SCSI] hptiop: don't use cmnd->bufflen
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  [SCSI] aacraid: small misc. cleanups
  [SCSI] aacraid: Update supported product information
  [SCSI] aacraid: Fix return code interpretation
  [SCSI] scsi_transport_sas: fix panic in sas_free_rphy
  [SCSI] remove RQ_SCSI_* flags
  [SCSI] remove scsi_request infrastructure
  [SCSI] mptfusion: change driver revision to 3.03.10
  [SCSI] mptfc: abort of board reset leaves port dead requiring reboot
  [SCSI] mptfc: fix fibre channel infinite request/response loop
  [SCSI] mptfc: set fibre channel fw target missing timers to one second
  [SCSI] mptfusion: move fc event/reset handling to mptfc
  [SCSI] spi transport: don't allow dt to be set on SE or HVD buses
  [SCSI] aic7xxx: expose the bus setting to sysfs
  [SCSI] scsi: remove Documentation/scsi/cpqfc.txt
  [SCSI] drivers/scsi: Use ARRAY_SIZE macro
  [SCSI] Remove last page_address from dc395x.c
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  ...

Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
the sparc interrupt cleanups)

1 files changed, 49 insertions, 19 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 1a5474bd11a1..0f7e6f94d66b 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -33,11 +33,11 @@
 #include <asm/semaphore.h>
 
 #include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_devinfo.h>
 #include <scsi/scsi_host.h>
-#include <scsi/scsi_request.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_eh.h>
 
@@ -816,6 +816,32 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev)
         put_device(&sdev->sdev_gendev);
 }
 
+#ifdef CONFIG_SCSI_LOGGING
+/** 
+ * scsi_inq_str - print INQUIRY data from min to max index,
+ * strip trailing whitespace
+ * @buf:   Output buffer with at least end-first+1 bytes of space
+ * @inq:   Inquiry buffer (input)
+ * @first: Offset of string into inq
+ * @end:   Index after last character in inq
+ */
+static unsigned char *scsi_inq_str(unsigned char *buf, unsigned char *inq,
+                                   unsigned first, unsigned end)
+{
+        unsigned term = 0, idx;
+
+        for (idx = 0; idx + first < end && idx + first < inq[4] + 5; idx++) {
+                if (inq[idx+first] > ' ') {
+                        buf[idx] = inq[idx+first];
+                        term = idx+1;
+                } else {
+                        buf[idx] = ' ';
+                }
+        }
+        buf[term] = 0;
+        return buf;
+}
+#endif
 
 /**
  * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it
@@ -880,10 +906,12 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
         if (scsi_probe_lun(sdev, result, result_len, &bflags))
                 goto out_free_result;
 
+        if (bflagsp)
+                *bflagsp = bflags;
         /*
          * result contains valid SCSI INQUIRY data.
          */
-        if ((result[0] >> 5) == 3) {
+        if (((result[0] >> 5) == 3) && !(bflags & BLIST_ATTACH_PQ3)) {
                 /*
                  * For a Peripheral qualifier 3 (011b), the SCSI
                  * spec says: The device server is not capable of
@@ -894,9 +922,22 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
                  * logical disk configured at sdev->lun, but there
                  * is a target id responding.
                  */
-                SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
-                                        "scsi scan: peripheral qualifier of 3,"
-                                        " no device added\n"));
+                SCSI_LOG_SCAN_BUS(2, sdev_printk(KERN_INFO, sdev, "scsi scan:"
+                                   " peripheral qualifier of 3, device not"
+                                   " added\n"))
+                if (lun == 0) {
+                        SCSI_LOG_SCAN_BUS(1, {
+                                unsigned char vend[9];
+                                unsigned char mod[17];
+
+                                sdev_printk(KERN_INFO, sdev,
+                                        "scsi scan: consider passing scsi_mod."
+                                        "dev_flags=%s:%s:0x240 or 0x800240\n",
+                                        scsi_inq_str(vend, result, 8, 16),
+                                        scsi_inq_str(mod, result, 16, 32));
+                        });
+                }
+                
                 res = SCSI_SCAN_TARGET_PRESENT;
                 goto out_free_result;
         }
@@ -920,8 +961,6 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
                         sdev->lockable = 0;
                         scsi_unlock_floptical(sdev, result);
                 }
-                if (bflagsp)
-                        *bflagsp = bflags;
         }
 
  out_free_result:
@@ -946,7 +985,6 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
  * scsi_sequential_lun_scan - sequentially scan a SCSI target
  * @starget:    pointer to target structure to scan
  * @bflags:     black/white list flag for LUN 0
- * @lun0_res:   result of scanning LUN 0
  *
  * Description:
  *     Generally, scan from LUN 1 (LUN 0 is assumed to already have been
@@ -956,8 +994,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
  *     Modifies sdevscan->lun.
  **/
 static void scsi_sequential_lun_scan(struct scsi_target *starget,
-                                     int bflags, int lun0_res, int scsi_level,
-                                     int rescan)
+                                     int bflags, int scsi_level, int rescan)
 {
         unsigned int sparse_lun, lun, max_dev_lun;
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -978,13 +1015,6 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget,
                 sparse_lun = 0;
 
         /*
-         * If not sparse lun and no device attached at LUN 0 do not scan
-         * any further.
-         */
-        if (!sparse_lun && (lun0_res != SCSI_SCAN_LUN_PRESENT))
-                return;
-
-        /*
          * If less than SCSI_1_CSS, and no special lun scaning, stop
          * scanning; this matches 2.4 behaviour, but could just be a bug
          * (to continue scanning a SCSI_1_CSS device).
@@ -1395,7 +1425,7 @@ static void __scsi_scan_target(struct device *parent, unsigned int channel,
                          * do a sequential scan.
                          */
                         scsi_sequential_lun_scan(starget, bflags,
-                                        res, starget->scsi_level, rescan);
+                                                 starget->scsi_level, rescan);
         }
 
  out_reap:
@@ -1473,7 +1503,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
                 __FUNCTION__, channel, id, lun));
 
         if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) ||
-            ((id != SCAN_WILD_CARD) && (id > shost->max_id)) ||
+            ((id != SCAN_WILD_CARD) && (id >= shost->max_id)) ||
             ((lun != SCAN_WILD_CARD) && (lun > shost->max_lun)))
                 return -EINVAL;