aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/infiniband/hw/mlx5/main.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index ab8cd5c034a2..f3e7d7cd3d87 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2059,10 +2059,6 @@ static int mlx5_ib_mmap_clock_info_page(struct mlx5_ib_dev *dev,
2059 if (err) 2059 if (err)
2060 return err; 2060 return err;
2061 2061
2062 mlx5_ib_dbg(dev, "mapped clock info at 0x%lx, PA 0x%llx\n",
2063 vma->vm_start,
2064 (unsigned long long)pfn << PAGE_SHIFT);
2065
2066 return mlx5_ib_set_vma_data(vma, context); 2062 return mlx5_ib_set_vma_data(vma, context);
2067} 2063}
2068 2064
@@ -2157,15 +2153,14 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,
2157 err = io_remap_pfn_range(vma, vma->vm_start, pfn, 2153 err = io_remap_pfn_range(vma, vma->vm_start, pfn,
2158 PAGE_SIZE, vma->vm_page_prot); 2154 PAGE_SIZE, vma->vm_page_prot);
2159 if (err) { 2155 if (err) {
2160 mlx5_ib_err(dev, "io_remap_pfn_range failed with error=%d, vm_start=0x%lx, pfn=%pa, mmap_cmd=%s\n", 2156 mlx5_ib_err(dev,
2161 err, vma->vm_start, &pfn, mmap_cmd2str(cmd)); 2157 "io_remap_pfn_range failed with error=%d, mmap_cmd=%s\n",
2158 err, mmap_cmd2str(cmd));
2162 err = -EAGAIN; 2159 err = -EAGAIN;
2163 goto err; 2160 goto err;
2164 } 2161 }
2165 2162
2166 pa = pfn << PAGE_SHIFT; 2163 pa = pfn << PAGE_SHIFT;
2167 mlx5_ib_dbg(dev, "mapped %s at 0x%lx, PA %pa\n", mmap_cmd2str(cmd),
2168 vma->vm_start, &pa);
2169 2164
2170 err = mlx5_ib_set_vma_data(vma, context); 2165 err = mlx5_ib_set_vma_data(vma, context);
2171 if (err) 2166 if (err)
@@ -2251,10 +2246,6 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm
2251 if (io_remap_pfn_range(vma, vma->vm_start, pfn, 2246 if (io_remap_pfn_range(vma, vma->vm_start, pfn,
2252 PAGE_SIZE, vma->vm_page_prot)) 2247 PAGE_SIZE, vma->vm_page_prot))
2253 return -EAGAIN; 2248 return -EAGAIN;
2254
2255 mlx5_ib_dbg(dev, "mapped internal timer at 0x%lx, PA 0x%llx\n",
2256 vma->vm_start,
2257 (unsigned long long)pfn << PAGE_SHIFT);
2258 break; 2249 break;
2259 case MLX5_IB_MMAP_CLOCK_INFO: 2250 case MLX5_IB_MMAP_CLOCK_INFO:
2260 return mlx5_ib_mmap_clock_info_page(dev, vma, context); 2251 return mlx5_ib_mmap_clock_info_page(dev, vma, context);