Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e2225db authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Greg Kroah-Hartman
Browse files

net/mlx4: Remove BUG_ON from ICM allocation routine 




[ Upstream commit c1d5f8ff80ea84768f5fae1ca9d1abfbb5e6bbaa ]

This patch removes BUG_ON() macro from mlx4_alloc_icm_coherent()
by checking DMA address alignment in advance and performing proper
folding in case of error.

Fixes: 5b0bf5e2 ("mlx4_core: Support ICM tables in coherent memory")
Reported-by: default avatarOzgur Karatas <okaratas@member.fsf.org>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 45d2f34f

drivers/net/ethernet/mellanox/mlx4/icm.c

+6 −1
Original line number Diff line number Diff line
@@ -117,8 +117,13 @@ static int mlx4_alloc_icm_coherent(struct device *dev, struct scatterlist *mem, 
	if (!buf)

		return -ENOMEM;



	if (offset_in_page(buf)) {

		dma_free_coherent(dev, PAGE_SIZE << order,

				  buf, sg_dma_address(mem));

		return -ENOMEM;

	}



	sg_set_buf(mem, buf, PAGE_SIZE << order);

	BUG_ON(mem->offset);

	sg_dma_len(mem) = PAGE_SIZE << order;

	return 0;

}