qlcnic: NIC Partitioning - Add basic infrastructure support

Following changes have been added to enable the adapter to work in
NIC partitioning mode where multiple PCI functions of an adapter port can
be configured to work as NIC functions. The first function that is enumerated on
the PCI bus assumes the role of management function which, besides being able
to do all the NIC functionality, can configure other NIC partitions. Other NIC
functions can be configured as privileged or non privileged functions.
Privileged function can not configure other NIC functions but can do all the
NIC functionality including any firmware initialization, chip reset etc. Non
privileged functions can do only basic IO. For chip reset etc, it depends on the
privilege or management function.

1. Added code to determine PCI function number independent of kernel API.
2. Added Driver - FW version 2.0 support.
3. Changed producer and consumer register offset calculation.
4. Added management and privileged operation modes for npar functions. A module
 parameter has been added to control it.
5. Added support for configuring the eswitch in the adapter.

Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c
index 3bd514ec7e8f..3e4822ad5a80 100644
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/qlcnic/qlcnic_ethtool.c
@@ -683,13 +683,13 @@ static int qlcnic_loopback_test(struct net_device *netdev)
         if (ret)
                 goto clear_it;
 
-        ret = qlcnic_set_ilb_mode(adapter);
+        ret = adapter->nic_ops->set_ilb_mode(adapter);
         if (ret)
                 goto done;
 
         ret = qlcnic_do_ilb_test(adapter);
 
-        qlcnic_clear_ilb_mode(adapter);
+        adapter->nic_ops->clear_ilb_mode(adapter);
 
 done:
         qlcnic_diag_free_res(netdev, max_sds_rings);
@@ -715,7 +715,8 @@ static int qlcnic_irq_test(struct net_device *netdev)
 
         adapter->diag_cnt = 0;
         ret = qlcnic_issue_cmd(adapter, adapter->ahw.pci_func,
-                        QLCHAL_VERSION, adapter->portnum, 0, 0, 0x00000011);
+                        adapter->fw_hal_version, adapter->portnum,
+                        0, 0, 0x00000011);
         if (ret)
                 goto done;
 
@@ -834,7 +835,7 @@ static int qlcnic_blink_led(struct net_device *dev, u32 val)
         struct qlcnic_adapter *adapter = netdev_priv(dev);
         int ret;
 
-        ret = qlcnic_config_led(adapter, 1, 0xf);
+        ret = adapter->nic_ops->config_led(adapter, 1, 0xf);
         if (ret) {
                 dev_err(&adapter->pdev->dev,
                         "Failed to set LED blink state.\n");
@@ -843,7 +844,7 @@ static int qlcnic_blink_led(struct net_device *dev, u32 val)
 
         msleep_interruptible(val * 1000);
 
-        ret = qlcnic_config_led(adapter, 0, 0xf);
+        ret = adapter->nic_ops->config_led(adapter, 0, 0xf);
         if (ret) {
                 dev_err(&adapter->pdev->dev,
                         "Failed to reset LED blink state.\n");