diff options
| author |   Jack Morgenstein <jackm@dev.mellanox.co.il> | 2012-02-19 21:38:52 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-02-20 19:26:34 -0500 |
| commit | 3d7474734b220ccbf9997ea484d0bcd4f7ab8549 (patch) | |
| tree | ff046bf821c203c6ef99359010bb795473716d82 /drivers/net/ethernet/mellanox | |
| parent | Merge branch 'master' of git://gitorious.org/linux-can/linux-can (diff) | |
| download | linux-dev-3d7474734b220ccbf9997ea484d0bcd4f7ab8549.tar.xz linux-dev-3d7474734b220ccbf9997ea484d0bcd4f7ab8549.zip | |
mlx4_core: Do not map BF area if capability is 0
BF can be disabled in some cases, the capability field, bf_reg_size is set
to zero in this case. Don't map the BF area in this case, it would cause
failures. In addition, leaving the BF area unmapped
also alerts the ETH driver to not use BF.
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 678558b502fc..9c5fbad513f8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -986,6 +986,9 @@ static int map_bf_area(struct mlx4_dev *dev) resource_size_t bf_len; int err = 0; + if (!dev->caps.bf_reg_size) + return -ENXIO; + bf_start = pci_resource_start(dev->pdev, 2) + (dev->caps.num_uars << PAGE_SHIFT); bf_len = pci_resource_len(dev->pdev, 2) - |