Message ID | 4F41F88C.3070607@mellanox.co.il |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Date: Mon, 20 Feb 2012 09:38:52 +0200 > From: Jack Morgenstein <jackm@dev.mellanox.co.il> > > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 678558b..9c5fbad 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) -