Skip to content

Commit

Permalink
net/mlx5: Separate between public and private API of sf.h
Browse files Browse the repository at this point in the history
Move mlx5_sf_max_functions() and friends from the privete sf/sf.h
to the public lib/sf.h. This is done in order to have one direction
include paths.

Signed-off-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
  • Loading branch information
Shay Drory authored and Saeed Mahameed committed Jun 15, 2021
1 parent 3af2649 commit c8ea212
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 36 deletions.
45 changes: 45 additions & 0 deletions drivers/net/ethernet/mellanox/mlx5/core/lib/sf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
/* Copyright (c) 2021 Mellanox Technologies Ltd */

#ifndef __LIB_MLX5_SF_H__
#define __LIB_MLX5_SF_H__

#include <linux/mlx5/driver.h>

static inline u16 mlx5_sf_start_function_id(const struct mlx5_core_dev *dev)
{
return MLX5_CAP_GEN(dev, sf_base_id);
}

#ifdef CONFIG_MLX5_SF

static inline bool mlx5_sf_supported(const struct mlx5_core_dev *dev)
{
return MLX5_CAP_GEN(dev, sf);
}

static inline u16 mlx5_sf_max_functions(const struct mlx5_core_dev *dev)
{
if (!mlx5_sf_supported(dev))
return 0;
if (MLX5_CAP_GEN(dev, max_num_sf))
return MLX5_CAP_GEN(dev, max_num_sf);
else
return 1 << MLX5_CAP_GEN(dev, log_max_sf);
}

#else

static inline bool mlx5_sf_supported(const struct mlx5_core_dev *dev)
{
return false;
}

static inline u16 mlx5_sf_max_functions(const struct mlx5_core_dev *dev)
{
return 0;
}

#endif

#endif
37 changes: 1 addition & 36 deletions drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,7 @@
#define __MLX5_SF_H__

#include <linux/mlx5/driver.h>

static inline u16 mlx5_sf_start_function_id(const struct mlx5_core_dev *dev)
{
return MLX5_CAP_GEN(dev, sf_base_id);
}

#ifdef CONFIG_MLX5_SF

static inline bool mlx5_sf_supported(const struct mlx5_core_dev *dev)
{
return MLX5_CAP_GEN(dev, sf);
}

static inline u16 mlx5_sf_max_functions(const struct mlx5_core_dev *dev)
{
if (!mlx5_sf_supported(dev))
return 0;
if (MLX5_CAP_GEN(dev, max_num_sf))
return MLX5_CAP_GEN(dev, max_num_sf);
else
return 1 << MLX5_CAP_GEN(dev, log_max_sf);
}

#else

static inline bool mlx5_sf_supported(const struct mlx5_core_dev *dev)
{
return false;
}

static inline u16 mlx5_sf_max_functions(const struct mlx5_core_dev *dev)
{
return 0;
}

#endif
#include "lib/sf.h"

#ifdef CONFIG_MLX5_SF_MANAGER

Expand Down

0 comments on commit c8ea212

Please sign in to comment.