Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb5cc431 authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: Simplify mlx5_sriov_is_enabled() by using pci core API 



It is desired to get rid of num_vfs stored inside mlx5_core_sriov to
safely support vports more than vfs.
To reduce dependency on mlx5_core_sriov num_vfs, start using
pci_num_vf() from pci core.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarBodong Wang <bodong@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 2aca1787

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+5 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ void mlx5_sriov_cleanup(struct mlx5_core_dev *dev); 
int mlx5_sriov_attach(struct mlx5_core_dev *dev);

void mlx5_sriov_detach(struct mlx5_core_dev *dev);

int mlx5_core_sriov_configure(struct pci_dev *dev, int num_vfs);

bool mlx5_sriov_is_enabled(struct mlx5_core_dev *dev);

int mlx5_core_enable_hca(struct mlx5_core_dev *dev, u16 func_id);

int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id);

int mlx5_create_scheduling_element_cmd(struct mlx5_core_dev *dev, u8 hierarchy,
@@ -176,6 +175,11 @@ int mlx5_firmware_flash(struct mlx5_core_dev *dev, const struct firmware *fw); 
void mlx5e_init(void);

void mlx5e_cleanup(void);



static inline bool mlx5_sriov_is_enabled(struct mlx5_core_dev *dev)

{

	return pci_num_vf(dev->pdev) ? true : false;

}



static inline int mlx5_lag_is_lacp_owner(struct mlx5_core_dev *dev)

{

	/* LACP owner conditions:

drivers/net/ethernet/mellanox/mlx5/core/sriov.c

+0 −7
Original line number Diff line number Diff line
@@ -36,13 +36,6 @@ 
#include "mlx5_core.h"

#include "eswitch.h"



bool mlx5_sriov_is_enabled(struct mlx5_core_dev *dev)

{

	struct mlx5_core_sriov *sriov = &dev->priv.sriov;



	return !!sriov->num_vfs;

}



static int sriov_restore_guids(struct mlx5_core_dev *dev, int vf)

{

	struct mlx5_core_sriov *sriov = &dev->priv.sriov;