1 files changed, 133 insertions, 95 deletions

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 74714e5bcf0..e57bb035a02 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -77,10 +77,6 @@ MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
 
 /* Command line args */
-static int mpt_pq_filter = 0;
-module_param(mpt_pq_filter, int, 0);
-MODULE_PARM_DESC(mpt_pq_filter, " Enable peripheral qualifier filter: enable=1  (default=0)");
-
 #define MPTFC_DEV_LOSS_TMO (60)
 static int mptfc_dev_loss_tmo = MPTFC_DEV_LOSS_TMO;     /* reasonable default */
 module_param(mptfc_dev_loss_tmo, int, 0);
@@ -132,21 +128,21 @@ static struct scsi_host_template mptfc_driver_template = {
  */
 
 static struct pci_device_id mptfc_pci_table[] = {
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC909,
+        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC909,
                 PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC919,
+        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC919,
                 PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929,
+        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC929,
                 PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC919X,
+        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC919X,
                 PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929X,
+        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC929X,
                 PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC939X,
+        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC939X,
                 PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949X,
+        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC949X,
                 PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949ES,
+        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC949E,
                 PCI_ANY_ID, PCI_ANY_ID },
         {0}     /* Terminating entry */
 };
@@ -166,7 +162,13 @@ static struct fc_function_template mptfc_transport_functions = {
         .show_starget_port_id = 1,
         .set_rport_dev_loss_tmo = mptfc_set_rport_loss_tmo,
         .show_rport_dev_loss_tmo = 1,
-
+        .show_host_supported_speeds = 1,
+        .show_host_maxframe_size = 1,
+        .show_host_speed = 1,
+        .show_host_fabric_name = 1,
+        .show_host_port_type = 1,
+        .show_host_port_state = 1,
+        .show_host_symbolic_name = 1,
 };
 
 static void
@@ -305,10 +307,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
         }
 
  out:
-        if (pp0_array)
-                kfree(pp0_array);
-        if (p0_array)
-                kfree(p0_array);
+        kfree(pp0_array);
+        kfree(p0_array);
         return rc;
 }
 
@@ -515,8 +515,7 @@ mptfc_slave_alloc(struct scsi_device *sdev)
 
         if (vtarget->num_luns == 0) {
                 vtarget->ioc_id = hd->ioc->id;
-                vtarget->tflags = MPT_TARGET_FLAGS_Q_YES |
-                                  MPT_TARGET_FLAGS_VALID_INQUIRY;
+                vtarget->tflags = MPT_TARGET_FLAGS_Q_YES;
                 hd->Targets[sdev->id] = vtarget;
         }
 
@@ -676,7 +675,10 @@ mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)
                          * if still doing discovery,
                          * hang loose a while until finished
                          */
-                        if (pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) {
+                        if ((pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) ||
+                            (pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_ONLINE &&
+                             (pp0dest->Flags & MPI_FCPORTPAGE0_FLAGS_ATTACH_TYPE_MASK)
+                              == MPI_FCPORTPAGE0_FLAGS_ATTACH_NO_INIT)) {
                                 if (count-- > 0) {
                                         msleep(100);
                                         goto try_again;
@@ -843,33 +845,95 @@ mptfc_SetFcPortPage1_defaults(MPT_ADAPTER *ioc)
 static void
 mptfc_init_host_attr(MPT_ADAPTER *ioc,int portnum)
 {
-        unsigned class = 0, cos = 0;
+        unsigned        class = 0;
+        unsigned        cos = 0;
+        unsigned        speed;
+        unsigned        port_type;
+        unsigned        port_state;
+        FCPortPage0_t   *pp0;
+        struct Scsi_Host *sh;
+        char            *sn;
 
         /* don't know what to do as only one scsi (fc) host was allocated */
         if (portnum != 0)
                 return;
 
-        class = ioc->fc_port_page0[portnum].SupportedServiceClass;
+        pp0 = &ioc->fc_port_page0[portnum];
+        sh = ioc->sh;
+
+        sn = fc_host_symbolic_name(sh);
+        snprintf(sn, FC_SYMBOLIC_NAME_SIZE, "%s %s%08xh",
+            ioc->prod_name,
+            MPT_FW_REV_MAGIC_ID_STRING,
+            ioc->facts.FWVersion.Word);
+
+        fc_host_tgtid_bind_type(sh) = FC_TGTID_BIND_BY_WWPN;
+
+        fc_host_maxframe_size(sh) = pp0->MaxFrameSize;
+
+        fc_host_node_name(sh) =
+                (u64)pp0->WWNN.High << 32 | (u64)pp0->WWNN.Low;
+
+        fc_host_port_name(sh) =
+                (u64)pp0->WWPN.High << 32 | (u64)pp0->WWPN.Low;
+
+        fc_host_port_id(sh) = pp0->PortIdentifier;
+
+        class = pp0->SupportedServiceClass;
         if (class & MPI_FCPORTPAGE0_SUPPORT_CLASS_1)
                 cos |= FC_COS_CLASS1;
         if (class & MPI_FCPORTPAGE0_SUPPORT_CLASS_2)
                 cos |= FC_COS_CLASS2;
         if (class & MPI_FCPORTPAGE0_SUPPORT_CLASS_3)
                 cos |= FC_COS_CLASS3;
+        fc_host_supported_classes(sh) = cos;
+
+        if (pp0->CurrentSpeed == MPI_FCPORTPAGE0_CURRENT_SPEED_1GBIT)
+                speed = FC_PORTSPEED_1GBIT;
+        else if (pp0->CurrentSpeed == MPI_FCPORTPAGE0_CURRENT_SPEED_2GBIT)
+                speed = FC_PORTSPEED_2GBIT;
+        else if (pp0->CurrentSpeed == MPI_FCPORTPAGE0_CURRENT_SPEED_4GBIT)
+                speed = FC_PORTSPEED_4GBIT;
+        else if (pp0->CurrentSpeed == MPI_FCPORTPAGE0_CURRENT_SPEED_10GBIT)
+                speed = FC_PORTSPEED_10GBIT;
+        else
+                speed = FC_PORTSPEED_UNKNOWN;
+        fc_host_speed(sh) = speed;
+
+        speed = 0;
+        if (pp0->SupportedSpeeds & MPI_FCPORTPAGE0_SUPPORT_1GBIT_SPEED)
+                speed |= FC_PORTSPEED_1GBIT;
+        if (pp0->SupportedSpeeds & MPI_FCPORTPAGE0_SUPPORT_2GBIT_SPEED)
+                speed |= FC_PORTSPEED_2GBIT;
+        if (pp0->SupportedSpeeds & MPI_FCPORTPAGE0_SUPPORT_4GBIT_SPEED)
+                speed |= FC_PORTSPEED_4GBIT;
+        if (pp0->SupportedSpeeds & MPI_FCPORTPAGE0_SUPPORT_10GBIT_SPEED)
+                speed |= FC_PORTSPEED_10GBIT;
+        fc_host_supported_speeds(sh) = speed;
+
+        port_state = FC_PORTSTATE_UNKNOWN;
+        if (pp0->PortState == MPI_FCPORTPAGE0_PORTSTATE_ONLINE)
+                port_state = FC_PORTSTATE_ONLINE;
+        else if (pp0->PortState == MPI_FCPORTPAGE0_PORTSTATE_OFFLINE)
+                port_state = FC_PORTSTATE_LINKDOWN;
+        fc_host_port_state(sh) = port_state;
+
+        port_type = FC_PORTTYPE_UNKNOWN;
+        if (pp0->Flags & MPI_FCPORTPAGE0_FLAGS_ATTACH_POINT_TO_POINT)
+                port_type = FC_PORTTYPE_PTP;
+        else if (pp0->Flags & MPI_FCPORTPAGE0_FLAGS_ATTACH_PRIVATE_LOOP)
+                port_type = FC_PORTTYPE_LPORT;
+        else if (pp0->Flags & MPI_FCPORTPAGE0_FLAGS_ATTACH_PUBLIC_LOOP)
+                port_type = FC_PORTTYPE_NLPORT;
+        else if (pp0->Flags & MPI_FCPORTPAGE0_FLAGS_ATTACH_FABRIC_DIRECT)
+                port_type = FC_PORTTYPE_NPORT;
+        fc_host_port_type(sh) = port_type;
+
+        fc_host_fabric_name(sh) =
+            (pp0->Flags & MPI_FCPORTPAGE0_FLAGS_FABRIC_WWN_VALID) ?
+                (u64) pp0->FabricWWNN.High << 32 | (u64) pp0->FabricWWPN.Low :
+                (u64)pp0->WWNN.High << 32 | (u64)pp0->WWNN.Low;
 
-        fc_host_node_name(ioc->sh) =
-                (u64)ioc->fc_port_page0[portnum].WWNN.High << 32
-                    | (u64)ioc->fc_port_page0[portnum].WWNN.Low;
-
-        fc_host_port_name(ioc->sh) =
-                (u64)ioc->fc_port_page0[portnum].WWPN.High << 32
-                    | (u64)ioc->fc_port_page0[portnum].WWPN.Low;
-
-        fc_host_port_id(ioc->sh) = ioc->fc_port_page0[portnum].PortIdentifier;
-
-        fc_host_supported_classes(ioc->sh) = cos;
-
-        fc_host_tgtid_bind_type(ioc->sh) = FC_TGTID_BIND_BY_WWPN;
 }
 
 static void
@@ -902,59 +966,45 @@ mptfc_rescan_devices(void *arg)
 {
         MPT_ADAPTER             *ioc = (MPT_ADAPTER *)arg;
         int                     ii;
-        int                     work_to_do;
         u64                     pn;
-        unsigned long           flags;
         struct mptfc_rport_info *ri;
 
-        do {
-                /* start by tagging all ports as missing */
-                list_for_each_entry(ri, &ioc->fc_rports, list) {
-                        if (ri->flags & MPT_RPORT_INFO_FLAGS_REGISTERED) {
-                                ri->flags |= MPT_RPORT_INFO_FLAGS_MISSING;
-                        }
+        /* start by tagging all ports as missing */
+        list_for_each_entry(ri, &ioc->fc_rports, list) {
+                if (ri->flags & MPT_RPORT_INFO_FLAGS_REGISTERED) {
+                        ri->flags |= MPT_RPORT_INFO_FLAGS_MISSING;
                 }
+        }
 
-                /*
-                 * now rescan devices known to adapter,
-                 * will reregister existing rports
-                 */
-                for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) {
-                        (void) mptfc_GetFcPortPage0(ioc, ii);
-                        mptfc_init_host_attr(ioc,ii);   /* refresh */
-                        mptfc_GetFcDevPage0(ioc,ii,mptfc_register_dev);
-                }
+        /*
+         * now rescan devices known to adapter,
+         * will reregister existing rports
+         */
+        for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) {
+                (void) mptfc_GetFcPortPage0(ioc, ii);
+                mptfc_init_host_attr(ioc, ii);  /* refresh */
+                mptfc_GetFcDevPage0(ioc, ii, mptfc_register_dev);
+        }
 
-                /* delete devices still missing */
-                list_for_each_entry(ri, &ioc->fc_rports, list) {
-                        /* if newly missing, delete it */
-                        if (ri->flags & MPT_RPORT_INFO_FLAGS_MISSING) {
+        /* delete devices still missing */
+        list_for_each_entry(ri, &ioc->fc_rports, list) {
+                /* if newly missing, delete it */
+                if (ri->flags & MPT_RPORT_INFO_FLAGS_MISSING) {
 
-                                ri->flags &= ~(MPT_RPORT_INFO_FLAGS_REGISTERED|
-                                               MPT_RPORT_INFO_FLAGS_MISSING);
-                                fc_remote_port_delete(ri->rport);       /* won't sleep */
-                                ri->rport = NULL;
+                        ri->flags &= ~(MPT_RPORT_INFO_FLAGS_REGISTERED|
+                                       MPT_RPORT_INFO_FLAGS_MISSING);
+                        fc_remote_port_delete(ri->rport);       /* won't sleep */
+                        ri->rport = NULL;
 
-                                pn = (u64)ri->pg0.WWPN.High << 32 |
-                                     (u64)ri->pg0.WWPN.Low;
-                                dfcprintk ((MYIOC_s_INFO_FMT
-                                        "mptfc_rescan.%d: %llx deleted\n",
-                                        ioc->name,
-                                        ioc->sh->host_no,
-                                        (unsigned long long)pn));
-                        }
+                        pn = (u64)ri->pg0.WWPN.High << 32 |
+                             (u64)ri->pg0.WWPN.Low;
+                        dfcprintk ((MYIOC_s_INFO_FMT
+                                "mptfc_rescan.%d: %llx deleted\n",
+                                ioc->name,
+                                ioc->sh->host_no,
+                                (unsigned long long)pn));
                 }
-
-                /*
-                 * allow multiple passes as target state
-                 * might have changed during scan
-                 */
-                spin_lock_irqsave(&ioc->fc_rescan_work_lock, flags);
-                if (ioc->fc_rescan_work_count > 2)      /* only need one more */
-                        ioc->fc_rescan_work_count = 2;
-                work_to_do = --ioc->fc_rescan_work_count;
-                spin_unlock_irqrestore(&ioc->fc_rescan_work_lock, flags);
-        } while (work_to_do);
+        }
 }
 
 static int
@@ -1131,13 +1181,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         hd->timer.data = (unsigned long) hd;
         hd->timer.function = mptscsih_timer_expired;
 
-        hd->mpt_pq_filter = mpt_pq_filter;
-
-        ddvprintk((MYIOC_s_INFO_FMT
-                "mpt_pq_filter %x\n",
-                ioc->name, 
-                mpt_pq_filter));
-
         init_waitqueue_head(&hd->scandv_waitq);
         hd->scandv_wait_done = 0;
         hd->last_queue_full = 0;
@@ -1173,7 +1216,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
          *      by doing it via the workqueue, some locking is eliminated
          */
 
-        ioc->fc_rescan_work_count = 1;
         queue_work(ioc->fc_rescan_work_q, &ioc->fc_rescan_work);
         flush_workqueue(ioc->fc_rescan_work_q);
 
@@ -1216,10 +1258,8 @@ mptfc_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
         case MPI_EVENT_RESCAN:
                 spin_lock_irqsave(&ioc->fc_rescan_work_lock, flags);
                 if (ioc->fc_rescan_work_q) {
-                        if (ioc->fc_rescan_work_count++ == 0) {
-                                queue_work(ioc->fc_rescan_work_q,
-                                           &ioc->fc_rescan_work);
-                        }
+                        queue_work(ioc->fc_rescan_work_q,
+                                   &ioc->fc_rescan_work);
                 }
                 spin_unlock_irqrestore(&ioc->fc_rescan_work_lock, flags);
                 break;
@@ -1262,10 +1302,8 @@ mptfc_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
                 mptfc_SetFcPortPage1_defaults(ioc);
                 spin_lock_irqsave(&ioc->fc_rescan_work_lock, flags);
                 if (ioc->fc_rescan_work_q) {
-                        if (ioc->fc_rescan_work_count++ == 0) {
-                                queue_work(ioc->fc_rescan_work_q,
-                                           &ioc->fc_rescan_work);
-                        }
+                        queue_work(ioc->fc_rescan_work_q,
+                                   &ioc->fc_rescan_work);
                 }
                 spin_unlock_irqrestore(&ioc->fc_rescan_work_lock, flags);
         }