korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 08:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

IB/mlx5: Fix alignment of reg umr gather buffers

Browse Source 
The hardware requires that gather buffers for UMR work requests be
aligned to 2K.

Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Eli Cohen 2013-09-11 16:35:35 +03:00 committed by Roland Dreier
parent ada9f5d007
commit fe45f82704
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/infiniband/hw/mlx5/mr.c
View File

@ -42,6 +42,10 @@ enum {
DEF_CACHE_SIZE = 10, DEF_CACHE_SIZE = 10,
}; };
enum {
MLX5_UMR_ALIGN = 2048
};
static __be64 *mr_align(__be64 *ptr, int align) static __be64 *mr_align(__be64 *ptr, int align)
{ {
unsigned long mask = align - 1; unsigned long mask = align - 1;
@ -671,12 +675,12 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
if (!mr) if (!mr)
return ERR_PTR(-EAGAIN); return ERR_PTR(-EAGAIN);
mr->pas = kmalloc(size + 0x3f, GFP_KERNEL); mr->pas = kmalloc(size + MLX5_UMR_ALIGN - 1, GFP_KERNEL);
if (!mr->pas) { if (!mr->pas) {
err = -ENOMEM; err = -ENOMEM;
goto error; goto error;
} }
mr->dma = dma_map_single(ddev, mr_align(mr->pas, 0x40), size, mr->dma = dma_map_single(ddev, mr_align(mr->pas, MLX5_UMR_ALIGN), size,
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (dma_mapping_error(ddev, mr->dma)) { if (dma_mapping_error(ddev, mr->dma)) {
kfree(mr->pas); kfree(mr->pas);
@ -684,7 +688,8 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
goto error; goto error;
} }
mlx5_ib_populate_pas(dev, umem, page_shift, mr_align(mr->pas, 0x40), 1); mlx5_ib_populate_pas(dev, umem, page_shift,
mr_align(mr->pas, MLX5_UMR_ALIGN), 1);
memset(&wr, 0, sizeof(wr)); memset(&wr, 0, sizeof(wr));
wr.wr_id = (u64)(unsigned long)mr; wr.wr_id = (u64)(unsigned long)mr;