summaryrefslogtreecommitdiffstats
path: root/include/linux/mlx4
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-03-12 16:25:28 -0700
committerRoland Dreier <roland@purestorage.com>2012-03-12 16:25:28 -0700
commit42872c7a5ed8d3ed49f51cb783978ca50369c564 (patch)
tree0deea7b61c163e6997a4634ab4ee310014984688 /include/linux/mlx4
parentd927d505c59a0c7353343174e6225c43c61fba6d (diff)
parentdb5a7a65c05867cb6ff5cb6d556a0edfce631d2d (diff)
downloadop-kernel-dev-42872c7a5ed8d3ed49f51cb783978ca50369c564.zip
op-kernel-dev-42872c7a5ed8d3ed49f51cb783978ca50369c564.tar.gz
Merge branches 'misc' and 'mlx4' into for-next
Conflicts: drivers/infiniband/hw/mlx4/main.c drivers/net/ethernet/mellanox/mlx4/main.c include/linux/mlx4/device.h
Diffstat (limited to 'include/linux/mlx4')
-rw-r--r--include/linux/mlx4/device.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index be7f235..b843251 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -129,6 +129,7 @@ enum mlx4_event {
MLX4_EVENT_TYPE_CMD = 0x0a,
MLX4_EVENT_TYPE_VEP_UPDATE = 0x19,
MLX4_EVENT_TYPE_COMM_CHANNEL = 0x18,
+ MLX4_EVENT_TYPE_FATAL_WARNING = 0x1b,
MLX4_EVENT_TYPE_FLR_EVENT = 0x1c,
MLX4_EVENT_TYPE_NONE = 0xff,
};
@@ -139,6 +140,10 @@ enum {
};
enum {
+ MLX4_FATAL_WARNING_SUBTYPE_WARMING = 0,
+};
+
+enum {
MLX4_PERM_LOCAL_READ = 1 << 10,
MLX4_PERM_LOCAL_WRITE = 1 << 11,
MLX4_PERM_REMOTE_READ = 1 << 12,
@@ -269,6 +274,7 @@ struct mlx4_caps {
int num_comp_vectors;
int comp_pool;
int num_mpts;
+ int max_fmr_maps;
int num_mtts;
int fmr_reserved_mtts;
int reserved_mtts;
@@ -304,6 +310,7 @@ struct mlx4_caps {
u32 port_mask[MLX4_MAX_PORTS + 1];
enum mlx4_port_type possible_type[MLX4_MAX_PORTS + 1];
u32 max_counters;
+ u8 port_ib_mtu[MLX4_MAX_PORTS + 1];
};
struct mlx4_buf_list {
OpenPOWER on IntegriCloud