net/mlx4_core: Fixes for VF / Guest startup flow

- pass the following parameters:
  - firmware version (added QUERY_FW paravirtualization for that)

  - disable Blueflame on slaves. KVM disables write combining on guests,
    and we get better performance without BF in this case. (This requires
    QUERY_DEV_CAP paravirtualization, also in this commit)

  - max qp rdma as destination

- get rid of a chunk of "if (0)" dead code

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 2fe9fe5f7cfb..7f71be0ca5f2 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -430,12 +430,17 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
         mlx4_log_num_mgm_entry_size = hca_param.log_mc_entry_sz;
 
         memset(&dev_cap, 0, sizeof(dev_cap));
+        dev->caps.max_qp_dest_rdma = 1 << hca_param.log_rd_per_qp;
         err = mlx4_dev_cap(dev, &dev_cap);
         if (err) {
                 mlx4_err(dev, "QUERY_DEV_CAP command failed, aborting.\n");
                 return err;
         }
 
+        err = mlx4_QUERY_FW(dev);
+        if (err)
+                mlx4_err(dev, "QUERY_FW command failed: could not get FW version.\n");
+
         page_size = ~dev->caps.page_size_cap + 1;
         mlx4_warn(dev, "HCA minimum page size:%d\n", page_size);
         if (page_size > PAGE_SIZE) {
@@ -499,18 +504,6 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                 return -ENODEV;
         }
 
-#if 0
-        mlx4_warn(dev, "sqp_demux:%d\n", dev->caps.sqp_demux);
-        mlx4_warn(dev, "num_uars:%d reserved_uars:%d uar region:0x%x bar2:0x%llx\n",
-                  dev->caps.num_uars, dev->caps.reserved_uars,
-                  dev->caps.uar_page_size * dev->caps.num_uars,
-                  pci_resource_len(dev->pdev, 2));
-        mlx4_warn(dev, "num_eqs:%d reserved_eqs:%d\n", dev->caps.num_eqs,
-                  dev->caps.reserved_eqs);
-        mlx4_warn(dev, "num_pds:%d reserved_pds:%d slave_pd_shift:%d pd_base:%d\n",
-                  dev->caps.num_pds, dev->caps.reserved_pds,
-                  dev->caps.slave_pd_shift, dev->caps.pd_base);
-#endif
         return 0;
 }