diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-20 22:42:13 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-20 22:42:13 -0400 |
| commit | 48dade3fd8166ba612a9e0daafc890b4b552dd43 (patch) | |
| tree | 019ae5a02b7d7720cb65441ddf71b13022273424 | |
| parent | c6508b55f9fba02db85c73052f4dbe465c2713d4 (diff) | |
| download | longterm-queue-4.8-48dade3fd8166ba612a9e0daafc890b4b552dd43.tar.gz | |
IB: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch b/queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch index 220d799..d9ae0e2 100644 --- a/queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch +++ b/queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch @@ -1,4 +1,4 @@ -From 45bded2c216da6010184ac5ebe88c27f73439009 Mon Sep 17 00:00:00 2001 +From 976301d7327640809d0d61c19fa1ba069eea3587 Mon Sep 17 00:00:00 2001 From: Kamal Heib <kamalh@mellanox.com> Date: Wed, 18 Jan 2017 14:10:32 +0200 Subject: [PATCH] IB/mlx5: Verify that Q counters are supported @@ -15,12 +15,13 @@ Signed-off-by: Kamal Heib <kamalh@mellanox.com> Reviewed-by: Mark Bloch <markb@mellanox.com> Signed-off-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c -index a191b9327b0c..0187f1d7234a 100644 +index 05e9a5fc8159..b627fa9fbc3d 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c -@@ -3313,9 +3313,11 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) +@@ -2861,9 +2861,11 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) if (err) goto err_rsrc; @@ -33,10 +34,10 @@ index a191b9327b0c..0187f1d7234a 100644 + goto err_odp; + } - dev->mdev->priv.uar = mlx5_get_uars_page(dev->mdev); - if (!dev->mdev->priv.uar) -@@ -3364,7 +3366,8 @@ err_uar_page: - mlx5_put_uars_page(dev->mdev, dev->mdev->priv.uar); + err = ib_register_device(&dev->ib_dev, NULL); + if (err) +@@ -2891,7 +2893,8 @@ err_dev: + ib_unregister_device(&dev->ib_dev); err_q_cnt: - mlx5_ib_dealloc_q_counters(dev); @@ -45,10 +46,10 @@ index a191b9327b0c..0187f1d7234a 100644 err_odp: mlx5_ib_odp_remove_one(dev); -@@ -3397,7 +3400,8 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context) - mlx5_free_bfreg(dev->mdev, &dev->fp_bfreg); - mlx5_free_bfreg(dev->mdev, &dev->bfreg); - mlx5_put_uars_page(dev->mdev, mdev->priv.uar); +@@ -2918,7 +2921,8 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context) + enum rdma_link_layer ll = mlx5_ib_port_link_layer(&dev->ib_dev, 1); + + ib_unregister_device(&dev->ib_dev); - mlx5_ib_dealloc_q_counters(dev); + if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt)) + mlx5_ib_dealloc_q_counters(dev); |