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: (138 commits)
  [SCSI] libata: implement minimal transport template for ->eh_timed_out
  [SCSI] eliminate rphy allocation in favour of expander/end device allocation
  [SCSI] convert mptsas over to end_device/expander allocations
  [SCSI] allow displaying and setting of cache type via sysfs
  [SCSI] add scsi_mode_select to scsi_lib.c
  [SCSI] 3ware 9000 add big endian support
  [SCSI] qla2xxx: update MAINTAINERS
  [SCSI] scsi: move target_destroy call
  [SCSI] fusion - bump version
  [SCSI] fusion - expander hotplug suport in mptsas module
  [SCSI] fusion - exposing raid components in mptsas
  [SCSI] fusion - memory leak, and initializing fields
  [SCSI] fusion - exclosure misspelled
  [SCSI] fusion - cleanup mptsas event handling functions
  [SCSI] fusion - removing target_id/bus_id from the VirtDevice structure
  [SCSI] fusion - static fix's
  [SCSI] fusion - move some debug firmware event debug msgs to verbose level
  [SCSI] fusion - loginfo header update
  [SCSI] add scsi_reprobe_device
  [SCSI] megaraid_sas: fix extended timeout handling
  ...

1 files changed, 16 insertions, 20 deletions

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 723d5430095..be7e8501b53 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -76,8 +76,8 @@
 #define COPYRIGHT       "Copyright (c) 1999-2005 " MODULEAUTHOR
 #endif
 
-#define MPT_LINUX_VERSION_COMMON        "3.03.07"
-#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.03.07"
+#define MPT_LINUX_VERSION_COMMON        "3.03.08"
+#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.03.08"
 #define WHAT_MAGIC_STRING               "@" "(" "#" ")"
 
 #define show_mptmod_ver(s,ver)  \
@@ -331,6 +331,7 @@ typedef struct _SYSIF_REGS
  *      VirtDevice - FC LUN device or SCSI target device
  */
 typedef struct _VirtTarget {
+        struct scsi_target      *starget;
         u8                       tflags;
         u8                       ioc_id;
         u8                       target_id;
@@ -343,14 +344,10 @@ typedef struct _VirtTarget {
         u8                       type;          /* byte 0 of Inquiry data */
         u32                      num_luns;
         u32                      luns[8];               /* Max LUNs is 256 */
-        u8                       inq_data[8];
 } VirtTarget;
 
 typedef struct _VirtDevice {
-        VirtTarget              *vtarget;
-        u8                       ioc_id;
-        u8                       bus_id;
-        u8                       target_id;
+        VirtTarget              *vtarget;
         u8                       configured_lun;
         u32                      lun;
 } VirtDevice;
@@ -364,6 +361,7 @@ typedef struct _VirtDevice {
 #define MPT_TARGET_FLAGS_Q_YES          0x08
 #define MPT_TARGET_FLAGS_VALID_56       0x10
 #define MPT_TARGET_FLAGS_SAF_TE_ISSUED  0x20
+#define MPT_TARGET_FLAGS_RAID_COMPONENT 0x40
 
 /*
  *      /proc/mpt interface
@@ -447,13 +445,6 @@ typedef struct _mpt_ioctl_events {
  *      Substructure to store SCSI specific configuration page data
  */
                                                 /* dvStatus defines: */
-#define MPT_SCSICFG_NEGOTIATE           0x01    /* Negotiate on next IO */
-#define MPT_SCSICFG_NEED_DV             0x02    /* Schedule DV */
-#define MPT_SCSICFG_DV_PENDING          0x04    /* DV on this physical id pending */
-#define MPT_SCSICFG_DV_NOT_DONE         0x08    /* DV has not been performed */
-#define MPT_SCSICFG_BLK_NEGO            0x10    /* WriteSDP1 with WDTR and SDTR disabled */
-#define MPT_SCSICFG_RELOAD_IOC_PG3      0x20    /* IOC Pg 3 data is obsolete */
-                                                /* Args passed to writeSDP1: */
 #define MPT_SCSICFG_USE_NVRAM           0x01    /* WriteSDP1 using NVRAM */
 #define MPT_SCSICFG_ALL_IDS             0x02    /* WriteSDP1 to all IDS */
 /* #define MPT_SCSICFG_BLK_NEGO         0x10       WriteSDP1 with WDTR and SDTR disabled */
@@ -464,7 +455,6 @@ typedef	struct _SpiCfgData {
         IOCPage4_t      *pIocPg4;               /* SEP devices addressing */
         dma_addr_t       IocPg4_dma;            /* Phys Addr of IOCPage4 data */
         int              IocPg4Sz;              /* IOCPage4 size */
-        u8               dvStatus[MPT_MAX_SCSI_DEVICES];
         u8               minSyncFactor;         /* 0xFF if async */
         u8               maxSyncOffset;         /* 0 if async */
         u8               maxBusWidth;           /* 0 if narrow, 1 if wide */
@@ -474,13 +464,11 @@ typedef	struct _SpiCfgData {
         u8               sdp0version;           /* SDP0 version */
         u8               sdp0length;            /* SDP0 length  */
         u8               dvScheduled;           /* 1 if scheduled */
-        u8               forceDv;               /* 1 to force DV scheduling */
         u8               noQas;                 /* Disable QAS for this adapter */
         u8               Saf_Te;                /* 1 to force all Processors as
                                                  * SAF-TE if Inquiry data length
                                                  * is too short to check for SAF-TE
                                                  */
-        u8               mpt_dv;                /* command line option: enhanced=1, basic=0 */
         u8               bus_reset;             /* 1 to allow bus reset */
         u8               rsvd[1];
 }SpiCfgData;
@@ -631,6 +619,10 @@ typedef struct _MPT_ADAPTER
         struct net_device       *netdev;
         struct list_head         sas_topology;
         struct mutex             sas_topology_mutex;
+        struct mutex             sas_discovery_mutex;
+        u8                       sas_discovery_runtime;
+        u8                       sas_discovery_ignore_events;
+        int                      sas_index; /* index refrencing */
         MPT_SAS_MGMT             sas_mgmt;
         int                      num_ports;
         struct work_struct       mptscsih_persistTask;
@@ -728,12 +720,18 @@ typedef struct _mpt_sge {
 #define dhsprintk(x)
 #endif
 
-#ifdef MPT_DEBUG_EVENTS
+#if defined(MPT_DEBUG_EVENTS) || defined(MPT_DEBUG_VERBOSE_EVENTS)
 #define devtprintk(x)  printk x
 #else
 #define devtprintk(x)
 #endif
 
+#ifdef MPT_DEBUG_VERBOSE_EVENTS
+#define devtverboseprintk(x)  printk x
+#else
+#define devtverboseprintk(x)
+#endif
+
 #ifdef MPT_DEBUG_RESET
 #define drsprintk(x)  printk x
 #else
@@ -1030,10 +1028,8 @@ extern int	 mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg);
 extern void      mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);
 extern void      mpt_free_fw_memory(MPT_ADAPTER *ioc);
 extern int       mpt_findImVolumes(MPT_ADAPTER *ioc);
-extern int       mpt_read_ioc_pg_3(MPT_ADAPTER *ioc);
 extern int       mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode);
 extern int       mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum);
-extern int       mpt_alt_ioc_wait(MPT_ADAPTER *ioc);
 
 /*
  *  Public data decl's...