1 files changed, 445 insertions, 5 deletions

diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 981aa91efc8c..18e2b2e6626d 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -476,6 +476,53 @@ qlcnic_cleanup_pci_map(struct qlcnic_adapter *adapter)
 }
 
 static int
+qlcnic_init_pci_info(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_pci_info pci_info[QLCNIC_MAX_PCI_FUNC];
+        int i, ret = 0, err;
+        u8 pfn;
+
+        if (!adapter->npars)
+                adapter->npars = kzalloc(sizeof(struct qlcnic_npar_info) *
+                                QLCNIC_MAX_PCI_FUNC, GFP_KERNEL);
+        if (!adapter->npars)
+                return -ENOMEM;
+
+        if (!adapter->eswitch)
+                adapter->eswitch = kzalloc(sizeof(struct qlcnic_eswitch) *
+                                QLCNIC_NIU_MAX_XG_PORTS, GFP_KERNEL);
+        if (!adapter->eswitch) {
+                err = -ENOMEM;
+                goto err_eswitch;
+        }
+
+        ret = qlcnic_get_pci_info(adapter, pci_info);
+        if (!ret) {
+                for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                        pfn = pci_info[i].id;
+                        if (pfn > QLCNIC_MAX_PCI_FUNC)
+                                return QL_STATUS_INVALID_PARAM;
+                        adapter->npars[pfn].active = pci_info[i].active;
+                        adapter->npars[pfn].type = pci_info[i].type;
+                        adapter->npars[pfn].phy_port = pci_info[i].default_port;
+                        adapter->npars[pfn].mac_learning = DEFAULT_MAC_LEARN;
+                }
+
+                for (i = 0; i < QLCNIC_NIU_MAX_XG_PORTS; i++)
+                        adapter->eswitch[i].flags |= QLCNIC_SWITCH_ENABLE;
+
+                return ret;
+        }
+
+        kfree(adapter->eswitch);
+        adapter->eswitch = NULL;
+err_eswitch:
+        kfree(adapter->npars);
+
+        return ret;
+}
+
+static int
 qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
 {
         u8 id;
@@ -494,7 +541,7 @@ qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
 
         if (qlcnic_config_npars) {
                 for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
-                        id = adapter->npars[i].id;
+                        id = i;
                         if (adapter->npars[i].type != QLCNIC_TYPE_NIC ||
                                 id == adapter->ahw.pci_func)
                                 continue;
@@ -519,6 +566,7 @@ qlcnic_get_driver_mode(struct qlcnic_adapter *adapter)
 {
         void __iomem *msix_base_addr;
         void __iomem *priv_op;
+        struct qlcnic_info nic_info;
         u32 func;
         u32 msix_base;
         u32 op_mode, priv_level;
@@ -533,7 +581,14 @@ qlcnic_get_driver_mode(struct qlcnic_adapter *adapter)
         func = (func - msix_base)/QLCNIC_MSIX_TBL_PGSIZE;
         adapter->ahw.pci_func = func;
 
-        qlcnic_get_nic_info(adapter, adapter->ahw.pci_func);
+        if (!qlcnic_get_nic_info(adapter, &nic_info, adapter->ahw.pci_func)) {
+                adapter->capabilities = nic_info.capabilities;
+
+                if (adapter->capabilities & BIT_6)
+                        adapter->flags |= QLCNIC_ESWITCH_ENABLED;
+                else
+                        adapter->flags &= ~QLCNIC_ESWITCH_ENABLED;
+        }
 
         if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
                 adapter->nic_ops = &qlcnic_ops;
@@ -552,7 +607,7 @@ qlcnic_get_driver_mode(struct qlcnic_adapter *adapter)
         case QLCNIC_MGMT_FUNC:
                 adapter->op_mode = QLCNIC_MGMT_FUNC;
                 adapter->nic_ops = &qlcnic_ops;
-                qlcnic_get_pci_info(adapter);
+                qlcnic_init_pci_info(adapter);
                 /* Set privilege level for other functions */
                 qlcnic_set_function_modes(adapter);
                 dev_info(&adapter->pdev->dev,
@@ -654,7 +709,7 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
         int i, offset, val;
         int *ptr32;
         struct pci_dev *pdev = adapter->pdev;
-
+        struct qlcnic_info nic_info;
         adapter->driver_mismatch = 0;
 
         ptr32 = (int *)&serial_num;
@@ -696,7 +751,15 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
                 adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_1G;
         }
 
-        qlcnic_get_nic_info(adapter, adapter->ahw.pci_func);
+        if (!qlcnic_get_nic_info(adapter, &nic_info, adapter->ahw.pci_func)) {
+                adapter->physical_port = nic_info.phys_port;
+                adapter->switch_mode = nic_info.switch_mode;
+                adapter->max_tx_ques = nic_info.max_tx_ques;
+                adapter->max_rx_ques = nic_info.max_rx_ques;
+                adapter->capabilities = nic_info.capabilities;
+                adapter->max_mac_filters = nic_info.max_mac_filters;
+                adapter->max_mtu = nic_info.max_mtu;
+        }
 
         adapter->msix_supported = !!use_msi_x;
         adapter->rss_supported = !!use_msi_x;
@@ -2822,6 +2885,364 @@ static struct bin_attribute bin_attr_mem = {
         .write = qlcnic_sysfs_write_mem,
 };
 
+int
+validate_pm_config(struct qlcnic_adapter *adapter,
+                        struct qlcnic_pm_func_cfg *pm_cfg, int count)
+{
+
+        u8 src_pci_func, s_esw_id, d_esw_id;
+        u8 dest_pci_func;
+        int i;
+
+        for (i = 0; i < count; i++) {
+                src_pci_func = pm_cfg[i].pci_func;
+                dest_pci_func = pm_cfg[i].dest_npar;
+                if (src_pci_func >= QLCNIC_MAX_PCI_FUNC
+                                || dest_pci_func >= QLCNIC_MAX_PCI_FUNC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (adapter->npars[src_pci_func].type != QLCNIC_TYPE_NIC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (adapter->npars[dest_pci_func].type != QLCNIC_TYPE_NIC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (!IS_VALID_MODE(pm_cfg[i].action))
+                        return QL_STATUS_INVALID_PARAM;
+
+                s_esw_id = adapter->npars[src_pci_func].phy_port;
+                d_esw_id = adapter->npars[dest_pci_func].phy_port;
+
+                if (s_esw_id != d_esw_id)
+                        return QL_STATUS_INVALID_PARAM;
+
+        }
+        return 0;
+
+}
+
+static ssize_t
+qlcnic_sysfs_write_pm_config(struct file *filp, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_pm_func_cfg *pm_cfg;
+        u32 id, action, pci_func;
+        int count, rem, i, ret;
+
+        count   = size / sizeof(struct qlcnic_pm_func_cfg);
+        rem     = size % sizeof(struct qlcnic_pm_func_cfg);
+        if (rem)
+                return QL_STATUS_INVALID_PARAM;
+
+        pm_cfg = (struct qlcnic_pm_func_cfg *) buf;
+
+        ret = validate_pm_config(adapter, pm_cfg, count);
+        if (ret)
+                return ret;
+        for (i = 0; i < count; i++) {
+                pci_func = pm_cfg[i].pci_func;
+                action = pm_cfg[i].action;
+                id = adapter->npars[pci_func].phy_port;
+                ret = qlcnic_config_port_mirroring(adapter, id,
+                                                action, pci_func);
+                if (ret)
+                        return ret;
+        }
+
+        for (i = 0; i < count; i++) {
+                pci_func = pm_cfg[i].pci_func;
+                id = adapter->npars[pci_func].phy_port;
+                adapter->npars[pci_func].enable_pm = pm_cfg[i].action;
+                adapter->npars[pci_func].dest_npar = id;
+        }
+        return size;
+}
+
+static ssize_t
+qlcnic_sysfs_read_pm_config(struct file *filp, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_pm_func_cfg pm_cfg[QLCNIC_MAX_PCI_FUNC];
+        int i;
+
+        if (size != sizeof(pm_cfg))
+                return QL_STATUS_INVALID_PARAM;
+
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                if (adapter->npars[i].type != QLCNIC_TYPE_NIC)
+                        continue;
+                pm_cfg[i].action = adapter->npars[i].enable_pm;
+                pm_cfg[i].dest_npar = 0;
+                pm_cfg[i].pci_func = i;
+        }
+        memcpy(buf, &pm_cfg, size);
+
+        return size;
+}
+
+int
+validate_esw_config(struct qlcnic_adapter *adapter,
+                        struct qlcnic_esw_func_cfg *esw_cfg, int count)
+{
+        u8 pci_func;
+        int i;
+
+        for (i = 0; i < count; i++) {
+                pci_func = esw_cfg[i].pci_func;
+                if (pci_func >= QLCNIC_MAX_PCI_FUNC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (adapter->npars[i].type != QLCNIC_TYPE_NIC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (esw_cfg->host_vlan_tag == 1)
+                        if (!IS_VALID_VLAN(esw_cfg[i].vlan_id))
+                                return QL_STATUS_INVALID_PARAM;
+
+                if (!IS_VALID_MODE(esw_cfg[i].promisc_mode)
+                                || !IS_VALID_MODE(esw_cfg[i].host_vlan_tag)
+                                || !IS_VALID_MODE(esw_cfg[i].mac_learning)
+                                || !IS_VALID_MODE(esw_cfg[i].discard_tagged))
+                        return QL_STATUS_INVALID_PARAM;
+        }
+
+        return 0;
+}
+
+static ssize_t
+qlcnic_sysfs_write_esw_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_esw_func_cfg *esw_cfg;
+        u8 id, discard_tagged, promsc_mode, mac_learn;
+        u8 vlan_tagging, pci_func, vlan_id;
+        int count, rem, i, ret;
+
+        count   = size / sizeof(struct qlcnic_esw_func_cfg);
+        rem     = size % sizeof(struct qlcnic_esw_func_cfg);
+        if (rem)
+                return QL_STATUS_INVALID_PARAM;
+
+        esw_cfg = (struct qlcnic_esw_func_cfg *) buf;
+        ret = validate_esw_config(adapter, esw_cfg, count);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < count; i++) {
+                pci_func = esw_cfg[i].pci_func;
+                id = adapter->npars[pci_func].phy_port;
+                vlan_tagging = esw_cfg[i].host_vlan_tag;
+                promsc_mode = esw_cfg[i].promisc_mode;
+                mac_learn = esw_cfg[i].mac_learning;
+                vlan_id = esw_cfg[i].vlan_id;
+                discard_tagged = esw_cfg[i].discard_tagged;
+                ret = qlcnic_config_switch_port(adapter, id, vlan_tagging,
+                                                discard_tagged,
+                                                promsc_mode,
+                                                mac_learn,
+                                                pci_func,
+                                                vlan_id);
+                if (ret)
+                        return ret;
+        }
+
+        for (i = 0; i < count; i++) {
+                pci_func = esw_cfg[i].pci_func;
+                adapter->npars[pci_func].promisc_mode = esw_cfg[i].promisc_mode;
+                adapter->npars[pci_func].mac_learning = esw_cfg[i].mac_learning;
+                adapter->npars[pci_func].vlan_id = esw_cfg[i].vlan_id;
+                adapter->npars[pci_func].discard_tagged =
+                                                esw_cfg[i].discard_tagged;
+                adapter->npars[pci_func].host_vlan_tag =
+                                                esw_cfg[i].host_vlan_tag;
+        }
+
+        return size;
+}
+
+static ssize_t
+qlcnic_sysfs_read_esw_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_esw_func_cfg esw_cfg[QLCNIC_MAX_PCI_FUNC];
+        int i;
+
+        if (size != sizeof(esw_cfg))
+                return QL_STATUS_INVALID_PARAM;
+
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                if (adapter->npars[i].type != QLCNIC_TYPE_NIC)
+                        continue;
+
+                esw_cfg[i].host_vlan_tag = adapter->npars[i].host_vlan_tag;
+                esw_cfg[i].promisc_mode = adapter->npars[i].promisc_mode;
+                esw_cfg[i].discard_tagged = adapter->npars[i].discard_tagged;
+                esw_cfg[i].vlan_id = adapter->npars[i].vlan_id;
+                esw_cfg[i].mac_learning = adapter->npars[i].mac_learning;
+        }
+        memcpy(buf, &esw_cfg, size);
+
+        return size;
+}
+
+int
+validate_npar_config(struct qlcnic_adapter *adapter,
+                                struct qlcnic_npar_func_cfg *np_cfg, int count)
+{
+        u8 pci_func, i;
+
+        for (i = 0; i < count; i++) {
+                pci_func = np_cfg[i].pci_func;
+                if (pci_func >= QLCNIC_MAX_PCI_FUNC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (adapter->npars[pci_func].type != QLCNIC_TYPE_NIC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (!IS_VALID_BW(np_cfg[i].min_bw)
+                                || !IS_VALID_BW(np_cfg[i].max_bw)
+                                || !IS_VALID_RX_QUEUES(np_cfg[i].max_rx_queues)
+                                || !IS_VALID_TX_QUEUES(np_cfg[i].max_tx_queues))
+                        return QL_STATUS_INVALID_PARAM;
+        }
+        return 0;
+}
+
+static ssize_t
+qlcnic_sysfs_write_npar_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_info nic_info;
+        struct qlcnic_npar_func_cfg *np_cfg;
+        int i, count, rem, ret;
+        u8 pci_func;
+
+        count   = size / sizeof(struct qlcnic_npar_func_cfg);
+        rem     = size % sizeof(struct qlcnic_npar_func_cfg);
+        if (rem)
+                return QL_STATUS_INVALID_PARAM;
+
+        np_cfg = (struct qlcnic_npar_func_cfg *) buf;
+        ret = validate_npar_config(adapter, np_cfg, count);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < count ; i++) {
+                pci_func = np_cfg[i].pci_func;
+                ret = qlcnic_get_nic_info(adapter, &nic_info, pci_func);
+                if (ret)
+                        return ret;
+                nic_info.pci_func = pci_func;
+                nic_info.min_tx_bw = np_cfg[i].min_bw;
+                nic_info.max_tx_bw = np_cfg[i].max_bw;
+                ret = qlcnic_set_nic_info(adapter, &nic_info);
+                if (ret)
+                        return ret;
+        }
+
+        return size;
+
+}
+static ssize_t
+qlcnic_sysfs_read_npar_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_info nic_info;
+        struct qlcnic_npar_func_cfg np_cfg[QLCNIC_MAX_PCI_FUNC];
+        int i, ret;
+
+        if (size != sizeof(np_cfg))
+                return QL_STATUS_INVALID_PARAM;
+
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC ; i++) {
+                if (adapter->npars[i].type != QLCNIC_TYPE_NIC)
+                        continue;
+                ret = qlcnic_get_nic_info(adapter, &nic_info, i);
+                if (ret)
+                        return ret;
+
+                np_cfg[i].pci_func = i;
+                np_cfg[i].op_mode = nic_info.op_mode;
+                np_cfg[i].port_num = nic_info.phys_port;
+                np_cfg[i].fw_capab = nic_info.capabilities;
+                np_cfg[i].min_bw = nic_info.min_tx_bw ;
+                np_cfg[i].max_bw = nic_info.max_tx_bw;
+                np_cfg[i].max_tx_queues = nic_info.max_tx_ques;
+                np_cfg[i].max_rx_queues = nic_info.max_rx_ques;
+        }
+        memcpy(buf, &np_cfg, size);
+        return size;
+}
+
+static ssize_t
+qlcnic_sysfs_read_pci_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_pci_func_cfg pci_cfg[QLCNIC_MAX_PCI_FUNC];
+        struct qlcnic_pci_info  pci_info[QLCNIC_MAX_PCI_FUNC];
+        int i, ret;
+
+        if (size != sizeof(pci_cfg))
+                return QL_STATUS_INVALID_PARAM;
+
+        ret = qlcnic_get_pci_info(adapter, pci_info);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC ; i++) {
+                pci_cfg[i].pci_func = pci_info[i].id;
+                pci_cfg[i].func_type = pci_info[i].type;
+                pci_cfg[i].port_num = pci_info[i].default_port;
+                pci_cfg[i].min_bw = pci_info[i].tx_min_bw;
+                pci_cfg[i].max_bw = pci_info[i].tx_max_bw;
+                memcpy(&pci_cfg[i].def_mac_addr, &pci_info[i].mac, ETH_ALEN);
+        }
+        memcpy(buf, &pci_cfg, size);
+        return size;
+
+}
+static struct bin_attribute bin_attr_npar_config = {
+        .attr = {.name = "npar_config", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_sysfs_read_npar_config,
+        .write = qlcnic_sysfs_write_npar_config,
+};
+
+static struct bin_attribute bin_attr_pci_config = {
+        .attr = {.name = "pci_config", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_sysfs_read_pci_config,
+        .write = NULL,
+};
+
+static struct bin_attribute bin_attr_esw_config = {
+        .attr = {.name = "esw_config", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_sysfs_read_esw_config,
+        .write = qlcnic_sysfs_write_esw_config,
+};
+
+static struct bin_attribute bin_attr_pm_config = {
+        .attr = {.name = "pm_config", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_sysfs_read_pm_config,
+        .write = qlcnic_sysfs_write_pm_config,
+};
+
 static void
 qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter)
 {
@@ -2853,6 +3274,18 @@ qlcnic_create_diag_entries(struct qlcnic_adapter *adapter)
                 dev_info(dev, "failed to create crb sysfs entry\n");
         if (device_create_bin_file(dev, &bin_attr_mem))
                 dev_info(dev, "failed to create mem sysfs entry\n");
+        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) ||
+                        adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return;
+        if (device_create_bin_file(dev, &bin_attr_pci_config))
+                dev_info(dev, "failed to create pci config sysfs entry");
+        if (device_create_bin_file(dev, &bin_attr_npar_config))
+                dev_info(dev, "failed to create npar config sysfs entry");
+        if (device_create_bin_file(dev, &bin_attr_esw_config))
+                dev_info(dev, "failed to create esw config sysfs entry");
+        if (device_create_bin_file(dev, &bin_attr_pm_config))
+                dev_info(dev, "failed to create pm config sysfs entry");
+
 }
 
 
@@ -2864,6 +3297,13 @@ qlcnic_remove_diag_entries(struct qlcnic_adapter *adapter)
         device_remove_file(dev, &dev_attr_diag_mode);
         device_remove_bin_file(dev, &bin_attr_crb);
         device_remove_bin_file(dev, &bin_attr_mem);
+        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) ||
+                        adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return;
+        device_remove_bin_file(dev, &bin_attr_pci_config);
+        device_remove_bin_file(dev, &bin_attr_npar_config);
+        device_remove_bin_file(dev, &bin_attr_esw_config);
+        device_remove_bin_file(dev, &bin_attr_pm_config);
 }
 
 #ifdef CONFIG_INET