qlcnic: configure port on eswitch

o Nic partition capable devices has embedded switch, this needs to support
various features like external switch.

Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 130 insertions, 44 deletions

diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/qlcnic/qlcnic_ctx.c
index 57c9b09bd16a..74ae3b0a5ea8 100644
--- a/drivers/net/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/qlcnic/qlcnic_ctx.c
@@ -813,9 +813,8 @@ int qlcnic_get_eswitch_capabilities(struct qlcnic_adapter *adapter, u8 port,
                 arg2 = QLCRD32(adapter, QLCNIC_ARG2_CRB_OFFSET);
 
                 eswitch->port = arg1 & 0xf;
-                eswitch->active_vports = LSB(arg2);
-                eswitch->max_ucast_filters = MSB(arg2);
-                eswitch->max_active_vlans = LSB(MSW(arg2));
+                eswitch->max_ucast_filters = LSW(arg2);
+                eswitch->max_active_vlans = MSW(arg2) & 0xfff;
                 if (arg1 & BIT_6)
                         eswitch->flags |= QLCNIC_SWITCH_VLAN_FILTERING;
                 if (arg1 & BIT_7)
@@ -943,47 +942,6 @@ int qlcnic_config_port_mirroring(struct qlcnic_adapter *adapter, u8 id,
         return err;
 }
 
-/* Configure eSwitch port */
-int qlcnic_config_switch_port(struct qlcnic_adapter *adapter, u8 id,
-                int vlan_tagging, u8 discard_tagged, u8 promsc_mode,
-                u8 mac_learn, u8 pci_func, u16 vlan_id)
-{
-        int err = -EIO;
-        u32 arg1;
-        struct qlcnic_eswitch *eswitch;
-
-        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
-                return err;
-
-        eswitch = &adapter->eswitch[id];
-        if (!(eswitch->flags & QLCNIC_SWITCH_ENABLE))
-                return err;
-
-        arg1 = eswitch->port | (discard_tagged ? BIT_4 : 0);
-        arg1 |= (promsc_mode ? BIT_6 : 0) | (mac_learn ? BIT_7 : 0);
-        arg1 |= pci_func << 8;
-        if (vlan_tagging)
-                arg1 |= BIT_5 | (vlan_id << 16);
-
-        err = qlcnic_issue_cmd(adapter,
-                        adapter->ahw.pci_func,
-                        adapter->fw_hal_version,
-                        arg1,
-                        0,
-                        0,
-                        QLCNIC_CDRP_CMD_CONFIGURE_ESWITCH);
-
-        if (err != QLCNIC_RCODE_SUCCESS) {
-                dev_err(&adapter->pdev->dev,
-                        "Failed to configure eswitch port%d\n", eswitch->port);
-        } else {
-                dev_info(&adapter->pdev->dev,
-                        "Configured eSwitch for port %d\n", eswitch->port);
-        }
-
-        return err;
-}
-
 int qlcnic_get_port_stats(struct qlcnic_adapter *adapter, const u8 func,
                 const u8 rx_tx, struct __qlcnic_esw_statistics *esw_stats) {
 
@@ -1108,3 +1066,131 @@ err_ret:
                 "rx_ctx=%d\n", func_esw, port, rx_tx);
         return -EIO;
 }
+
+static int
+__qlcnic_get_eswitch_port_config(struct qlcnic_adapter *adapter,
+                                        u32 *arg1, u32 *arg2)
+{
+        int err = -EIO;
+        u8 pci_func;
+        pci_func = (*arg1 >> 8);
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        *arg1,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_GET_ESWITCH_PORT_CONFIG);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                *arg1 = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
+                *arg2 = QLCRD32(adapter, QLCNIC_ARG2_CRB_OFFSET);
+                dev_info(&adapter->pdev->dev,
+                        "eSwitch port config for pci func%d\n", pci_func);
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get eswitch port config%d\n", pci_func);
+        }
+        return err;
+}
+/* Configure eSwitch port
+op_mode = 0 for setting default port behavior
+op_mode = 1 for setting  vlan id
+op_mode = 2 for deleting vlan id
+op_type = 0 for vlan_id
+op_type = 1 for port vlan_id
+*/
+int qlcnic_config_switch_port(struct qlcnic_adapter *adapter,
+                struct qlcnic_esw_func_cfg *esw_cfg)
+{
+        int err = -EIO;
+        u32 arg1, arg2 = 0;
+        u8 pci_func;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+        pci_func = esw_cfg->pci_func;
+        arg1 = (adapter->npars[pci_func].phy_port & BIT_0);
+        arg1 |= (pci_func << 8);
+
+        if (__qlcnic_get_eswitch_port_config(adapter, &arg1, &arg2))
+                return err;
+        arg1 &= ~(0x0ff << 8);
+        arg1 |= (pci_func << 8);
+        arg1 &= ~(BIT_2 | BIT_3);
+        switch (esw_cfg->op_mode) {
+        case QLCNIC_PORT_DEFAULTS:
+                arg1 |= (BIT_4 | BIT_6 | BIT_7);
+                arg2 |= (BIT_0 | BIT_1);
+                if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO)
+                        arg2 |= (BIT_2 | BIT_3);
+                if (!(esw_cfg->discard_tagged))
+                        arg1 &= ~BIT_4;
+                if (!(esw_cfg->promisc_mode))
+                        arg1 &= ~BIT_6;
+                if (!(esw_cfg->mac_learning))
+                        arg1 &= ~BIT_7;
+                if (!(esw_cfg->mac_anti_spoof))
+                        arg2 &= ~BIT_0;
+                if (!(esw_cfg->offload_flags & BIT_0))
+                        arg2 &= ~(BIT_1 | BIT_2 | BIT_3);
+                if (!(esw_cfg->offload_flags & BIT_1))
+                        arg2 &= ~BIT_2;
+                if (!(esw_cfg->offload_flags & BIT_2))
+                        arg2 &= ~BIT_3;
+                break;
+        case QLCNIC_ADD_VLAN:
+                        arg1 |= (BIT_2 | BIT_5);
+                        arg1 |= (esw_cfg->vlan_id << 16);
+                        break;
+        case QLCNIC_DEL_VLAN:
+                        arg1 |= (BIT_3 | BIT_5);
+                        arg1 &= ~(0x0ffff << 16);
+        default:
+                return err;
+        }
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        arg2,
+                        0,
+                        QLCNIC_CDRP_CMD_CONFIGURE_ESWITCH);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to configure eswitch port%d\n", pci_func);
+        } else {
+                dev_info(&adapter->pdev->dev,
+                        "Configured eSwitch for port %d\n", pci_func);
+        }
+
+        return err;
+}
+
+int
+qlcnic_get_eswitch_port_config(struct qlcnic_adapter *adapter,
+                        struct qlcnic_esw_func_cfg *esw_cfg)
+{
+        u32 arg1, arg2;
+        u8 phy_port;
+        if (adapter->op_mode == QLCNIC_MGMT_FUNC)
+                phy_port = adapter->npars[esw_cfg->pci_func].phy_port;
+        else
+                phy_port = adapter->physical_port;
+        arg1 = phy_port;
+        arg1 |= (esw_cfg->pci_func << 8);
+        if (__qlcnic_get_eswitch_port_config(adapter, &arg1, &arg2))
+                return -EIO;
+
+        esw_cfg->discard_tagged = !!(arg1 & BIT_4);
+        esw_cfg->host_vlan_tag = !!(arg1 & BIT_5);
+        esw_cfg->promisc_mode = !!(arg1 & BIT_6);
+        esw_cfg->mac_learning = !!(arg1 & BIT_7);
+        esw_cfg->vlan_id = LSW(arg1 >> 16);
+        esw_cfg->mac_anti_spoof = (arg2 & 0x1);
+        esw_cfg->offload_flags = ((arg2 >> 1) & 0x7);
+
+        return 0;
+}