scsi: be2iscsi: Move VLAN code to common iface_set_param

VLAN tag is L2 construct, move VLAN code out from configuring IP.
Rearrange and rename the APIs to make it consistent.
Replace ENOSYS with EPERM.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index 7e17a8ddcac8633da71056f3c7081d48fadc0d30..b725536e6c9ea4fc88d18294525210b5002ab617 100644 (file)
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -315,8 +315,8 @@ void beiscsi_destroy_def_ifaces(struct beiscsi_hba *phba)
  *     Failure: Non-Zero Value
  **/
 static int
-beiscsi_set_vlan_tag(struct Scsi_Host *shost,
-                     struct iscsi_iface_param_info *iface_param)
+beiscsi_iface_config_vlan(struct Scsi_Host *shost,
+                         struct iscsi_iface_param_info *iface_param)
 {
        struct beiscsi_hba *phba = iscsi_host_priv(shost);
        int ret;
@@ -329,20 +329,17 @@ beiscsi_set_vlan_tag(struct Scsi_Host *shost,
                return ret;
        }
 
+       ret = -EPERM;
        switch (iface_param->param) {
        case ISCSI_NET_PARAM_VLAN_ENABLED:
+               ret = 0;
                if (iface_param->value[0] != ISCSI_VLAN_ENABLE)
-                       ret = mgmt_set_vlan(phba, BEISCSI_VLAN_DISABLE);
+                       ret = beiscsi_if_set_vlan(phba, BEISCSI_VLAN_DISABLE);
                break;
        case ISCSI_NET_PARAM_VLAN_TAG:
-               ret = mgmt_set_vlan(phba,
-                                   *((uint16_t *)iface_param->value));
+               ret = beiscsi_if_set_vlan(phba,
+                                         *((uint16_t *)iface_param->value));
                break;
-       default:
-               beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_CONFIG,
-                           "BS_%d : Unknown Param Type : %d\n",
-                           iface_param->param);
-               return -ENOSYS;
        }
        return ret;
 }
@@ -356,7 +353,7 @@ beiscsi_iface_config_ipv4(struct Scsi_Host *shost,
        struct beiscsi_hba *phba = iscsi_host_priv(shost);
        u8 *ip = NULL, *subnet = NULL, *gw;
        struct nlattr *nla;
-       int ret = 0;
+       int ret = -EPERM;
 
        /* Check the param */
        switch (info->param) {
@@ -405,14 +402,6 @@ beiscsi_iface_config_ipv4(struct Scsi_Host *shost,
                }
                ret = beiscsi_if_en_static(phba, BE2_IPV4, ip, subnet);
                break;
-       case ISCSI_NET_PARAM_VLAN_ENABLED:
-       case ISCSI_NET_PARAM_VLAN_TAG:
-               ret = beiscsi_set_vlan_tag(shost, info);
-               break;
-       default:
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
-                           "BS_%d : Param %d not supported\n",
-                           info->param);
        }
 
        return ret;
@@ -424,7 +413,7 @@ beiscsi_iface_config_ipv6(struct Scsi_Host *shost,
                          void *data, uint32_t dt_len)
 {
        struct beiscsi_hba *phba = iscsi_host_priv(shost);
-       int ret = 0;
+       int ret = -EPERM;
 
        switch (iface_param->param) {
        case ISCSI_NET_PARAM_IFACE_ENABLE:
@@ -439,14 +428,6 @@ beiscsi_iface_config_ipv6(struct Scsi_Host *shost,
                ret = beiscsi_if_en_static(phba, BE2_IPV6,
                                           iface_param->value, NULL);
                break;
-       case ISCSI_NET_PARAM_VLAN_ENABLED:
-       case ISCSI_NET_PARAM_VLAN_TAG:
-               ret = beiscsi_set_vlan_tag(shost, iface_param);
-               break;
-       default:
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
-                           "BS_%d : Param %d not supported\n",
-                           iface_param->param);
        }
 
        return ret;
@@ -485,24 +466,42 @@ int be2iscsi_iface_set_param(struct Scsi_Host *shost,
                        return -EINVAL;
                }
 
-               switch (iface_param->iface_type) {
-               case ISCSI_IFACE_TYPE_IPV4:
-                       ret = beiscsi_iface_config_ipv4(shost, iface_param,
-                                                       data, dt_len);
-                       break;
-               case ISCSI_IFACE_TYPE_IPV6:
-                       ret = beiscsi_iface_config_ipv6(shost, iface_param,
-                                                       data, dt_len);
+               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
+                           "BS_%d : %s.0 set param %d",
+                           (iface_param->iface_type == ISCSI_IFACE_TYPE_IPV4) ?
+                           "ipv4" : "ipv6", iface_param->param);
+
+               ret = -EPERM;
+               switch (iface_param->param) {
+               case ISCSI_NET_PARAM_VLAN_ENABLED:
+               case ISCSI_NET_PARAM_VLAN_TAG:
+                       ret = beiscsi_iface_config_vlan(shost, iface_param);
                        break;
                default:
-                       beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
-                                   "BS_%d : Invalid iface type :%d passed\n",
-                                   iface_param->iface_type);
-                       break;
+                       switch (iface_param->iface_type) {
+                       case ISCSI_IFACE_TYPE_IPV4:
+                               ret = beiscsi_iface_config_ipv4(shost,
+                                                               iface_param,
+                                                               data, dt_len);
+                               break;
+                       case ISCSI_IFACE_TYPE_IPV6:
+                               ret = beiscsi_iface_config_ipv6(shost,
+                                                               iface_param,
+                                                               data, dt_len);
+                               break;
+                       }
                }
 
+               if (ret == -EPERM) {
+                       __beiscsi_log(phba, KERN_ERR,
+                                     "BS_%d : %s.0 set param %d not permitted",
+                                     (iface_param->iface_type ==
+                                      ISCSI_IFACE_TYPE_IPV4) ? "ipv4" : "ipv6",
+                                     iface_param->param);
+                       ret = 0;
+               }
                if (ret)
-                       return ret;
+                       break;
        }
 
        return ret;
@@ -548,16 +547,16 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba,
                        len = -EINVAL;
                else
                        len = sprintf(buf, "%d\n",
-                                    (if_info->vlan_priority &
-                                    ISCSI_MAX_VLAN_ID));
+                                     (if_info->vlan_priority &
+                                      ISCSI_MAX_VLAN_ID));
                break;
        case ISCSI_NET_PARAM_VLAN_PRIORITY:
                if (if_info->vlan_priority == BEISCSI_VLAN_DISABLE)
                        len = -EINVAL;
                else
                        len = sprintf(buf, "%d\n",
-                                    ((if_info->vlan_priority >> 13) &
-                                    ISCSI_MAX_VLAN_PRIORITY));
+                                     ((if_info->vlan_priority >> 13) &
+                                      ISCSI_MAX_VLAN_PRIORITY));
                break;
        default:
                WARN_ON(1);

diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 2a5d65e27c14a8eecc37641994cb5012992d89c9..5643cf16c08dc455147e59ba935c3e79aa46f05d 100644 (file)
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -1001,6 +1001,9 @@ static int mgmt_alloc_cmd_data(struct beiscsi_hba *phba, struct be_dma_mem *cmd,
        }
        cmd->size = size;
        be_cmd_hdr_prepare(cmd->va, CMD_SUBSYSTEM_ISCSI, iscsi_cmd, size);
+       beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
+                   "BG_%d : subsystem iSCSI cmd %d size %d\n",
+                   iscsi_cmd, size);
        return 0;
 }
 
@@ -1259,6 +1262,42 @@ exit:
        return rc;
 }
 
+/**
+ * beiscsi_if_set_vlan()- Issue and wait for CMD completion
+ * @phba: device private structure instance
+ * @vlan_tag: VLAN tag
+ *
+ * Issue the MBX Cmd and wait for the completion of the
+ * command.
+ *
+ * returns
+ *     Success: 0
+ *     Failure: Non-Xero Value
+ **/
+int beiscsi_if_set_vlan(struct beiscsi_hba *phba, uint16_t vlan_tag)
+{
+       int rc;
+       unsigned int tag;
+
+       tag = be_cmd_set_vlan(phba, vlan_tag);
+       if (!tag) {
+               beiscsi_log(phba, KERN_ERR,
+                           (BEISCSI_LOG_CONFIG | BEISCSI_LOG_MBOX),
+                           "BG_%d : VLAN Setting Failed\n");
+               return -EBUSY;
+       }
+
+       rc = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
+       if (rc) {
+               beiscsi_log(phba, KERN_ERR,
+                           (BEISCSI_LOG_CONFIG | BEISCSI_LOG_MBOX),
+                           "BS_%d : VLAN MBX Cmd Failed\n");
+               return rc;
+       }
+       return rc;
+}
+
+
 int mgmt_get_if_info(struct beiscsi_hba *phba, int ip_type,
                     struct be_cmd_get_if_info_resp **if_info)
 {
@@ -1447,42 +1486,6 @@ int be_mgmt_get_boot_shandle(struct beiscsi_hba *phba,
        return -ENXIO;
 }
 
-/**
- * mgmt_set_vlan()- Issue and wait for CMD completion
- * @phba: device private structure instance
- * @vlan_tag: VLAN tag
- *
- * Issue the MBX Cmd and wait for the completion of the
- * command.
- *
- * returns
- *     Success: 0
- *     Failure: Non-Xero Value
- **/
-int mgmt_set_vlan(struct beiscsi_hba *phba,
-                  uint16_t vlan_tag)
-{
-       int rc;
-       unsigned int tag;
-
-       tag = be_cmd_set_vlan(phba, vlan_tag);
-       if (!tag) {
-               beiscsi_log(phba, KERN_ERR,
-                           (BEISCSI_LOG_CONFIG | BEISCSI_LOG_MBOX),
-                           "BG_%d : VLAN Setting Failed\n");
-               return -EBUSY;
-       }
-
-       rc = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
-       if (rc) {
-               beiscsi_log(phba, KERN_ERR,
-                           (BEISCSI_LOG_CONFIG | BEISCSI_LOG_MBOX),
-                           "BS_%d : VLAN MBX Cmd Failed\n");
-               return rc;
-       }
-       return rc;
-}
-
 /**
  * beiscsi_drvr_ver_disp()- Display the driver Name and Version
  * @dev: ptr to device not used.

diff --git a/drivers/scsi/be2iscsi/be_mgmt.h b/drivers/scsi/be2iscsi/be_mgmt.h
index 71a96097f83a84f0014dd8a6b27b5b26ff93225f..7637b9e5e7e54e35ce60bd7bcb64b5c5e28c6ec9 100644 (file)
--- a/drivers/scsi/be2iscsi/be_mgmt.h
+++ b/drivers/scsi/be2iscsi/be_mgmt.h
@@ -308,7 +308,7 @@ int be_mgmt_get_boot_shandle(struct beiscsi_hba *phba,
 
 unsigned int mgmt_get_all_if_id(struct beiscsi_hba *phba);
 
-int mgmt_set_vlan(struct beiscsi_hba *phba, uint16_t vlan_tag);
+int beiscsi_if_set_vlan(struct beiscsi_hba *phba, uint16_t vlan_tag);
 
 ssize_t beiscsi_drvr_ver_disp(struct device *dev,
                               struct device_attribute *attr, char *buf);