1 files changed, 43 insertions, 8 deletions

diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index b56e4587208d..9958ff2cad3c 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -59,12 +59,15 @@ enum {
         MLX4_CMD_HW_HEALTH_CHECK = 0x50,
         MLX4_CMD_SET_PORT        = 0xc,
         MLX4_CMD_SET_NODE        = 0x5a,
+        MLX4_CMD_QUERY_FUNC      = 0x56,
         MLX4_CMD_ACCESS_DDR      = 0x2e,
         MLX4_CMD_MAP_ICM         = 0xffa,
         MLX4_CMD_UNMAP_ICM       = 0xff9,
         MLX4_CMD_MAP_ICM_AUX     = 0xffc,
         MLX4_CMD_UNMAP_ICM_AUX   = 0xffb,
         MLX4_CMD_SET_ICM_SIZE    = 0xffd,
+        /*master notify fw on finish for slave's flr*/
+        MLX4_CMD_INFORM_FLR_DONE = 0x5b,
 
         /* TPT commands */
         MLX4_CMD_SW2HW_MPT       = 0xd,
@@ -119,6 +122,26 @@ enum {
         /* miscellaneous commands */
         MLX4_CMD_DIAG_RPRT       = 0x30,
         MLX4_CMD_NOP             = 0x31,
+        MLX4_CMD_ACCESS_MEM      = 0x2e,
+        MLX4_CMD_SET_VEP         = 0x52,
+
+        /* Ethernet specific commands */
+        MLX4_CMD_SET_VLAN_FLTR   = 0x47,
+        MLX4_CMD_SET_MCAST_FLTR  = 0x48,
+        MLX4_CMD_DUMP_ETH_STATS  = 0x49,
+
+        /* Communication channel commands */
+        MLX4_CMD_ARM_COMM_CHANNEL = 0x57,
+        MLX4_CMD_GEN_EQE         = 0x58,
+
+        /* virtual commands */
+        MLX4_CMD_ALLOC_RES       = 0xf00,
+        MLX4_CMD_FREE_RES        = 0xf01,
+        MLX4_CMD_MCAST_ATTACH    = 0xf05,
+        MLX4_CMD_UCAST_ATTACH    = 0xf06,
+        MLX4_CMD_PROMISC         = 0xf08,
+        MLX4_CMD_QUERY_FUNC_CAP  = 0xf0a,
+        MLX4_CMD_QP_ATTACH       = 0xf0b,
 
         /* debug commands */
         MLX4_CMD_QUERY_DEBUG_MSG = 0x2a,
@@ -126,6 +149,7 @@ enum {
 
         /* statistics commands */
         MLX4_CMD_QUERY_IF_STAT   = 0X54,
+        MLX4_CMD_SET_IF_STAT     = 0X55,
 };
 
 enum {
@@ -135,7 +159,8 @@ enum {
 };
 
 enum {
-        MLX4_MAILBOX_SIZE       =  4096
+        MLX4_MAILBOX_SIZE       = 4096,
+        MLX4_ACCESS_MEM_ALIGN   = 256,
 };
 
 enum {
@@ -148,6 +173,11 @@ enum {
         MLX4_SET_PORT_GID_TABLE = 0x5,
 };
 
+enum {
+        MLX4_CMD_WRAPPED,
+        MLX4_CMD_NATIVE
+};
+
 struct mlx4_dev;
 
 struct mlx4_cmd_mailbox {
@@ -157,23 +187,24 @@ struct mlx4_cmd_mailbox {
 
 int __mlx4_cmd(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
                int out_is_imm, u32 in_modifier, u8 op_modifier,
-               u16 op, unsigned long timeout);
+               u16 op, unsigned long timeout, int native);
 
 /* Invoke a command with no output parameter */
 static inline int mlx4_cmd(struct mlx4_dev *dev, u64 in_param, u32 in_modifier,
-                           u8 op_modifier, u16 op, unsigned long timeout)
+                           u8 op_modifier, u16 op, unsigned long timeout,
+                           int native)
 {
         return __mlx4_cmd(dev, in_param, NULL, 0, in_modifier,
-                          op_modifier, op, timeout);
+                          op_modifier, op, timeout, native);
 }
 
 /* Invoke a command with an output mailbox */
 static inline int mlx4_cmd_box(struct mlx4_dev *dev, u64 in_param, u64 out_param,
                                u32 in_modifier, u8 op_modifier, u16 op,
-                               unsigned long timeout)
+                               unsigned long timeout, int native)
 {
         return __mlx4_cmd(dev, in_param, &out_param, 0, in_modifier,
-                          op_modifier, op, timeout);
+                          op_modifier, op, timeout, native);
 }
 
 /*
@@ -183,13 +214,17 @@ static inline int mlx4_cmd_box(struct mlx4_dev *dev, u64 in_param, u64 out_param
  */
 static inline int mlx4_cmd_imm(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
                                u32 in_modifier, u8 op_modifier, u16 op,
-                               unsigned long timeout)
+                               unsigned long timeout, int native)
 {
         return __mlx4_cmd(dev, in_param, out_param, 1, in_modifier,
-                          op_modifier, op, timeout);
+                          op_modifier, op, timeout, native);
 }
 
 struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev);
 void mlx4_free_cmd_mailbox(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox);
 
+u32 mlx4_comm_get_version(void);
+
+#define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8)
+
 #endif /* MLX4_CMD_H */