git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IB/mlx4: Display misc device information under /sys/class/infiniband/
[pandora-kernel.git]
/
drivers
/
net
/
mlx4
/
mlx4.h
diff --git
a/drivers/net/mlx4/mlx4.h
b/drivers/net/mlx4/mlx4.h
index
3d3b6d2
..
b9f8397
100644
(file)
--- a/
drivers/net/mlx4/mlx4.h
+++ b/
drivers/net/mlx4/mlx4.h
@@
-37,7
+37,9
@@
#ifndef MLX4_H
#define MLX4_H
#ifndef MLX4_H
#define MLX4_H
+#include <linux/mutex.h>
#include <linux/radix-tree.h>
#include <linux/radix-tree.h>
+#include <linux/timer.h>
#include <linux/mlx4/device.h>
#include <linux/mlx4/doorbell.h>
#include <linux/mlx4/device.h>
#include <linux/mlx4/doorbell.h>
@@
-53,10
+55,6
@@
enum {
MLX4_CLR_INT_SIZE = 0x00008
};
MLX4_CLR_INT_SIZE = 0x00008
};
-enum {
- MLX4_BOARD_ID_LEN = 64
-};
-
enum {
MLX4_MGM_ENTRY_SIZE = 0x40,
MLX4_QP_PER_MGM = 4 * (MLX4_MGM_ENTRY_SIZE / 16 - 2),
enum {
MLX4_MGM_ENTRY_SIZE = 0x40,
MLX4_QP_PER_MGM = 4 * (MLX4_MGM_ENTRY_SIZE / 16 - 2),
@@
-66,7
+64,6
@@
enum {
enum {
MLX4_EQ_ASYNC,
MLX4_EQ_COMP,
enum {
MLX4_EQ_ASYNC,
MLX4_EQ_COMP,
- MLX4_EQ_CATAS,
MLX4_NUM_EQ
};
MLX4_NUM_EQ
};
@@
-247,7
+244,8
@@
struct mlx4_mcg_table {
struct mlx4_catas_err {
u32 __iomem *map;
struct mlx4_catas_err {
u32 __iomem *map;
- int size;
+ struct timer_list timer;
+ struct list_head list;
};
struct mlx4_priv {
};
struct mlx4_priv {
@@
-275,9
+273,6
@@
struct mlx4_priv {
struct mlx4_uar driver_uar;
void __iomem *kar;
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)
};
static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)
@@
-310,9
+305,11
@@
void mlx4_cleanup_qp_table(struct mlx4_dev *dev);
void mlx4_cleanup_srq_table(struct mlx4_dev *dev);
void mlx4_cleanup_mcg_table(struct mlx4_dev *dev);
void mlx4_cleanup_srq_table(struct mlx4_dev *dev);
void mlx4_cleanup_mcg_table(struct mlx4_dev *dev);
-void mlx4_map_catas_buf(struct mlx4_dev *dev);
-void mlx4_unmap_catas_buf(struct mlx4_dev *dev);
-
+void mlx4_start_catas_poll(struct mlx4_dev *dev);
+void mlx4_stop_catas_poll(struct mlx4_dev *dev);
+int mlx4_catas_init(void);
+void mlx4_catas_cleanup(void);
+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_event type,
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_event type,