1 files changed, 120 insertions, 81 deletions

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index acae7c48ef7d..89e8222bc7cc 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -200,19 +200,13 @@ lpfc_num_discovered_ports_show(struct class_device *cdev, char *buf)
 }
 
 
-static ssize_t
-lpfc_issue_lip (struct class_device *cdev, const char *buf, size_t count)
+static int
+lpfc_issue_lip(struct Scsi_Host *host)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
         struct lpfc_hba *phba = (struct lpfc_hba *) host->hostdata[0];
-        int val = 0;
         LPFC_MBOXQ_t *pmboxq;
         int mbxstatus = MBXERR_ERROR;
 
-        if ((sscanf(buf, "%d", &val) != 1) ||
-            (val != 1))
-                return -EINVAL;
-
         if ((phba->fc_flag & FC_OFFLINE_MODE) ||
             (phba->hba_state != LPFC_HBA_READY))
                 return -EPERM;
@@ -229,12 +223,12 @@ lpfc_issue_lip (struct class_device *cdev, const char *buf, size_t count)
         if (mbxstatus == 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);
 
         if (mbxstatus == MBXERR_ERROR)
                 return -EIO;
 
-        return strlen(buf);
+        return 0;
 }
 
 static ssize_t
@@ -251,8 +245,6 @@ lpfc_board_online_show(struct class_device *cdev, char *buf)
         struct Scsi_Host *host = class_to_shost(cdev);
         struct lpfc_hba *phba = (struct lpfc_hba*)host->hostdata[0];
 
-        if (!phba) return 0;
-
         if (phba->fc_flag & FC_OFFLINE_MODE)
                 return snprintf(buf, PAGE_SIZE, "0\n");
         else
@@ -269,7 +261,7 @@ lpfc_board_online_store(struct class_device *cdev, const char *buf,
         int val=0, status=0;
 
         if (sscanf(buf, "%d", &val) != 1)
-                return 0;
+                return -EINVAL;
 
         init_completion(&online_compl);
 
@@ -283,7 +275,7 @@ lpfc_board_online_store(struct class_device *cdev, const char *buf,
         if (!status)
                 return strlen(buf);
         else
-                return 0;
+                return -EIO;
 }
 
 
@@ -294,47 +286,83 @@ lpfc_##attr##_show(struct class_device *cdev, char *buf) \
         struct Scsi_Host *host = class_to_shost(cdev);\
         struct lpfc_hba *phba = (struct lpfc_hba*)host->hostdata[0];\
         int val = 0;\
-        if (phba){\
-                val = phba->cfg_##attr;\
-                return snprintf(buf, PAGE_SIZE, "%d\n",\
-                                phba->cfg_##attr);\
+        val = phba->cfg_##attr;\
+        return snprintf(buf, PAGE_SIZE, "%d\n",\
+                        phba->cfg_##attr);\
+}
+
+#define lpfc_param_hex_show(attr)       \
+static ssize_t \
+lpfc_##attr##_show(struct class_device *cdev, char *buf) \
+{ \
+        struct Scsi_Host *host = class_to_shost(cdev);\
+        struct lpfc_hba *phba = (struct lpfc_hba*)host->hostdata[0];\
+        int val = 0;\
+        val = phba->cfg_##attr;\
+        return snprintf(buf, PAGE_SIZE, "%#x\n",\
+                        phba->cfg_##attr);\
+}
+
+#define lpfc_param_init(attr, default, minval, maxval)  \
+static int \
+lpfc_##attr##_init(struct lpfc_hba *phba, int val) \
+{ \
+        if (val >= minval && val <= maxval) {\
+                phba->cfg_##attr = val;\
+                return 0;\
         }\
-        return 0;\
+        lpfc_printf_log(phba, KERN_ERR, LOG_INIT, \
+                        "%d:0449 lpfc_"#attr" attribute cannot be set to %d, "\
+                        "allowed range is ["#minval", "#maxval"]\n", \
+                        phba->brd_no, val); \
+        phba->cfg_##attr = default;\
+        return -EINVAL;\
 }
 
-#define lpfc_param_store(attr, minval, maxval)  \
+#define lpfc_param_set(attr, default, minval, maxval)   \
+static int \
+lpfc_##attr##_set(struct lpfc_hba *phba, int val) \
+{ \
+        if (val >= minval && val <= maxval) {\
+                phba->cfg_##attr = val;\
+                return 0;\
+        }\
+        lpfc_printf_log(phba, KERN_ERR, LOG_INIT, \
+                        "%d:0450 lpfc_"#attr" attribute cannot be set to %d, "\
+                        "allowed range is ["#minval", "#maxval"]\n", \
+                        phba->brd_no, val); \
+        return -EINVAL;\
+}
+
+#define lpfc_param_store(attr)  \
 static ssize_t \
 lpfc_##attr##_store(struct class_device *cdev, const char *buf, size_t count) \
 { \
         struct Scsi_Host *host = class_to_shost(cdev);\
         struct lpfc_hba *phba = (struct lpfc_hba*)host->hostdata[0];\
-        int val = 0;\
+        int val=0;\
         if (!isdigit(buf[0]))\
                 return -EINVAL;\
-        if (sscanf(buf, "0x%x", &val) != 1)\
-                if (sscanf(buf, "%d", &val) != 1)\
-                        return -EINVAL;\
-        if (phba){\
-                if (val >= minval && val <= maxval) {\
-                        phba->cfg_##attr = val;\
-                        return strlen(buf);\
-                }\
-        }\
-        return 0;\
+        if (sscanf(buf, "%i", &val) != 1)\
+                return -EINVAL;\
+        if (lpfc_##attr##_set(phba, val) == 0) \
+                return strlen(buf);\
+        else \
+                return -EINVAL;\
 }
 
-#define LPFC_ATTR_R_NOINIT(name, desc) \
-extern int lpfc_##name;\
+#define LPFC_ATTR(name, defval, minval, maxval, desc) \
+static int lpfc_##name = defval;\
 module_param(lpfc_##name, int, 0);\
 MODULE_PARM_DESC(lpfc_##name, desc);\
-lpfc_param_show(name)\
-static CLASS_DEVICE_ATTR(lpfc_##name, S_IRUGO , lpfc_##name##_show, NULL)
+lpfc_param_init(name, defval, minval, maxval)
 
 #define LPFC_ATTR_R(name, defval, minval, maxval, desc) \
 static int lpfc_##name = defval;\
 module_param(lpfc_##name, int, 0);\
 MODULE_PARM_DESC(lpfc_##name, desc);\
 lpfc_param_show(name)\
+lpfc_param_init(name, defval, minval, maxval)\
 static CLASS_DEVICE_ATTR(lpfc_##name, S_IRUGO , lpfc_##name##_show, NULL)
 
 #define LPFC_ATTR_RW(name, defval, minval, maxval, desc) \
@@ -342,7 +370,28 @@ static int lpfc_##name = defval;\
 module_param(lpfc_##name, int, 0);\
 MODULE_PARM_DESC(lpfc_##name, desc);\
 lpfc_param_show(name)\
-lpfc_param_store(name, minval, maxval)\
+lpfc_param_init(name, defval, minval, maxval)\
+lpfc_param_set(name, defval, minval, maxval)\
+lpfc_param_store(name)\
+static CLASS_DEVICE_ATTR(lpfc_##name, S_IRUGO | S_IWUSR,\
+                         lpfc_##name##_show, lpfc_##name##_store)
+
+#define LPFC_ATTR_HEX_R(name, defval, minval, maxval, desc) \
+static int lpfc_##name = defval;\
+module_param(lpfc_##name, int, 0);\
+MODULE_PARM_DESC(lpfc_##name, desc);\
+lpfc_param_hex_show(name)\
+lpfc_param_init(name, defval, minval, maxval)\
+static CLASS_DEVICE_ATTR(lpfc_##name, S_IRUGO , lpfc_##name##_show, NULL)
+
+#define LPFC_ATTR_HEX_RW(name, defval, minval, maxval, desc) \
+static int lpfc_##name = defval;\
+module_param(lpfc_##name, int, 0);\
+MODULE_PARM_DESC(lpfc_##name, desc);\
+lpfc_param_hex_show(name)\
+lpfc_param_init(name, defval, minval, maxval)\
+lpfc_param_set(name, defval, minval, maxval)\
+lpfc_param_store(name)\
 static CLASS_DEVICE_ATTR(lpfc_##name, S_IRUGO | S_IWUSR,\
                          lpfc_##name##_show, lpfc_##name##_store)
 
@@ -364,7 +413,6 @@ static CLASS_DEVICE_ATTR(lpfc_drvr_version, S_IRUGO, lpfc_drvr_version_show,
                          NULL);
 static CLASS_DEVICE_ATTR(management_version, S_IRUGO, management_version_show,
                          NULL);
-static CLASS_DEVICE_ATTR(issue_lip, S_IWUSR, NULL, lpfc_issue_lip);
 static CLASS_DEVICE_ATTR(board_online, S_IRUGO | S_IWUSR,
                          lpfc_board_online_show, lpfc_board_online_store);
 
@@ -388,7 +436,7 @@ static CLASS_DEVICE_ATTR(board_online, S_IRUGO | S_IWUSR,
 # LOG_LIBDFC                    0x2000     LIBDFC events
 # LOG_ALL_MSG                   0xffff     LOG all messages
 */
-LPFC_ATTR_RW(log_verbose, 0x0, 0x0, 0xffff, "Verbose logging bit-mask");
+LPFC_ATTR_HEX_RW(log_verbose, 0x0, 0x0, 0xffff, "Verbose logging bit-mask");
 
 /*
 # lun_queue_depth:  This parameter is used to limit the number of outstanding
@@ -419,7 +467,7 @@ LPFC_ATTR_R(scan_down, 1, 0, 1,
 
 /*
 # 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 20.
+# until the timer expires. Value range is [0,255]. Default value is 30.
 # NOTE: this MUST be less then the SCSI Layer command timeout - 1.
 */
 LPFC_ATTR_RW(nodev_tmo, 30, 0, 255,
@@ -475,14 +523,10 @@ LPFC_ATTR_R(ack0, 0, 0, 1, "Enable ACK0 support");
 # is 0. Default value of cr_count is 1. The cr_count feature is disabled if
 # cr_delay is set to 0.
 */
-static int lpfc_cr_delay = 0;
-module_param(lpfc_cr_delay, int , 0);
-MODULE_PARM_DESC(lpfc_cr_delay, "A count of milliseconds after which an "
+LPFC_ATTR(cr_delay, 0, 0, 63, "A count of milliseconds after which an"
                 "interrupt response is generated");
 
-static int lpfc_cr_count = 1;
-module_param(lpfc_cr_count, int, 0);
-MODULE_PARM_DESC(lpfc_cr_count, "A count of I/O completions after which an "
+LPFC_ATTR(cr_count, 1, 1, 255, "A count of I/O completions after which an"
                 "interrupt response is generated");
 
 /*
@@ -498,9 +542,7 @@ LPFC_ATTR_RW(fdmi_on, 0, 0, 2, "Enable FDMI support");
 # Specifies the maximum number of ELS cmds we can have outstanding (for
 # discovery). Value range is [1,64]. Default value = 32.
 */
-static int lpfc_discovery_threads = 32;
-module_param(lpfc_discovery_threads, int, 0);
-MODULE_PARM_DESC(lpfc_discovery_threads, "Maximum number of ELS commands "
+LPFC_ATTR(discovery_threads, 32, 1, 64, "Maximum number of ELS commands"
                  "during discovery");
 
 /*
@@ -537,7 +579,6 @@ struct class_device_attribute *lpfc_host_attrs[] = {
         &class_device_attr_lpfc_max_luns,
         &class_device_attr_nport_evt_cnt,
         &class_device_attr_management_version,
-        &class_device_attr_issue_lip,
         &class_device_attr_board_online,
         NULL,
 };
@@ -992,7 +1033,7 @@ lpfc_get_stats(struct Scsi_Host *shost)
         struct fc_host_statistics *hs = &phba->link_stats;
         LPFC_MBOXQ_t *pmboxq;
         MAILBOX_t *pmb;
-        int rc=0;
+        int rc = 0;
 
         pmboxq = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
         if (!pmboxq)
@@ -1005,18 +1046,16 @@ lpfc_get_stats(struct Scsi_Host *shost)
         pmboxq->context1 = NULL;
 
         if ((phba->fc_flag & FC_OFFLINE_MODE) ||
-            (!(psli->sli_flag & LPFC_SLI2_ACTIVE))){
+                (!(psli->sli_flag & LPFC_SLI2_ACTIVE)))
                 rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);
-        } else
+        else
                 rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
 
         if (rc != MBX_SUCCESS) {
-                if (pmboxq) {
-                        if (rc == MBX_TIMEOUT)
-                                pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
-                        else
-                                mempool_free( pmboxq, phba->mbox_mem_pool);
-                }
+                if (rc == MBX_TIMEOUT)
+                        pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+                else
+                        mempool_free(pmboxq, phba->mbox_mem_pool);
                 return NULL;
         }
 
@@ -1027,24 +1066,22 @@ lpfc_get_stats(struct Scsi_Host *shost)
         hs->rx_frames = pmb->un.varRdStatus.rcvFrameCnt;
         hs->rx_words = (pmb->un.varRdStatus.rcvByteCnt * 256);
 
-        memset((void *)pmboxq, 0, sizeof (LPFC_MBOXQ_t));
+        memset(pmboxq, 0, sizeof (LPFC_MBOXQ_t));
         pmb->mbxCommand = MBX_READ_LNK_STAT;
         pmb->mbxOwner = OWN_HOST;
         pmboxq->context1 = NULL;
 
         if ((phba->fc_flag & FC_OFFLINE_MODE) ||
-            (!(psli->sli_flag & LPFC_SLI2_ACTIVE))) {
+            (!(psli->sli_flag & LPFC_SLI2_ACTIVE)))
                 rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);
-        } else
+        else
                 rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
 
         if (rc != MBX_SUCCESS) {
-                if (pmboxq) {
-                        if (rc == MBX_TIMEOUT)
-                                pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
-                        else
-                                mempool_free( pmboxq, phba->mbox_mem_pool);
-                }
+                if (rc == MBX_TIMEOUT)
+                        pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+                else
+                        mempool_free( pmboxq, phba->mbox_mem_pool);
                 return NULL;
         }
 
@@ -1234,25 +1271,27 @@ struct fc_function_template lpfc_transport_functions = {
 
         .get_starget_port_name = lpfc_get_starget_port_name,
         .show_starget_port_name = 1,
+
+        .issue_fc_host_lip = lpfc_issue_lip,
 };
 
 void
 lpfc_get_cfgparam(struct lpfc_hba *phba)
 {
-        phba->cfg_log_verbose = lpfc_log_verbose;
-        phba->cfg_cr_delay = lpfc_cr_delay;
-        phba->cfg_cr_count = lpfc_cr_count;
-        phba->cfg_lun_queue_depth = lpfc_lun_queue_depth;
-        phba->cfg_fcp_class = lpfc_fcp_class;
-        phba->cfg_use_adisc = lpfc_use_adisc;
-        phba->cfg_ack0 = lpfc_ack0;
-        phba->cfg_topology = lpfc_topology;
-        phba->cfg_scan_down = lpfc_scan_down;
-        phba->cfg_nodev_tmo = lpfc_nodev_tmo;
-        phba->cfg_link_speed = lpfc_link_speed;
-        phba->cfg_fdmi_on = lpfc_fdmi_on;
-        phba->cfg_discovery_threads = lpfc_discovery_threads;
-        phba->cfg_max_luns = lpfc_max_luns;
+        lpfc_log_verbose_init(phba, lpfc_log_verbose);
+        lpfc_cr_delay_init(phba, lpfc_cr_delay);
+        lpfc_cr_count_init(phba, lpfc_cr_count);
+        lpfc_lun_queue_depth_init(phba, lpfc_lun_queue_depth);
+        lpfc_fcp_class_init(phba, lpfc_fcp_class);
+        lpfc_use_adisc_init(phba, lpfc_use_adisc);
+        lpfc_ack0_init(phba, lpfc_ack0);
+        lpfc_topology_init(phba, lpfc_topology);
+        lpfc_scan_down_init(phba, lpfc_scan_down);
+        lpfc_nodev_tmo_init(phba, lpfc_nodev_tmo);
+        lpfc_link_speed_init(phba, lpfc_link_speed);
+        lpfc_fdmi_on_init(phba, lpfc_fdmi_on);
+        lpfc_discovery_threads_init(phba, lpfc_discovery_threads);
+        lpfc_max_luns_init(phba, lpfc_max_luns);
 
         /*
          * The total number of segments is the configuration value plus 2