query ib device from given mlx4 device
PATCH 5/10 query ib device from given mlx4 device
Adding API to query ib_device with mlx4_dev
Signed-off-by Oren Duer <oren-VPRAkNaXOzVS1MOuV/[email protected]>
Signed-off-by Vu Pham <[email protected]>
drivers/infiniband/hw/mlx4/main.c | 10 +++++++++- drivers/net/mlx4/intf.c | 20 ++++++++++++++++++++ drivers/net/mlx4/main.c | 10 +++++++--- drivers/net/mlx4/mlx4.h | 1 + include/linux/mlx4/driver.h | 10 ++++++++++ 7 files changed, 72 insertions(+), 15 deletions(-)
Adding API to query ib_device with mlx4_dev
Signed-off-by Oren Duer <oren-VPRAkNaXOzVS1MOuV/[email protected]>
Signed-off-by Vu Pham <[email protected]>
drivers/infiniband/hw/mlx4/main.c | 10 +++++++++- drivers/net/mlx4/intf.c | 20 ++++++++++++++++++++ drivers/net/mlx4/main.c | 10 +++++++--- drivers/net/mlx4/mlx4.h | 1 + include/linux/mlx4/driver.h | 10 ++++++++++ 7 files changed, 72 insertions(+), 15 deletions(-)
drivers/infiniband/hw/mlx4/main.c +9 -1
@@ -58,6 +58,12 @@ static const char mlx4_ib_version[] =DRV_NAME ": Mellanox ConnectX InfiniBand driver v" DRV_VERSION " (" DRV_RELDATE ")\n" ; +static void *get_ibdev (struct mlx4_dev *dev,void *ctx,u8 port) +{ +struct mlx4_ib_dev *mlxibdev = ctx; +return &mlxibdev->ib_dev; +} +static void init_query_mad (struct ib_smp *mad) { mad->base_version =1 ;
@@ -749,7 +755,9 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr,static struct mlx4_interface mlx4_ib_interface = { .add = mlx4_ib_add, .remove = mlx4_ib_remove, - .event = mlx4_ib_event + .event = mlx4_ib_event, + .get_prot_dev = get_ibdev, + .protocol =MLX4_PROT_IB };static int __init mlx4_ib_init (void )
drivers/net/mlx4/intf.c +20 -0
@@ -191,3 +191,23 @@ void mlx4_unregister_device(struct mlx4_dev *dev)mutex_unlock (&intf_mutex); } + +void *mlx4_find_get_prot_dev (struct mlx4_dev *dev,enum mlx4_prot proto,int port) +{ +struct mlx4_priv *priv =mlx4_priv (dev); +struct mlx4_device_context *dev_ctx; +unsigned long flags; +void *result =NULL ; + +spin_lock_irqsave (&priv->ctx_lock, flags); + +list_for_each_entry (dev_ctx, &priv->ctx_list, list) +if (dev_ctx->intf->protocol == proto && dev_ctx->intf->get_prot_dev) { + result = dev_ctx->intf->get_prot_dev (dev, dev_ctx->context, port); +break ; + } + +spin_unlock_irqrestore (&priv->ctx_lock, flags); + +return result; +}
drivers/net/mlx4/main.c +6 -0
@@ -105,6 +105,12 @@ static int log_mtts_per_seg = ilog2(MLX4_MTT_ENTRY_PER_SEG);module_param_named (log_mtts_per_seg, log_mtts_per_seg, int,0444 );MODULE_PARM_DESC (log_mtts_per_seg,"Log2 number of MTT entries per segment (1-5)" ); +void *mlx4_get_prot_dev (struct mlx4_dev *dev,enum mlx4_prot proto,int port) +{ +return mlx4_find_get_prot_dev (dev, proto, port); +} +EXPORT_SYMBOL (mlx4_get_prot_dev); +int mlx4_check_port_params (struct mlx4_dev *dev,enum mlx4_port_type *port_type) {
drivers/net/mlx4/mlx4.h +1 -0
@@ -364,6 +364,7 @@ int mlx4_restart_one(struct pci_dev *pdev);int mlx4_register_device (struct mlx4_dev *dev);void mlx4_unregister_device (struct mlx4_dev *dev);void mlx4_dispatch_event (struct mlx4_dev *dev,enum mlx4_dev_event type,int port); +void *mlx4_find_get_prot_dev (struct mlx4_dev *dev,enum mlx4_prot proto,int port);struct mlx4_dev_cap ;struct mlx4_init_hca_param ;
include/linux/mlx4/driver.h +10 -0
@@ -49,17 +49,27 @@ enum mlx4_query_reply {MLX4_QUERY_MINE_NOPORT =0 }; +enum mlx4_prot { +MLX4_PROT_IB , +MLX4_PROT_EN , +}; +struct mlx4_interface {void * (*add) (struct mlx4_dev *dev);void (*remove)(struct mlx4_dev *dev,void *context);void (*event) (struct mlx4_dev *dev,void *context,enum mlx4_dev_event event,int port); +void * (*get_prot_dev) (struct mlx4_dev *dev,void *context,u8 port); +enum mlx4_prot protocol; +enum mlx4_query_reply (*query) (void *context,void *);struct list_head list; };int mlx4_register_interface (struct mlx4_interface *intf);void mlx4_unregister_interface (struct mlx4_interface *intf); +void *mlx4_get_prot_dev (struct mlx4_dev *dev,enum mlx4_prot proto,int port); +struct mlx4_dev *mlx4_query_interface (void *,int *port);#endif /* MLX4_DRIVER_H */
_______________________________________________
ewg mailing list [email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg