Skip to content

Commit

Permalink
net/mlx5: Rename mlx5_pci_dev_type to mlx5_coredev_type
Browse files Browse the repository at this point in the history
Rename mlx5_pci_dev_type to mlx5_coredev_type to distinguish different mlx5
device types.

mlx5_coredev_type represents mlx5_core_dev instance type. Hence keep
mlx5_coredev_type in mlx5_core_dev structure.

Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Signed-off-by: Vu Pham <vuhuong@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
  • Loading branch information
Huy Nguyen authored and Saeed Mahameed committed Jul 1, 2019
1 parent b8ca123 commit 386e75a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
5 changes: 3 additions & 2 deletions drivers/net/ethernet/mellanox/mlx5/core/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,6 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct pci_dev *pdev,
struct mlx5_priv *priv = &dev->priv;
int err = 0;

priv->pci_dev_data = id->driver_data;

pci_set_drvdata(dev->pdev, dev);

dev->bar_addr = pci_resource_start(pdev, 0);
Expand Down Expand Up @@ -1320,6 +1318,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *id)
dev->device = &pdev->dev;
dev->pdev = pdev;

dev->coredev_type = id->driver_data & MLX5_PCI_DEV_IS_VF ?
MLX5_COREDEV_VF : MLX5_COREDEV_PF;

err = mlx5_mdev_init(dev, prof_sel);
if (err)
goto mdev_init_err;
Expand Down
11 changes: 8 additions & 3 deletions include/linux/mlx5/driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ enum port_state_policy {
MLX5_POLICY_INVALID = 0xffffffff
};

enum mlx5_coredev_type {
MLX5_COREDEV_PF,
MLX5_COREDEV_VF
};

struct mlx5_field_desc {
struct dentry *dent;
int i;
Expand Down Expand Up @@ -567,7 +572,6 @@ struct mlx5_priv {
struct mlx5_core_sriov sriov;
struct mlx5_lag *lag;
struct mlx5_devcom *devcom;
unsigned long pci_dev_data;
struct mlx5_core_roce roce;
struct mlx5_fc_stats fc_stats;
struct mlx5_rl_table rl_table;
Expand Down Expand Up @@ -646,6 +650,7 @@ struct mlx5_vxlan;

struct mlx5_core_dev {
struct device *device;
enum mlx5_coredev_type coredev_type;
struct pci_dev *pdev;
/* sync pci state */
struct mutex pci_status_mutex;
Expand Down Expand Up @@ -1079,9 +1084,9 @@ enum {
MLX5_PCI_DEV_IS_VF = 1 << 0,
};

static inline int mlx5_core_is_pf(struct mlx5_core_dev *dev)
static inline bool mlx5_core_is_pf(struct mlx5_core_dev *dev)
{
return !(dev->priv.pci_dev_data & MLX5_PCI_DEV_IS_VF);
return dev->coredev_type == MLX5_COREDEV_PF;
}

static inline bool mlx5_core_is_ecpf(struct mlx5_core_dev *dev)
Expand Down

0 comments on commit 386e75a

Please sign in to comment.