diff options
| author | Huy Nguyen | 2019-03-29 23:38:01 +0100 |
|---|---|---|
| committer | Saeed Mahameed | 2019-04-02 21:49:38 +0200 |
| commit | aa8106f137b93628d531ef5ecbbcbecef99370d7 (patch) | |
| tree | af753263dd0f2d44ab4ae117ff33ff7659a3dda0 /drivers/net/ethernet/mellanox/mlx5/core/main.c | |
| parent | net/mlx5: Replace dev_err/warn/info by mlx5_core_err/warn/info (diff) | |
| download | kernel-qcow2-linux-aa8106f137b93628d531ef5ecbbcbecef99370d7.tar.gz kernel-qcow2-linux-aa8106f137b93628d531ef5ecbbcbecef99370d7.tar.xz kernel-qcow2-linux-aa8106f137b93628d531ef5ecbbcbecef99370d7.zip | |
net/mlx5: Add explicit bar address field
Add bar_addr field to store bar-0 address to avoid calling
pci_resource_start with hard-coded bar-0 as parameter.
Also note that different mlx5 device types will have bar_addr
on different bars.
This patch does not change any functionality.
Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Signed-off-by: Vu Pham <vuhuong@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 8bedbe497f02..bda9c4bd17e6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -739,6 +739,7 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct pci_dev *pdev, pci_set_drvdata(dev->pdev, dev); + dev->bar_addr = pci_resource_start(pdev, 0); priv->numa_node = dev_to_node(&dev->pdev->dev); err = mlx5_pci_enable_device(dev); @@ -766,7 +767,7 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct pci_dev *pdev, pci_enable_atomic_ops_to_root(pdev, PCI_EXP_DEVCAP2_ATOMIC_COMP128)) mlx5_core_dbg(dev, "Enabling pci atomics failed\n"); - dev->iseg_base = pci_resource_start(dev->pdev, 0); + dev->iseg_base = dev->bar_addr; dev->iseg = ioremap(dev->iseg_base, sizeof(*dev->iseg)); if (!dev->iseg) { err = -ENOMEM; |