From: Jason Gunthorpe <jgg@nvidia.com>
Date: Mon, 12 Apr 2021 16:49:48 +0000 (-0300)
Subject: Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a0354d230843da87c2853c6fed2d5860259bef49;p=linux.git

Merge branch 'mlx5-next' of git://git./linux/kernel/git/mellanox/linux

Saeed Mahameed says:
====================

This pr contains changes from  mlx5-next branch,
already reviewed on netdev and rdma mailing lists, links below.

1) From Leon, Dynamically assign MSI-X vectors count
Already Acked by Bjorn Helgaas.
https://patchwork.kernel.org/project/netdevbpf/cover/20210314124256.70253-1-leon@kernel.org/

2) Cleanup series:
https://patchwork.kernel.org/project/netdevbpf/cover/20210311070915.321814-1-saeed@kernel.org/

From Mark, E-Switch cleanups and refactoring, and the addition
of single FDB mode needed HW bits.

From Mikhael, Remove unused struct field

From Saeed, Cleanup W=1 prototype warning

From Zheng, Esw related cleanup

From Tariq, User order-0 page allocation for EQs

====================

* mlx5-next:
  net/mlx5: Implement sriov_get_vf_total_msix/count() callbacks
  net/mlx5: Dynamically assign MSI-X vectors count
  net/mlx5: Add dynamic MSI-X capabilities bits
  PCI/IOV: Add sysfs MSI-X vector assignment interface
  net/mlx5: Use order-0 allocations for EQs
  net/mlx5: Add IFC bits needed for single FDB mode
  net/mlx5: E-Switch, Refactor send to vport to be more generic
  RDMA/mlx5: Use representor E-Switch when getting netdev and metadata
  net/mlx5: E-Switch, Add eswitch pointer to each representor
  net/mlx5: E-Switch, Add match on vhca id to default send rules
  net/mlx5: Remove unused mlx5_core_health member recover_work
  net/mlx5: simplify the return expression of mlx5_esw_offloads_pair()
  net/mlx5: Cleanup prototype warning

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---

a0354d230843da87c2853c6fed2d5860259bef49
diff --cc drivers/infiniband/hw/mlx5/main.c
index d1baf06517c43,7a7f6ccd02a54..ee623a01a09c5
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@ -125,9 -124,8 +125,8 @@@ static int get_port_state(struct ib_dev
  
  static struct mlx5_roce *mlx5_get_rep_roce(struct mlx5_ib_dev *dev,
  					   struct net_device *ndev,
 -					   u8 *port_num)
 +					   u32 *port_num)
  {
- 	struct mlx5_eswitch *esw = dev->mdev->priv.eswitch;
  	struct net_device *rep_ndev;
  	struct mlx5_ib_port *port;
  	int i;