Merge branch 'mellanox/mlx5-next' into rdma.git for-next

From git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git

This is required to resolve dependencies of the next series of RDMA
patches.

* branch 'mellanox/mlx5-next':
  net/mlx5: Add support for flow table destination number
  net/mlx5: Add forward compatible support for the FTE match data
  net/mlx5: Fix tristate and description for MLX5 module
  net/mlx5: Better return types for CQE API
  net/mlx5: Use ERR_CAST() instead of coding it
  net/mlx5: Add missing SET_DRIVER_VERSION command translation
  net/mlx5: Add XRQ commands definitions
  net/mlx5: Add core support for double vlan push/pop steering action
  net/mlx5: Expose MPEGC (Management PCIe General Configuration) structures
  net/mlx5: FW tracer, add hardware structures
  net/mlx5: fix uaccess beyond "count" in debugfs read/write handlers

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

4 files changed, 103 insertions, 9 deletions

diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index f8671c0a43aa..0566c6a94805 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -750,7 +750,7 @@ enum {
 
 #define MLX5_MINI_CQE_ARRAY_SIZE 8
 
-static inline int mlx5_get_cqe_format(struct mlx5_cqe64 *cqe)
+static inline u8 mlx5_get_cqe_format(struct mlx5_cqe64 *cqe)
 {
         return (cqe->op_own >> 2) & 0x3;
 }
@@ -770,14 +770,14 @@ static inline u8 get_cqe_l3_hdr_type(struct mlx5_cqe64 *cqe)
         return (cqe->l4_l3_hdr_type >> 2) & 0x3;
 }
 
-static inline u8 cqe_is_tunneled(struct mlx5_cqe64 *cqe)
+static inline bool cqe_is_tunneled(struct mlx5_cqe64 *cqe)
 {
         return cqe->outer_l3_tunneled & 0x1;
 }
 
-static inline int cqe_has_vlan(struct mlx5_cqe64 *cqe)
+static inline bool cqe_has_vlan(struct mlx5_cqe64 *cqe)
 {
-        return !!(cqe->l4_l3_hdr_type & 0x1);
+        return cqe->l4_l3_hdr_type & 0x1;
 }
 
 static inline u64 get_cqe_ts(struct mlx5_cqe64 *cqe)
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 1cb1c0317b77..957199c20a0f 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -138,9 +138,14 @@ enum {
         MLX5_REG_HOST_ENDIANNESS = 0x7004,
         MLX5_REG_MCIA            = 0x9014,
         MLX5_REG_MLCR            = 0x902b,
+        MLX5_REG_MTRC_CAP        = 0x9040,
+        MLX5_REG_MTRC_CONF       = 0x9041,
+        MLX5_REG_MTRC_STDB       = 0x9042,
+        MLX5_REG_MTRC_CTRL       = 0x9043,
         MLX5_REG_MPCNT           = 0x9051,
         MLX5_REG_MTPPS           = 0x9053,
         MLX5_REG_MTPPSE          = 0x9054,
+        MLX5_REG_MPEGC           = 0x9056,
         MLX5_REG_MCQI            = 0x9061,
         MLX5_REG_MCC             = 0x9062,
         MLX5_REG_MCDA            = 0x9063,
diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index 757b4a30281e..af0592400499 100644
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -89,6 +89,7 @@ struct mlx5_flow_destination {
         enum mlx5_flow_destination_type type;
         union {
                 u32                     tir_num;
+                u32                     ft_num;
                 struct mlx5_flow_table  *ft;
                 struct mlx5_fc          *counter;
                 struct {
@@ -152,6 +153,8 @@ struct mlx5_fs_vlan {
         u8  prio;
 };
 
+#define MLX5_FS_VLAN_DEPTH      2
+
 struct mlx5_flow_act {
         u32 action;
         bool has_flow_tag;
@@ -159,7 +162,7 @@ struct mlx5_flow_act {
         u32 encap_id;
         u32 modify_id;
         uintptr_t esp_id;
-        struct mlx5_fs_vlan vlan;
+        struct mlx5_fs_vlan vlan[MLX5_FS_VLAN_DEPTH];
         struct ib_counters *counters;
 };
 
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 44a6ce01c3bb..5e04e2053fd7 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -341,7 +341,10 @@ struct mlx5_ifc_flow_table_prop_layout_bits {
         u8         reserved_at_9[0x1];
         u8         pop_vlan[0x1];
         u8         push_vlan[0x1];
-        u8         reserved_at_c[0x14];
+        u8         reserved_at_c[0x1];
+        u8         pop_vlan_2[0x1];
+        u8         push_vlan_2[0x1];
+        u8         reserved_at_f[0x11];
 
         u8         reserved_at_20[0x2];
         u8         log_max_ft_size[0x6];
@@ -1181,6 +1184,7 @@ enum mlx5_flow_destination_type {
 
         MLX5_FLOW_DESTINATION_TYPE_PORT         = 0x99,
         MLX5_FLOW_DESTINATION_TYPE_COUNTER      = 0x100,
+        MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM = 0x101,
 };
 
 struct mlx5_ifc_dest_format_struct_bits {
@@ -2390,6 +2394,8 @@ enum {
         MLX5_FLOW_CONTEXT_ACTION_MOD_HDR   = 0x40,
         MLX5_FLOW_CONTEXT_ACTION_VLAN_POP  = 0x80,
         MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH = 0x100,
+        MLX5_FLOW_CONTEXT_ACTION_VLAN_POP_2  = 0x400,
+        MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2 = 0x800,
 };
 
 struct mlx5_ifc_vlan_bits {
@@ -2420,7 +2426,9 @@ struct mlx5_ifc_flow_context_bits {
 
         u8         modify_header_id[0x20];
 
-        u8         reserved_at_100[0x100];
+        struct mlx5_ifc_vlan_bits push_vlan_2;
+
+        u8         reserved_at_120[0xe0];
 
         struct mlx5_ifc_fte_match_param_bits match_value;
 
@@ -8053,6 +8061,19 @@ struct mlx5_ifc_peir_reg_bits {
         u8         error_type[0x8];
 };
 
+struct mlx5_ifc_mpegc_reg_bits {
+        u8         reserved_at_0[0x30];
+        u8         field_select[0x10];
+
+        u8         tx_overflow_sense[0x1];
+        u8         mark_cqe[0x1];
+        u8         mark_cnp[0x1];
+        u8         reserved_at_43[0x1b];
+        u8         tx_lossy_overflow_oper[0x2];
+
+        u8         reserved_at_60[0x100];
+};
+
 struct mlx5_ifc_pcam_enhanced_features_bits {
         u8         reserved_at_0[0x6d];
         u8         rx_icrc_encapsulated_counter[0x1];
@@ -8101,7 +8122,11 @@ struct mlx5_ifc_pcam_reg_bits {
 };
 
 struct mlx5_ifc_mcam_enhanced_features_bits {
-        u8         reserved_at_0[0x7b];
+        u8         reserved_at_0[0x74];
+        u8         mark_tx_action_cnp[0x1];
+        u8         mark_tx_action_cqe[0x1];
+        u8         dynamic_tx_overflow[0x1];
+        u8         reserved_at_77[0x4];
         u8         pcie_outbound_stalled[0x1];
         u8         tx_overflow_buffer_pkt[0x1];
         u8         mtpps_enh_out_per_adj[0x1];
@@ -8116,7 +8141,11 @@ struct mlx5_ifc_mcam_access_reg_bits {
         u8         mcqi[0x1];
         u8         reserved_at_1f[0x1];
 
-        u8         regs_95_to_64[0x20];
+        u8         regs_95_to_87[0x9];
+        u8         mpegc[0x1];
+        u8         regs_85_to_68[0x12];
+        u8         tracer_registers[0x4];
+
         u8         regs_63_to_32[0x20];
         u8         regs_31_to_0[0x20];
 };
@@ -9191,4 +9220,61 @@ struct mlx5_ifc_create_uctx_in_bits {
         struct mlx5_ifc_uctx_bits                     uctx;
 };
 
+struct mlx5_ifc_mtrc_string_db_param_bits {
+        u8         string_db_base_address[0x20];
+
+        u8         reserved_at_20[0x8];
+        u8         string_db_size[0x18];
+};
+
+struct mlx5_ifc_mtrc_cap_bits {
+        u8         trace_owner[0x1];
+        u8         trace_to_memory[0x1];
+        u8         reserved_at_2[0x4];
+        u8         trc_ver[0x2];
+        u8         reserved_at_8[0x14];
+        u8         num_string_db[0x4];
+
+        u8         first_string_trace[0x8];
+        u8         num_string_trace[0x8];
+        u8         reserved_at_30[0x28];
+
+        u8         log_max_trace_buffer_size[0x8];
+
+        u8         reserved_at_60[0x20];
+
+        struct mlx5_ifc_mtrc_string_db_param_bits string_db_param[8];
+
+        u8         reserved_at_280[0x180];
+};
+
+struct mlx5_ifc_mtrc_conf_bits {
+        u8         reserved_at_0[0x1c];
+        u8         trace_mode[0x4];
+        u8         reserved_at_20[0x18];
+        u8         log_trace_buffer_size[0x8];
+        u8         trace_mkey[0x20];
+        u8         reserved_at_60[0x3a0];
+};
+
+struct mlx5_ifc_mtrc_stdb_bits {
+        u8         string_db_index[0x4];
+        u8         reserved_at_4[0x4];
+        u8         read_size[0x18];
+        u8         start_offset[0x20];
+        u8         string_db_data[0];
+};
+
+struct mlx5_ifc_mtrc_ctrl_bits {
+        u8         trace_status[0x2];
+        u8         reserved_at_2[0x2];
+        u8         arm_event[0x1];
+        u8         reserved_at_5[0xb];
+        u8         modify_field_select[0x10];
+        u8         reserved_at_20[0x2b];
+        u8         current_timestamp52_32[0x15];
+        u8         current_timestamp31_0[0x20];
+        u8         reserved_at_80[0x180];
+};
+
 #endif /* MLX5_IFC_H */