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

1 files changed, 30 insertions, 4 deletions

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 6c48d1f54ac9..47053ac65068 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.05"
-#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.03.05"
+#define MPT_LINUX_VERSION_COMMON        "3.03.06"
+#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.03.06"
 #define WHAT_MAGIC_STRING               "@" "(" "#" ")"
 
 #define show_mptmod_ver(s,ver)  \
@@ -413,7 +413,7 @@ typedef struct _MPT_IOCTL {
         u8                       status;        /* current command status */
         u8                       reset;         /* 1 if bus reset allowed */
         u8                       target;        /* target for reset */
-        struct semaphore         sem_ioc;
+        struct mutex             ioctl_mutex;
 } MPT_IOCTL;
 
 #define MPT_SAS_MGMT_STATUS_RF_VALID    0x02    /* The Reply Frame is VALID */
@@ -421,7 +421,7 @@ typedef struct _MPT_IOCTL {
 #define MPT_SAS_MGMT_STATUS_TM_FAILED   0x40    /* User TM request failed */
 
 typedef struct _MPT_SAS_MGMT {
-        struct semaphore         mutex;
+        struct mutex             mutex;
         struct completion        done;
         u8                       reply[MPT_DEFAULT_FRAME_SIZE]; /* reply frame data */
         u8                       status;        /* current command status */
@@ -499,6 +499,22 @@ typedef	struct _RaidCfgData {
         int              isRaid;                /* bit field, 1 if RAID */
 }RaidCfgData;
 
+#define MPT_RPORT_INFO_FLAGS_REGISTERED 0x01    /* rport registered */
+#define MPT_RPORT_INFO_FLAGS_MISSING    0x02    /* missing from DevPage0 scan */
+#define MPT_RPORT_INFO_FLAGS_MAPPED_VDEV 0x04   /* target mapped in vdev */
+
+/*
+ * data allocated for each fc rport device
+ */
+struct mptfc_rport_info
+{
+        struct list_head list;
+        struct fc_rport *rport;
+        VirtDevice      *vdev;
+        FCDevicePage0_t pg0;
+        u8              flags;
+};
+
 /*
  *  Adapter Structure - pci_dev specific. Maximum: MPT_MAX_ADAPTERS
  */
@@ -612,7 +628,16 @@ typedef struct _MPT_ADAPTER
         struct list_head         list;
         struct net_device       *netdev;
         struct list_head         sas_topology;
+        struct mutex             sas_topology_mutex;
         MPT_SAS_MGMT             sas_mgmt;
+        int                      num_ports;
+
+        struct list_head         fc_rports;
+        spinlock_t               fc_rport_lock; /* list and ri flags */
+        spinlock_t               fc_rescan_work_lock;
+        int                      fc_rescan_work_count;
+        struct work_struct       fc_rescan_work;
+
 } MPT_ADAPTER;
 
 /*
@@ -999,6 +1024,7 @@ 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);
 
 /*