1 files changed, 295 insertions, 13 deletions

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index b8adff8cea6a..5cb7924fe3d7 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -39,6 +39,7 @@
 #include "lpfc_version.h"
 #include "lpfc_compat.h"
 #include "lpfc_crtn.h"
+#include "lpfc_vport.h"
 
 #define LPFC_DEF_DEVLOSS_TMO 30
 #define LPFC_MIN_DEVLOSS_TMO 1
@@ -139,7 +140,7 @@ lpfc_fwrev_show(struct class_device *cdev, char *buf)
         char fwrev[32];
 
         lpfc_decode_firmware_rev(phba, fwrev, 1);
-        return snprintf(buf, PAGE_SIZE, "%s\n",fwrev);
+        return snprintf(buf, PAGE_SIZE, "%s, sli-%d\n", fwrev, phba->sli_rev);
 }
 
 static ssize_t
@@ -178,10 +179,11 @@ lpfc_state_show(struct class_device *cdev, char *buf)
         case LPFC_INIT_MBX_CMDS:
         case LPFC_LINK_DOWN:
         case LPFC_HBA_ERROR:
-                len += snprintf(buf + len, PAGE_SIZE-len, "Link Down");
+                len += snprintf(buf + len, PAGE_SIZE-len, "Link Down\n");
                 break;
         case LPFC_LINK_UP:
         case LPFC_CLEAR_LA:
+        case LPFC_HBA_READY:
                 len += snprintf(buf + len, PAGE_SIZE-len, "Link Up - \n");
 
                 switch (vport->port_state) {
@@ -190,8 +192,9 @@ lpfc_state_show(struct class_device *cdev, char *buf)
                         break;
                 case LPFC_LOCAL_CFG_LINK:
                         len += snprintf(buf + len, PAGE_SIZE-len,
-                                        "configuring\n");
+                                        "Configuring Link\n");
                         break;
+                case LPFC_FDISC:
                 case LPFC_FLOGI:
                 case LPFC_FABRIC_CFG_LINK:
                 case LPFC_NS_REG:
@@ -205,7 +208,11 @@ lpfc_state_show(struct class_device *cdev, char *buf)
                         len += snprintf(buf + len, PAGE_SIZE - len, "Ready\n");
                         break;
 
-                case LPFC_STATE_UNKNOWN:
+                case LPFC_VPORT_FAILED:
+                        len += snprintf(buf + len, PAGE_SIZE - len, "Failed\n");
+                        break;
+
+                case LPFC_VPORT_UNKNOWN:
                         len += snprintf(buf + len, PAGE_SIZE - len,
                                         "Unknown\n");
                         break;
@@ -433,6 +440,151 @@ lpfc_board_mode_store(struct class_device *cdev, const char *buf, size_t count)
 }
 
 static ssize_t
+lpfc_max_vpi_show(struct class_device *cdev, char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(cdev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", phba->max_vpi);
+}
+
+static ssize_t
+lpfc_used_vpi_show(struct class_device *cdev, char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(cdev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+
+        /* Don't count the physical port */
+        return snprintf(buf, PAGE_SIZE, "%d\n", phba->vpi_cnt-1);
+}
+
+int
+lpfc_get_hba_info(struct lpfc_hba *phba, uint32_t *mxri,
+        uint32_t *axri, uint32_t *mrpi, uint32_t *arpi)
+{
+        struct lpfc_sli   *psli = &phba->sli;
+        LPFC_MBOXQ_t *pmboxq;
+        MAILBOX_t *pmb;
+        int rc = 0;
+
+        /*
+         * prevent udev from issuing mailbox commands until the port is
+         * configured.
+         */
+        if (phba->link_state < LPFC_LINK_DOWN ||
+            !phba->mbox_mem_pool ||
+            (phba->sli.sli_flag & LPFC_SLI2_ACTIVE) == 0)
+                return 0;
+
+        if (phba->sli.sli_flag & LPFC_BLOCK_MGMT_IO)
+                return 0;
+
+        pmboxq = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+        if (!pmboxq)
+                return 0;
+        memset(pmboxq, 0, sizeof (LPFC_MBOXQ_t));
+
+        pmb = &pmboxq->mb;
+        pmb->mbxCommand = MBX_READ_CONFIG;
+        pmb->mbxOwner = OWN_HOST;
+        pmboxq->context1 = NULL;
+
+        if ((phba->pport->fc_flag & FC_OFFLINE_MODE) ||
+                (!(psli->sli_flag & LPFC_SLI2_ACTIVE)))
+                rc = MBX_NOT_FINISHED;
+        else
+                rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
+
+        if (rc != MBX_SUCCESS) {
+                if (rc == MBX_TIMEOUT)
+                        pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+                else
+                        mempool_free(pmboxq, phba->mbox_mem_pool);
+                return 0;
+        }
+
+        if (mrpi)
+                *mrpi = pmb->un.varRdConfig.max_rpi;
+        if (arpi)
+                *arpi = pmb->un.varRdConfig.avail_rpi;
+        if (mxri)
+                *mxri = pmb->un.varRdConfig.max_xri;
+        if (axri)
+                *axri = pmb->un.varRdConfig.avail_xri;
+
+        mempool_free(pmboxq, phba->mbox_mem_pool);
+        return 1;
+}
+
+static ssize_t
+lpfc_max_rpi_show(struct class_device *cdev, char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(cdev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+        uint32_t cnt;
+
+        if (lpfc_get_hba_info(phba, NULL, NULL, &cnt, NULL))
+                return snprintf(buf, PAGE_SIZE, "%d\n", cnt);
+        return snprintf(buf, PAGE_SIZE, "Unknown\n");
+}
+
+static ssize_t
+lpfc_used_rpi_show(struct class_device *cdev, char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(cdev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+        uint32_t cnt, acnt;
+
+        if (lpfc_get_hba_info(phba, NULL, NULL, &cnt, &acnt))
+                return snprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));
+        return snprintf(buf, PAGE_SIZE, "Unknown\n");
+}
+
+static ssize_t
+lpfc_max_xri_show(struct class_device *cdev, char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(cdev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+        uint32_t cnt;
+
+        if (lpfc_get_hba_info(phba, &cnt, NULL, NULL, NULL))
+                return snprintf(buf, PAGE_SIZE, "%d\n", cnt);
+        return snprintf(buf, PAGE_SIZE, "Unknown\n");
+}
+
+static ssize_t
+lpfc_used_xri_show(struct class_device *cdev, char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(cdev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+        uint32_t cnt, acnt;
+
+        if (lpfc_get_hba_info(phba, &cnt, &acnt, NULL, NULL))
+                return snprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));
+        return snprintf(buf, PAGE_SIZE, "Unknown\n");
+}
+
+static ssize_t
+lpfc_npiv_info_show(struct class_device *cdev, char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(cdev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+
+        if (!(phba->max_vpi))
+                return snprintf(buf, PAGE_SIZE, "NPIV Not Supported\n");
+        if (vport->port_type == LPFC_PHYSICAL_PORT)
+                return snprintf(buf, PAGE_SIZE, "NPIV Physical\n");
+        return snprintf(buf, PAGE_SIZE, "NPIV Virtual (VPI %d)\n", vport->vpi);
+}
+
+static ssize_t
 lpfc_poll_show(struct class_device *cdev, char *buf)
 {
         struct Scsi_Host  *shost = class_to_shost(cdev);
@@ -640,6 +792,13 @@ static CLASS_DEVICE_ATTR(management_version, S_IRUGO, management_version_show,
 static CLASS_DEVICE_ATTR(board_mode, S_IRUGO | S_IWUSR,
                          lpfc_board_mode_show, lpfc_board_mode_store);
 static CLASS_DEVICE_ATTR(issue_reset, S_IWUSR, NULL, lpfc_issue_reset);
+static CLASS_DEVICE_ATTR(max_vpi, S_IRUGO, lpfc_max_vpi_show, NULL);
+static CLASS_DEVICE_ATTR(used_vpi, S_IRUGO, lpfc_used_vpi_show, NULL);
+static CLASS_DEVICE_ATTR(max_rpi, S_IRUGO, lpfc_max_rpi_show, NULL);
+static CLASS_DEVICE_ATTR(used_rpi, S_IRUGO, lpfc_used_rpi_show, NULL);
+static CLASS_DEVICE_ATTR(max_xri, S_IRUGO, lpfc_max_xri_show, NULL);
+static CLASS_DEVICE_ATTR(used_xri, S_IRUGO, lpfc_used_xri_show, NULL);
+static CLASS_DEVICE_ATTR(npiv_info, S_IRUGO, lpfc_npiv_info_show, NULL);
 
 
 static char *lpfc_soft_wwn_key = "C99G71SL8032A";
@@ -829,6 +988,17 @@ MODULE_PARM_DESC(lpfc_poll, "FCP ring polling mode control:"
 static CLASS_DEVICE_ATTR(lpfc_poll, S_IRUGO | S_IWUSR,
                          lpfc_poll_show, lpfc_poll_store);
 
+int  lpfc_sli_mode = 0;
+module_param(lpfc_sli_mode, int, 0);
+MODULE_PARM_DESC(lpfc_sli_mode, "SLI mode selector:"
+                 " 0 - auto (SLI-3 if supported),"
+                 " 2 - select SLI-2 even on SLI-3 capable HBAs,"
+                 " 3 - select SLI-3");
+
+int  lpfc_npiv_enable = 0;
+module_param(lpfc_npiv_enable, int, 0);
+MODULE_PARM_DESC(lpfc_npiv_enable, "Enable NPIV functionality");
+
 /*
 # lpfc_nodev_tmo: If set, it will hold all I/O errors on devices that disappear
 # until the timer expires. Value range is [0,255]. Default value is 30.
@@ -985,6 +1155,33 @@ LPFC_ATTR_R(hba_queue_depth, 8192, 32, 8192,
             "Max number of FCP commands we can queue to a lpfc HBA");
 
 /*
+# peer_port_login:  This parameter allows/prevents logins
+# between peer ports hosted on the same physical port.
+# When this parameter is set 0 peer ports of same physical port
+# are not allowed to login to each other.
+# When this parameter is set 1 peer ports of same physical port
+# are allowed to login to each other.
+# Default value of this parameter is 0.
+*/
+LPFC_ATTR_R(peer_port_login, 0, 0, 1,
+            "Allow peer ports on the same physical port to login to each "
+            "other.");
+
+/*
+# vport_restrict_login:  This parameter allows/prevents logins
+# between Virtual Ports and remote initiators.
+# When this parameter is not set (0) Virtual Ports will accept PLOGIs from
+# other initiators and will attempt to PLOGI all remote ports.
+# When this parameter is set (1) Virtual Ports will reject PLOGIs from
+# remote ports and will not attempt to PLOGI to other initiators.
+# This parameter does not restrict to the physical port.
+# This parameter does not restrict logins to Fabric resident remote ports.
+# Default value of this parameter is 1.
+*/
+LPFC_ATTR_RW(vport_restrict_login, 1, 0, 1,
+            "Restrict virtual ports login to remote initiators.");
+
+/*
 # Some disk devices have a "select ID" or "select Target" capability.
 # From a protocol standpoint "select ID" usually means select the
 # Fibre channel "ALPA".  In the FC-AL Profile there is an "informative
@@ -1127,6 +1324,7 @@ LPFC_ATTR_RW(poll_tmo, 10, 1, 255,
 LPFC_ATTR_R(use_msi, 0, 0, 1, "Use Message Signaled Interrupts, if possible");
 
 
+
 struct class_device_attribute *lpfc_hba_attrs[] = {
         &class_device_attr_info,
         &class_device_attr_serialnum,
@@ -1143,6 +1341,8 @@ struct class_device_attribute *lpfc_hba_attrs[] = {
         &class_device_attr_lpfc_log_verbose,
         &class_device_attr_lpfc_lun_queue_depth,
         &class_device_attr_lpfc_hba_queue_depth,
+        &class_device_attr_lpfc_peer_port_login,
+        &class_device_attr_lpfc_vport_restrict_login,
         &class_device_attr_lpfc_nodev_tmo,
         &class_device_attr_lpfc_devloss_tmo,
         &class_device_attr_lpfc_fcp_class,
@@ -1161,6 +1361,13 @@ struct class_device_attribute *lpfc_hba_attrs[] = {
         &class_device_attr_nport_evt_cnt,
         &class_device_attr_management_version,
         &class_device_attr_board_mode,
+        &class_device_attr_max_vpi,
+        &class_device_attr_used_vpi,
+        &class_device_attr_max_rpi,
+        &class_device_attr_used_rpi,
+        &class_device_attr_max_xri,
+        &class_device_attr_used_xri,
+        &class_device_attr_npiv_info,
         &class_device_attr_issue_reset,
         &class_device_attr_lpfc_poll,
         &class_device_attr_lpfc_poll_tmo,
@@ -1299,7 +1506,7 @@ sysfs_mbox_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
         } else {
                 if (phba->sysfs_mbox.state  != SMBOX_WRITING ||
                     phba->sysfs_mbox.offset != off           ||
-                    phba->sysfs_mbox.mbox   == NULL ) {
+                    phba->sysfs_mbox.mbox   == NULL) {
                         sysfs_mbox_idle(phba);
                         spin_unlock_irq(&phba->hbalock);
                         return -EAGAIN;
@@ -1406,6 +1613,8 @@ sysfs_mbox_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
                         return -EPERM;
                 }
 
+                phba->sysfs_mbox.mbox->vport = vport;
+
                 if (phba->sli.sli_flag & LPFC_BLOCK_MGMT_IO) {
                         sysfs_mbox_idle(phba);
                         spin_unlock_irq(&phba->hbalock);
@@ -1480,12 +1689,12 @@ lpfc_alloc_sysfs_attr(struct lpfc_vport *vport)
         int error;
 
         error = sysfs_create_bin_file(&shost->shost_classdev.kobj,
-                                                        &sysfs_ctlreg_attr);
+                                      &sysfs_ctlreg_attr);
         if (error)
                 goto out;
 
         error = sysfs_create_bin_file(&shost->shost_classdev.kobj,
-                                                        &sysfs_mbox_attr);
+                                      &sysfs_mbox_attr);
         if (error)
                 goto out_remove_ctlreg_attr;
 
@@ -1527,7 +1736,9 @@ lpfc_get_host_port_type(struct Scsi_Host *shost)
 
         spin_lock_irq(shost->host_lock);
 
-        if (lpfc_is_link_up(phba)) {
+        if (vport->port_type == LPFC_NPIV_PORT) {
+                fc_host_port_type(shost) = FC_PORTTYPE_NPIV;
+        } else if (lpfc_is_link_up(phba)) {
                 if (phba->fc_topology == TOPOLOGY_LOOP) {
                         if (vport->fc_flag & FC_PUBLIC_LOOP)
                                 fc_host_port_type(shost) = FC_PORTTYPE_NLPORT;
@@ -1563,6 +1774,7 @@ lpfc_get_host_port_state(struct Scsi_Host *shost)
                         break;
                 case LPFC_LINK_UP:
                 case LPFC_CLEAR_LA:
+                case LPFC_HBA_READY:
                         /* Links up, beyond this port_type reports state */
                         fc_host_port_state(shost) = FC_PORTSTATE_ONLINE;
                         break;
@@ -1644,13 +1856,14 @@ lpfc_get_stats(struct Scsi_Host *shost)
         unsigned long seconds;
         int rc = 0;
 
-                                /* prevent udev from issuing mailbox commands
-                                 * until the port is configured.
-                                 */
+        /*
+         * prevent udev from issuing mailbox commands until the port is
+         * configured.
+         */
         if (phba->link_state < LPFC_LINK_DOWN ||
             !phba->mbox_mem_pool ||
             (phba->sli.sli_flag & LPFC_SLI2_ACTIVE) == 0)
-                        return NULL;
+                return NULL;
 
         if (phba->sli.sli_flag & LPFC_BLOCK_MGMT_IO)
                 return NULL;
@@ -1664,6 +1877,7 @@ lpfc_get_stats(struct Scsi_Host *shost)
         pmb->mbxCommand = MBX_READ_STATUS;
         pmb->mbxOwner = OWN_HOST;
         pmboxq->context1 = NULL;
+        pmboxq->vport = vport;
 
         if ((vport->fc_flag & FC_OFFLINE_MODE) ||
                 (!(psli->sli_flag & LPFC_SLI2_ACTIVE)))
@@ -1690,6 +1904,7 @@ lpfc_get_stats(struct Scsi_Host *shost)
         pmb->mbxCommand = MBX_READ_LNK_STAT;
         pmb->mbxOwner = OWN_HOST;
         pmboxq->context1 = NULL;
+        pmboxq->vport = vport;
 
         if ((vport->fc_flag & FC_OFFLINE_MODE) ||
             (!(psli->sli_flag & LPFC_SLI2_ACTIVE)))
@@ -1701,7 +1916,7 @@ lpfc_get_stats(struct Scsi_Host *shost)
                 if (rc == MBX_TIMEOUT)
                         pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
                 else
-                        mempool_free( pmboxq, phba->mbox_mem_pool);
+                        mempool_free(pmboxq, phba->mbox_mem_pool);
                 return NULL;
         }
 
@@ -1769,6 +1984,7 @@ lpfc_reset_stats(struct Scsi_Host *shost)
         pmb->mbxOwner = OWN_HOST;
         pmb->un.varWords[0] = 0x1; /* reset request */
         pmboxq->context1 = NULL;
+        pmboxq->vport = vport;
 
         if ((vport->fc_flag & FC_OFFLINE_MODE) ||
                 (!(psli->sli_flag & LPFC_SLI2_ACTIVE)))
@@ -1788,6 +2004,7 @@ lpfc_reset_stats(struct Scsi_Host *shost)
         pmb->mbxCommand = MBX_READ_LNK_STAT;
         pmb->mbxOwner = OWN_HOST;
         pmboxq->context1 = NULL;
+        pmboxq->vport = vport;
 
         if ((vport->fc_flag & FC_OFFLINE_MODE) ||
             (!(psli->sli_flag & LPFC_SLI2_ACTIVE)))
@@ -1950,6 +2167,69 @@ struct fc_function_template lpfc_transport_functions = {
         .issue_fc_host_lip = lpfc_issue_lip,
         .dev_loss_tmo_callbk = lpfc_dev_loss_tmo_callbk,
         .terminate_rport_io = lpfc_terminate_rport_io,
+
+        .vport_create = lpfc_vport_create,
+        .vport_delete = lpfc_vport_delete,
+        .dd_fcvport_size = sizeof(struct lpfc_vport *),
+};
+
+struct fc_function_template lpfc_vport_transport_functions = {
+        /* fixed attributes the driver supports */
+        .show_host_node_name = 1,
+        .show_host_port_name = 1,
+        .show_host_supported_classes = 1,
+        .show_host_supported_fc4s = 1,
+        .show_host_supported_speeds = 1,
+        .show_host_maxframe_size = 1,
+
+        /* dynamic attributes the driver supports */
+        .get_host_port_id = lpfc_get_host_port_id,
+        .show_host_port_id = 1,
+
+        .get_host_port_type = lpfc_get_host_port_type,
+        .show_host_port_type = 1,
+
+        .get_host_port_state = lpfc_get_host_port_state,
+        .show_host_port_state = 1,
+
+        /* active_fc4s is shown but doesn't change (thus no get function) */
+        .show_host_active_fc4s = 1,
+
+        .get_host_speed = lpfc_get_host_speed,
+        .show_host_speed = 1,
+
+        .get_host_fabric_name = lpfc_get_host_fabric_name,
+        .show_host_fabric_name = 1,
+
+        /*
+         * The LPFC driver treats linkdown handling as target loss events
+         * so there are no sysfs handlers for link_down_tmo.
+         */
+
+        .get_fc_host_stats = lpfc_get_stats,
+        .reset_fc_host_stats = lpfc_reset_stats,
+
+        .dd_fcrport_size = sizeof(struct lpfc_rport_data),
+        .show_rport_maxframe_size = 1,
+        .show_rport_supported_classes = 1,
+
+        .set_rport_dev_loss_tmo = lpfc_set_rport_loss_tmo,
+        .show_rport_dev_loss_tmo = 1,
+
+        .get_starget_port_id  = lpfc_get_starget_port_id,
+        .show_starget_port_id = 1,
+
+        .get_starget_node_name = lpfc_get_starget_node_name,
+        .show_starget_node_name = 1,
+
+        .get_starget_port_name = lpfc_get_starget_port_name,
+        .show_starget_port_name = 1,
+
+        .issue_fc_host_lip = lpfc_issue_lip,
+        .dev_loss_tmo_callbk = lpfc_dev_loss_tmo_callbk,
+        .terminate_rport_io = lpfc_terminate_rport_io,
+
+        .vport_disable = lpfc_vport_disable,
 };
 
 void
@@ -1972,6 +2252,8 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)
         lpfc_discovery_threads_init(phba, lpfc_discovery_threads);
         lpfc_max_luns_init(phba, lpfc_max_luns);
         lpfc_poll_tmo_init(phba, lpfc_poll_tmo);
+        lpfc_peer_port_login_init(phba, lpfc_peer_port_login);
+        lpfc_vport_restrict_login_init(phba, lpfc_vport_restrict_login);
         lpfc_use_msi_init(phba, lpfc_use_msi);
         lpfc_devloss_tmo_init(phba, lpfc_devloss_tmo);
         lpfc_nodev_tmo_init(phba, lpfc_nodev_tmo);