From: Jason Gunthorpe <jgg@mellanox.com>
Date: Wed, 10 Apr 2019 17:59:27 +0000 (-0300)
Subject: Merge branch 'mlx5-next' into rdma.git for-next
X-Git-Tag: v5.2-rc1~114^2~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5331fa0db73d6b27f90a0359a7ede70264491714;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'mlx5-next' into rdma.git for-next

From
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

Required for dependencies on the next series

* branch 'mlx5-next':
  net/mlx5: E-Switch, add a new prio to be used by the RDMA side
  net/mlx5: E-Switch, don't use hardcoded values for FDB prios
  net/mlx5: Fix false compilation warning
  net/mlx5: Expose MPEIN (Management PCIE INfo) register layout
  net/mlx5: Add rate limit print macros
  net/mlx5: Add explicit bar address field
  net/mlx5: Replace dev_err/warn/info by mlx5_core_err/warn/info
  net/mlx5: Use dev->priv.name instead of dev_name
  net/mlx5: Make mlx5_core messages independent from mdev->pdev
  net/mlx5: Break load_one into three stages
  net/mlx5: Function setup/teardown procedures
  net/mlx5: Move health and page alloc init to mdev_init
  net/mlx5: Split mdev init and pci init
  net/mlx5: Remove redundant init functions parameter
  net/mlx5: Remove spinlock support from mlx5_write64
  net/mlx5: Remove unused MLX5_*_DOORBELL_LOCK macros

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

5331fa0db73d6b27f90a0359a7ede70264491714
diff --cc drivers/infiniband/hw/mlx5/main.c
index 06578e8a9787b,a5333db0a4c7f..ebd3641e7e62a
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@ -2326,13 -2301,10 +2326,13 @@@ int mlx5_ib_dealloc_dm(struct ib_dm *ib
  	if (ret)
  		return ret;
  
- 	page_idx = (dm->dev_addr - pci_resource_start(memic->dev->pdev, 0) -
+ 	page_idx = (dm->dev_addr - memic->dev->bar_addr -
  		    MLX5_CAP64_DEV_MEM(memic->dev, memic_bar_start_addr)) >>
  		    PAGE_SHIFT;
 -	bitmap_clear(to_mucontext(ibdm->uobject->context)->dm_pages,
 +	bitmap_clear(rdma_udata_to_drv_context(
 +			&attrs->driver_udata,
 +			struct mlx5_ib_ucontext,
 +			ibucontext)->dm_pages,
  		     page_idx,
  		     DIV_ROUND_UP(act_size, PAGE_SIZE));
  
diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index f2260391be5b9,8a214ada2424a..6c8a17ca236e8
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@@ -40,14 -40,7 +40,9 @@@
  #include "en.h"
  #include "fs_core.h"
  #include "lib/devcom.h"
 +#include "ecpf.h"
 +#include "lib/eq.h"
  
- enum {
- 	FDB_FAST_PATH = 0,
- 	FDB_SLOW_PATH
- };
- 
  /* There are two match-all miss flows, one for unicast dst mac and
   * one for multicast.
   */