4 files changed, 53 insertions, 9 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index dde8fe9af47..d9fc822a146 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -476,9 +476,48 @@ out:
         return err;
 }
 
+static ssize_t show_hca(struct class_device *cdev, char *buf)
+{
+        struct mlx4_ib_dev *dev = container_of(cdev, struct mlx4_ib_dev, ib_dev.class_dev);
+        return sprintf(buf, "MT%d\n", dev->dev->pdev->device);
+}
+
+static ssize_t show_fw_ver(struct class_device *cdev, char *buf)
+{
+        struct mlx4_ib_dev *dev = container_of(cdev, struct mlx4_ib_dev, ib_dev.class_dev);
+        return sprintf(buf, "%d.%d.%d\n", (int) (dev->dev->caps.fw_ver >> 32),
+                       (int) (dev->dev->caps.fw_ver >> 16) & 0xffff,
+                       (int) dev->dev->caps.fw_ver & 0xffff);
+}
+
+static ssize_t show_rev(struct class_device *cdev, char *buf)
+{
+        struct mlx4_ib_dev *dev = container_of(cdev, struct mlx4_ib_dev, ib_dev.class_dev);
+        return sprintf(buf, "%x\n", dev->dev->rev_id);
+}
+
+static ssize_t show_board(struct class_device *cdev, char *buf)
+{
+        struct mlx4_ib_dev *dev = container_of(cdev, struct mlx4_ib_dev, ib_dev.class_dev);
+        return sprintf(buf, "%.*s\n", MLX4_BOARD_ID_LEN, dev->dev->board_id);
+}
+
+static CLASS_DEVICE_ATTR(hw_rev,   S_IRUGO, show_rev,    NULL);
+static CLASS_DEVICE_ATTR(fw_ver,   S_IRUGO, show_fw_ver, NULL);
+static CLASS_DEVICE_ATTR(hca_type, S_IRUGO, show_hca,    NULL);
+static CLASS_DEVICE_ATTR(board_id, S_IRUGO, show_board,  NULL);
+
+static struct class_device_attribute *mlx4_class_attributes[] = {
+        &class_device_attr_hw_rev,
+        &class_device_attr_fw_ver,
+        &class_device_attr_hca_type,
+        &class_device_attr_board_id
+};
+
 static void *mlx4_ib_add(struct mlx4_dev *dev)
 {
         struct mlx4_ib_dev *ibdev;
+        int i;
 
         ibdev = (struct mlx4_ib_dev *) ib_alloc_device(sizeof *ibdev);
         if (!ibdev) {
@@ -580,6 +619,12 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         if (mlx4_ib_mad_init(ibdev))
                 goto err_reg;
 
+        for (i = 0; i < ARRAY_SIZE(mlx4_class_attributes); ++i) {
+                if (class_device_create_file(&ibdev->ib_dev.class_dev,
+                                               mlx4_class_attributes[i]))
+                        goto err_reg;
+        }
+
         return ibdev;
 
 err_reg:
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 4b126943558..9e590e11c1c 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -524,8 +524,8 @@ static int __devinit mlx4_init_hca(struct mlx4_dev *dev)
         }
 
         priv->eq_table.inta_pin = adapter.inta_pin;
-        priv->rev_id            = adapter.revision_id;
-        memcpy(priv->board_id, adapter.board_id, sizeof priv->board_id);
+        dev->rev_id             = adapter.revision_id;
+        memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id);
 
         return 0;
 
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index be304a7c2c9..b9f83976191 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -56,10 +56,6 @@ enum {
 };
 
 enum {
-        MLX4_BOARD_ID_LEN       = 64
-};
-
-enum {
         MLX4_MGM_ENTRY_SIZE     =  0x40,
         MLX4_QP_PER_MGM         = 4 * (MLX4_MGM_ENTRY_SIZE / 16 - 2),
         MLX4_MTT_ENTRY_PER_SEG  = 8
@@ -277,9 +273,6 @@ struct mlx4_priv {
 
         struct mlx4_uar         driver_uar;
         void __iomem           *kar;
-
-        u32                     rev_id;
-        char                    board_id[MLX4_BOARD_ID_LEN];
 };
 
 static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index cfb78fb2c04..a93520c76fd 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -49,6 +49,10 @@ enum {
 };
 
 enum {
+        MLX4_BOARD_ID_LEN = 64
+};
+
+enum {
         MLX4_DEV_CAP_FLAG_RC            = 1 <<  0,
         MLX4_DEV_CAP_FLAG_UC            = 1 <<  1,
         MLX4_DEV_CAP_FLAG_UD            = 1 <<  2,
@@ -272,6 +276,8 @@ struct mlx4_dev {
         unsigned long           flags;
         struct mlx4_caps        caps;
         struct radix_tree_root  qp_table_tree;
+        u32                     rev_id;
+        char                    board_id[MLX4_BOARD_ID_LEN];
 };
 
 struct mlx4_init_port_param {