IB/mlx4: Add mmap call to map the hardware clock

In order to read the HCA's cycle counter efficiently in
user space, we need to map the HCA's register.
This is done through mmap call.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 6cd8cd5bf1c5b92a67c2785455b866014a753bed..2b107070b0ce4198a9363f6f7efc8386cbce1400 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -716,8 +716,24 @@ static int mlx4_ib_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
                                       dev->dev->caps.num_uars,
                                       PAGE_SIZE, vma->vm_page_prot))
                        return -EAGAIN;
-       } else
+       } else if (vma->vm_pgoff == 3) {
+               struct mlx4_clock_params params;
+               int ret = mlx4_get_internal_clock_params(dev->dev, &params);
+
+               if (ret)
+                       return ret;
+
+               vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+               if (io_remap_pfn_range(vma, vma->vm_start,
+                                      (pci_resource_start(dev->dev->persist->pdev,
+                                                          params.bar) +
+                                       params.offset)
+                                      >> PAGE_SHIFT,
+                                      PAGE_SIZE, vma->vm_page_prot))
+                       return -EAGAIN;
+       } else {
                return -EINVAL;
+       }
 
        return 0;
 }

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index ced5ecab5aa754ad44ae055464608bba66d6b137..70de39c6a397efc66a595d4010c7354fae3fc276 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -1674,6 +1674,25 @@ static int map_internal_clock(struct mlx4_dev *dev)
        return 0;
 }
 
+int mlx4_get_internal_clock_params(struct mlx4_dev *dev,
+                                  struct mlx4_clock_params *params)
+{
+       struct mlx4_priv *priv = mlx4_priv(dev);
+
+       if (mlx4_is_slave(dev))
+               return -ENOTSUPP;
+
+       if (!params)
+               return -EINVAL;
+
+       params->bar = priv->fw.clock_bar;
+       params->offset = priv->fw.clock_offset;
+       params->size = MLX4_CLOCK_SIZE;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_get_internal_clock_params);
+
 static void unmap_internal_clock(struct mlx4_dev *dev)
 {
        struct mlx4_priv *priv = mlx4_priv(dev);

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 83e80ab9450048d121b739bd23b85ccb14a39b36..f94984fb8bb248ca5d55e8c7e7bd2161e143dbab 100644 (file)
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -829,6 +829,12 @@ struct mlx4_dev {
        struct mlx4_vf_dev     *dev_vfs;
 };
 
+struct mlx4_clock_params {
+       u64 offset;
+       u8 bar;
+       u8 size;
+};
+
 struct mlx4_eqe {
        u8                      reserved1;
        u8                      type;
@@ -1485,4 +1491,7 @@ int mlx4_ACCESS_PTYS_REG(struct mlx4_dev *dev,
                         enum mlx4_access_reg_method method,
                         struct mlx4_ptys_reg *ptys_reg);
 
+int mlx4_get_internal_clock_params(struct mlx4_dev *dev,
+                                  struct mlx4_clock_params *params);
+
 #endif /* MLX4_DEVICE_H */