mirror of
https://github.com/torvalds/linux.git
synced 2024-12-14 23:25:54 +00:00
mlx4: allow device removal by fixing dma unmap size
After opening the network interface, Mellanox ConnectX device cannot be removed by hotplug because it has not properly unmapped all DMA memory. It happens that mlx4_en_activate_rx_rings overrides the variable that keeps the size of the memory mapped. This is fixed by passing to mlx4_en_destroy_rx_ring the same size that is given to mlx4_en_create_rx_ring. After applying this patch, hot unplugging the device works after opening the interface. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4c41b36737
commit
68355f7113
@ -892,7 +892,8 @@ void mlx4_en_free_resources(struct mlx4_en_priv *priv)
|
||||
|
||||
for (i = 0; i < priv->rx_ring_num; i++) {
|
||||
if (priv->rx_ring[i].rx_info)
|
||||
mlx4_en_destroy_rx_ring(priv, &priv->rx_ring[i]);
|
||||
mlx4_en_destroy_rx_ring(priv, &priv->rx_ring[i],
|
||||
priv->prof->rx_ring_size, priv->stride);
|
||||
if (priv->rx_cq[i].buf)
|
||||
mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);
|
||||
}
|
||||
|
@ -380,12 +380,12 @@ err_allocator:
|
||||
}
|
||||
|
||||
void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
|
||||
struct mlx4_en_rx_ring *ring)
|
||||
struct mlx4_en_rx_ring *ring, u32 size, u16 stride)
|
||||
{
|
||||
struct mlx4_en_dev *mdev = priv->mdev;
|
||||
|
||||
mlx4_en_unmap_buffer(&ring->wqres.buf);
|
||||
mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size + TXBB_SIZE);
|
||||
mlx4_free_hwq_res(mdev->dev, &ring->wqres, size * stride + TXBB_SIZE);
|
||||
vfree(ring->rx_info);
|
||||
ring->rx_info = NULL;
|
||||
}
|
||||
|
@ -528,7 +528,8 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
|
||||
struct mlx4_en_rx_ring *ring,
|
||||
u32 size, u16 stride);
|
||||
void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
|
||||
struct mlx4_en_rx_ring *ring);
|
||||
struct mlx4_en_rx_ring *ring,
|
||||
u32 size, u16 stride);
|
||||
int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv);
|
||||
void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,
|
||||
struct mlx4_en_rx_ring *ring);
|
||||
|
Loading…
Reference in New Issue
Block a user