Merge branch 'mlx5-next' into wip/leon-for-next

[sfrench/cifs-2.6.git] / include / linux / mlx5 / driver.h

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 432bd202e2fedcc2f36b99ea7a56c81f4711c938..9ccfd9dd0d0fe3dd33fe86f93d4a7fb402289a8b 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -551,6 +551,10 @@ enum {
         * creation/deletion on drivers rescan. Unset during device attach.
         */
        MLX5_PRIV_FLAGS_DETACH = 1 << 2,
+       /* Distinguish between mlx5e_probe/remove called by module init/cleanup
+        * and called by other flows which can already hold devlink lock
+        */
+       MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW = 1 << 3,
 };
 
 struct mlx5_adev {
@@ -606,6 +610,7 @@ struct mlx5_priv {
        spinlock_t              ctx_lock;
        struct mlx5_adev       **adev;
        int                     adev_idx;
+       int                     sw_vhca_id;
        struct mlx5_events      *events;
 
        struct mlx5_flow_steering *steering;
@@ -728,10 +733,10 @@ enum {
 };
 
 enum {
-       MR_CACHE_LAST_STD_ENTRY = 20,
+       MKEY_CACHE_LAST_STD_ENTRY = 20,
        MLX5_IMR_MTT_CACHE_ENTRY,
        MLX5_IMR_KSM_CACHE_ENTRY,
-       MAX_MR_CACHE_ENTRIES
+       MAX_MKEY_CACHE_ENTRIES
 };
 
 struct mlx5_profile {
@@ -740,7 +745,7 @@ struct mlx5_profile {
        struct {
                int     size;
                int     limit;
-       } mr_cache[MAX_MR_CACHE_ENTRIES];
+       } mr_cache[MAX_MKEY_CACHE_ENTRIES];
 };
 
 struct mlx5_hca_cap {