mlx4_core: Clean up mlx4_alloc_icm() a bit
Handle the allocation error case first, so that we don't have further nested if for handling the common case of success. Signed-off-by: Roland Dreier <rolandd@cisco.com>hifive-unleashed-5.1
parent
c0dc72bad9
commit
c050def076
|
@ -163,29 +163,30 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,
|
||||||
ret = mlx4_alloc_icm_pages(&chunk->mem[chunk->npages],
|
ret = mlx4_alloc_icm_pages(&chunk->mem[chunk->npages],
|
||||||
cur_order, gfp_mask);
|
cur_order, gfp_mask);
|
||||||
|
|
||||||
if (!ret) {
|
if (ret) {
|
||||||
++chunk->npages;
|
if (--cur_order < 0)
|
||||||
|
goto fail;
|
||||||
|
else
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (coherent)
|
++chunk->npages;
|
||||||
++chunk->nsg;
|
|
||||||
else if (chunk->npages == MLX4_ICM_CHUNK_LEN) {
|
|
||||||
chunk->nsg = pci_map_sg(dev->pdev, chunk->mem,
|
|
||||||
chunk->npages,
|
|
||||||
PCI_DMA_BIDIRECTIONAL);
|
|
||||||
|
|
||||||
if (chunk->nsg <= 0)
|
if (coherent)
|
||||||
goto fail;
|
++chunk->nsg;
|
||||||
}
|
else if (chunk->npages == MLX4_ICM_CHUNK_LEN) {
|
||||||
|
chunk->nsg = pci_map_sg(dev->pdev, chunk->mem,
|
||||||
|
chunk->npages,
|
||||||
|
PCI_DMA_BIDIRECTIONAL);
|
||||||
|
|
||||||
if (chunk->npages == MLX4_ICM_CHUNK_LEN)
|
if (chunk->nsg <= 0)
|
||||||
chunk = NULL;
|
|
||||||
|
|
||||||
npages -= 1 << cur_order;
|
|
||||||
} else {
|
|
||||||
--cur_order;
|
|
||||||
if (cur_order < 0)
|
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (chunk->npages == MLX4_ICM_CHUNK_LEN)
|
||||||
|
chunk = NULL;
|
||||||
|
|
||||||
|
npages -= 1 << cur_order;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!coherent && chunk) {
|
if (!coherent && chunk) {
|
||||||
|
|
Loading…
Reference in New Issue